Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei365/user/mapper/HeHeMapper.java

@@ -6,6 +6,8 @@ import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.model.vo.HeHeUserVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * Description
  *
@@ -57,7 +59,7 @@ public interface HeHeMapper {
      * @param couponType    劵类型 1活动券 2专享券 3新人券 4好友分享券 5好友消费券
      * @return
      */
-    String getCurrentCouponIds(int couponType);
+    List<Integer> getCurrentCouponIds(int couponType);
 
     /**
      * 插入优惠券分享记录

src/main/java/com/caimei365/user/model/po/CouponSharePo.java

@@ -22,15 +22,7 @@ public class CouponSharePo implements Serializable {
      */
     private Integer receiveUserId;
     /**
-     * 分享得到的好友分享券id，以，隔开
+     * 分享得到的好友分享/消费券id
      */
-    private String shareCouponIds;
-    /**
-     * 被分享者是否已消费，0未消费，1已消费
-     */
-    private Integer consumeFlag;
-    /**
-     * 分享对象消费后得到的好友消费券id
-     */
-    private String consumeCouponIds;
+    private Integer shareCouponId;
 }

src/main/java/com/caimei365/user/service/impl/HeHeServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -108,9 +109,11 @@ public class HeHeServiceImpl implements HeHeService {
                         CouponSharePo couponSharePo = new CouponSharePo();
                         couponSharePo.setShareUserId(shareUserId);
                         couponSharePo.setReceiveUserId(receiveUserId);
-                        String shareCouponIds = heHeMapper.getCurrentCouponIds(4);
-                        couponSharePo.setShareCouponIds(shareCouponIds);
-                        heHeMapper.insertCouponShare(couponSharePo);
+                        List<Integer> couponIds = heHeMapper.getCurrentCouponIds(4);
+                        couponIds.forEach(couponId->{
+                            couponSharePo.setShareCouponId(couponId);
+                            heHeMapper.insertCouponShare(couponSharePo);
+                        });
                     }
                 }
                 return ResponseJson.success(heHeUser);

src/main/resources/mapper/HeHeMapper.xml

@@ -33,12 +33,11 @@
         WHERE
           mobile = #{mobile}
     </select>
-    <select id="getCurrentCouponIds" resultType="java.lang.String">
-        select group_concat(id)
+    <select id="getCurrentCouponIds" resultType="java.lang.Integer">
+        select id
         from cm_hehe_coupon
         where couponType = #{couponType} and if(startNowFlag = 1,true, NOW() <![CDATA[  >=  ]]> startTime )
           and if(permanentFlag = 1,true,NOW() <![CDATA[  <=  ]]> endTime) and delFlag = 0
-        group by couponType
     </select>
 
     <update id="updateHeHeUser">
@@ -75,8 +74,8 @@
 		  )
     </insert>
     <insert id="insertCouponShare">
-        insert into cm_hehe_coupon_share (shareUserId, receiveUserId, shareCouponIds,createTime)
-        values (#{shareUserId}, #{receiveUserId}, #{shareCouponIds},NOW())
+        insert into cm_hehe_coupon_share (shareUserId, receiveUserId, shareCouponId, type, createTime)
+        values (#{shareUserId}, #{receiveUserId}, #{shareCouponId}, 1, NOW())
     </insert>
 
 </mapper>