优化

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityPlanPayDto.java

@@ -11,13 +11,13 @@ import io.swagger.annotations.ApiModel;
 @ApiModel("活动购买信息")
 public class ActivityPlanPayDto {
 
-    private Long planId;
+    private Long activityId;
 
-    public Long getPlanId() {
-        return planId;
+    public Long getActivityId() {
+        return activityId;
     }
 
-    public void setPlanId(Long planId) {
-        this.planId = planId;
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -139,23 +139,23 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
 
         // 检查活动购买
 
-        checkActivityPay(activityPlanPayDto.getPlanId());
+        checkActivityPay(activityPlanPayDto.getActivityId());
 
 
-        if (checkoutJoinActivity(activityPlanPayDto.getPlanId(),orderReqInfo.getUserId())) {
+        if (checkoutJoinActivity(activityPlanPayDto.getActivityId(), orderReqInfo.getUserId())) {
             throw new BizException("您已经参与了活动");
         }
 
 
         OrderCreateRes orderCreateRes = new OrderCreateRes();
-        if (activityPlanPayDto.getPlanId() == null) {
+        if (activityPlanPayDto.getActivityId() == null) {
             throw new BizException("活动id不能为空");
         }
-        ActivityPlan activityPlan = getById(activityPlanPayDto.getPlanId() );
+        ActivityPlan activityPlan = getById(activityPlanPayDto.getActivityId() );
 
         orderCreateRes.setRes(true);
         orderCreateRes.setGoodType(orderCreateRes.getGoodType());
-        orderCreateRes.setBizId(activityPlanPayDto.getPlanId());
+        orderCreateRes.setBizId(activityPlanPayDto.getActivityId());
         orderCreateRes.setGoodNum(1);
         orderCreateRes.setOriginalPrice(activityPlan.getRegistrationPrice());
         orderCreateRes.setExpectPrice(activityPlan.getRegistrationPrice());

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityEvaluationMapper.xml

@@ -68,7 +68,7 @@
         from  activity_evaluation_record aem
         left join sys_user su on su.id_ = aem.user_id_
         <where>
-            su.del_flag_ = 0
+            su.del_flag_ = 0 and aem.score_ is not null
             <if test="activityPlanId != null">
                 and aem.activity_id_ = #{activityPlanId}
             </if>