超级会员

src/main/java/com/caimei365/tools/mapper/CmBehaviorRecordMapper.java

@@ -65,9 +65,7 @@ public interface CmBehaviorRecordMapper {
 
     void insertCoupon(CmCouponPo cmCouponPo);
 
-    Integer selById();
-
-    List<CmCouponAssociatePo> selCouponPro(@Param("couponId") String couponId);
+    List<CmCouponAssociatePo> selCouponPro(@Param("couponId") Integer couponId);
 
     void insertCouponAssociate(CmCouponAssociatePo associate);
 

src/main/java/com/caimei365/tools/model/po/CmCouponPo.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class CmCouponPo implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    private String id;
+    private Integer id;
     private String name;        // 活动主题
     private BigDecimal couponAmount;        // 优惠券金额(面值)
     private BigDecimal touchPrice;        // 优惠满减条件金额

src/main/java/com/caimei365/tools/model/po/CmVipCouponRelation.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Data
 public class CmVipCouponRelation {
     //优惠券id
-    private String couponId;
+    private Integer couponId;
     //优惠券id
     private String montId;
     private Date updateTime;

src/main/java/com/caimei365/tools/service/impl/CmVipCouponServiceImpl.java

@@ -66,7 +66,6 @@ public class CmVipCouponServiceImpl implements CmVipCouponService {
         String formatTime = simpleDateFormat.format(times);
         Date startDate = getMinDay(endTime);
         Date endDate = getMaxDay(formatTime);
-        CmCouponAssociatePo associatePo = new CmCouponAssociatePo();
         List<CmCouponPo> cmCouponPoList = cmBehaviorRecordMapper.selCoupon();
         for (CmCouponPo cmCouponPo : cmCouponPoList) {
 
@@ -82,11 +81,10 @@ public class CmVipCouponServiceImpl implements CmVipCouponService {
             cmCouponPo.setDelFlag("0");
             cmBehaviorRecordMapper.insertCoupon(cmCouponPo);
             // 插入新优惠券商品
-            Integer integer = cmBehaviorRecordMapper.selById();
             List<CmCouponAssociatePo> associatePoList = cmBehaviorRecordMapper.selCouponPro(cmCouponPo.getId());
             if (associatePoList.size() != 0) {
                 for (CmCouponAssociatePo couponAssociatePo : associatePoList) {
-                    couponAssociatePo.setCouponId(integer);
+                    couponAssociatePo.setCouponId(cmCouponPo.getId());
                     cmBehaviorRecordMapper.insertCouponAssociate(couponAssociatePo);
                 }
             }
@@ -98,7 +96,7 @@ public class CmVipCouponServiceImpl implements CmVipCouponService {
         CmVipCouponRelation relation = new CmVipCouponRelation();
         Integer cmVipCouponPoId = cmBehaviorRecordMapper.selSvipCouponById();
         List<CmCouponPo> cmCouponPos = cmBehaviorRecordMapper.selCoupon();
-        if (cmVipCouponPoId != 0 && cmVipCouponPoId != null) {
+        if (cmVipCouponPoId != 0 && null != cmVipCouponPoId ) {
             for (int i = 0; i < cmCouponPos.size(); i++) {
                 relation.setCouponId(cmCouponPos.get(i).getId());
                 relation.setMontId(cmVipCouponPoId.toString());
@@ -111,8 +109,8 @@ public class CmVipCouponServiceImpl implements CmVipCouponService {
         log.info("========vip优惠券月份关系创建========");
     }
 
-    /*
-    输入日期字符串比如201703，返回当月第一天的Date
+    /**
+    * 输入日期字符串比如201703，返回当月第一天的Date
     */
     public static Date getMinDay(String month) {
         try {
@@ -127,8 +125,8 @@ public class CmVipCouponServiceImpl implements CmVipCouponService {
         return null;
     }
 
-    /*
-    输入日期字符串，返回下个月1号0点
+    /**
+    * 输入日期字符串，返回下个月1号0点
     */
     public static Date getMaxDay(String month) {
         try {

src/main/resources/mapper/CmBehaviorRecordMapper.xml

@@ -78,7 +78,7 @@
         moneyCouponType,
         createDate,
         delFlag
-        FROM cm_coupon WHERE configure = 1
+        FROM cm_coupon WHERE delFlag = 0 AND configure = 1
     </select>
 
     <update id="updateCoupon">
@@ -86,7 +86,7 @@
         SET configure = #{configure}
         WHERE id = #{id}
     </update>
-    <insert id="insertCoupon">
+    <insert id="insertCoupon" parameterType="com.caimei365.tools.model.po.CmCouponPo" keyProperty="id" useGeneratedKeys="true">
         INSERT INTO cm_coupon(
             name,
             couponPayWay,
@@ -143,9 +143,6 @@
              #{configure}
          )
     </insert>
-    <select id="selById" resultType="integer">
-        select max(id) as id from cm_coupon
-    </select>
     <select id="selCouponPro" resultType="com.caimei365.tools.model.po.CmCouponAssociatePo">
         select * from cm_coupon_product where couponId = #{couponId}
     </select>