云教练活动

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityUserMapper.java

@@ -1,8 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.common.entity.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 
@@ -69,6 +68,17 @@ public class ActivityUserMapper extends BaseEntity {
 	/**  */
 	private java.util.Date updateTime;
 
+	//赠送的优惠券编号
+	private Integer giveCouponId;
+
+	public Integer getGiveCouponId() {
+		return giveCouponId;
+	}
+
+	public void setGiveCouponId(Integer giveCouponId) {
+		this.giveCouponId = giveCouponId;
+	}
+
 	public String getAddMemo() {
 		return addMemo;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -166,16 +166,16 @@ public class VipGroupActivity extends BaseEntity {
 	private Integer activityChannel;
 
 	@ApiModelProperty(value = "赠送的优惠券的编号")
-	private Long giveCouponId;
+	private Integer giveCouponId;
 
 	@ApiModelProperty(value = "赠送的优惠券的数量")
 	private Integer giveCouponNum;
 
-	public Long getGiveCouponId() {
+	public Integer getGiveCouponId() {
 		return giveCouponId;
 	}
 
-	public void setGiveCouponId(Long giveCouponId) {
+	public void setGiveCouponId(Integer giveCouponId) {
 		this.giveCouponId = giveCouponId;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -2,10 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao;
-import com.ym.mec.biz.dal.dao.MemberRankSettingDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.MemberPayParamDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
@@ -80,6 +77,8 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     private VipGroupActivityDao vipGroupActivityDao;
     @Autowired
     private TenantConfigService tenantConfigService;
+    @Autowired
+    private ActivityUserMapperDao activityUserMapperDao;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -449,11 +448,19 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                 cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
                 cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
+                ActivityUserMapper activityUserMapper = new ActivityUserMapper();
+                activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
+                activityUserMapper.setUserId(studentPaymentOrder.getUserId());
+                activityUserMapper.setActivityId(activity.getId());
+                activityUserMapper.setActualPrice(studentPaymentOrder.getExpectAmount());
+                activityUserMapper.setGiveCouponId(activity.getGiveCouponId());
+                activityUserMapper.setReturnFee(false);
+                activityUserMapperDao.insert(activityUserMapper);
                 //赠送优惠券
-                Long giveCouponId = activity.getGiveCouponId();
+                Integer giveCouponId = activity.getGiveCouponId();
                 Integer giveCouponNum = activity.getGiveCouponNum();
                 if(Objects.nonNull(giveCouponId) && Objects.nonNull(giveCouponNum)){
-                    sysCouponCodeService.exchangeCoupon(userId,giveCouponId.intValue(),
+                    sysCouponCodeService.exchangeCoupon(userId,giveCouponId,
                             studentPaymentOrder.getId(),giveCouponNum,2,null);
                 }
             }else {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -748,6 +748,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     activityUserMapper.setGivePracticeFlag(1);
                 }
             }
+            //是否赠送优惠券
+            if (activity.getGiveCouponNum() != null && activity.getGiveCouponNum() > 0) {
+                activityUserMapper.setGiveCouponId(activity.getGiveCouponId());
+            }
             //是否赠送会员(会员立即生效)
             if (activity.getGiveMemberTime() > 0) {
                 Date now = new Date();

mec-biz/src/main/resources/config/mybatis/ActivityUserMapperMapper.xml

@@ -28,6 +28,7 @@
 		<result column="actual_price_" property="actualPrice" />
 		<result column="add_memo_" property="addMemo" />
 		<result column="cut_memo_" property="cutMemo" />
+		<result column="give_coupon_id_" property="giveCouponId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -48,23 +49,24 @@
 		INSERT INTO activity_user_mapper (activity_id_,user_id_,vip_flag_,give_vip_flag_,
 		                                  practice_flag_,give_practice_flag_,member_flag_,give_member_flag_,create_time_,update_time_,payment_order_id_,
 										  vip_group_id_,give_vip_group_id_,practice_group_id_,give_practice_group_id_,return_fee_,
-		                                  member_order_id_,give_member_order_id_,teacher_id_,actual_price_,add_memo_,cut_memo_,tenant_id_)
+		                                  member_order_id_,give_member_order_id_,teacher_id_,actual_price_,add_memo_,cut_memo_,tenant_id_,give_coupon_id_)
 		                                  VALUES(#{activityId},#{userId},#{vipFlag},#{giveVipFlag},#{practiceFlag},
 		                                         #{givePracticeFlag},#{memberFlag},#{giveMemberFlag},NOW(),NOW(),#{paymentOrderId},#{vipGroupId},
 		                                         #{giveVipGroupId},#{practiceGroupId},#{givePracticeGroupId},#{returnFee},
-		                                         #{memberOrderId},#{giveMemberOrderId},#{teacherId},#{actualPrice},#{addMemo},#{cutMemo},#{tenantId})
+		                                         #{memberOrderId},#{giveMemberOrderId},#{teacherId},#{actualPrice},#{addMemo},#{cutMemo},#{tenantId},#{giveCouponId})
 	</insert>
     <insert id="batchInsert">
 		INSERT INTO activity_user_mapper (activity_id_,user_id_,vip_flag_,give_vip_flag_,
 		practice_flag_,give_practice_flag_,member_flag_,give_member_flag_,create_time_,update_time_,payment_order_id_,
 		vip_group_id_,give_vip_group_id_,practice_group_id_,give_practice_group_id_,return_fee_,member_order_id_,
-		                                  give_member_order_id_,teacher_id_,actual_price_,add_memo_,cut_memo_,tenant_id_)
+		                                  give_member_order_id_,teacher_id_,actual_price_,add_memo_,cut_memo_,tenant_id_,give_coupon_id_)
 		VALUES
 		<foreach collection="activityUserMappers" item="item" separator=",">
 			(#{item.activityId},#{item.userId},#{item.vipFlag},#{item.giveVipFlag},#{item.practiceFlag},
 			#{item.givePracticeFlag},#{item.memberFlag},#{item.giveMemberFlag},NOW(),NOW(),#{item.paymentOrderId},#{item.vipGroupId},
 			#{item.giveVipGroupId},#{item.practiceGroupId},#{item.givePracticeGroupId},#{item.returnFee},
-			 #{item.memberOrderId},#{item.giveMemberOrderId},#{item.teacherId},#{item.actualPrice},#{item.addMemo},#{item.cutMemo},#{item.tenantId})
+			 #{item.memberOrderId},#{item.giveMemberOrderId},#{item.teacherId},#{item.actualPrice},#{item.addMemo},#{item.cutMemo},
+			 #{item.tenantId},#{item.giveCouponId})
 		</foreach>
 	</insert>
 
@@ -72,6 +74,9 @@
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ActivityUserMapper">
 		UPDATE activity_user_mapper
 		<set>
+			<if test="giveCouponId != null">
+				give_coupon_id_ = #{giveCouponId},
+			</if>
 			<if test="cutMemo != null">
 				cut_memo_ = #{cutMemo},
 			</if>