fix:积分抵扣页面bug

kmall-admin/src/main/java/com/kmall/admin/dao/mk/MkActivitiesScoreDao.java

@@ -19,10 +19,7 @@ public interface MkActivitiesScoreDao extends BaseDao<MkActivitiesScoreEntity> {
 
     MkActivitiesScoreEntity queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(@Param("prodBarcode") String prodBarcode,
                                                                             @Param("sku") String sku,
-                                                                            @Param("storeId") Integer storeId,
-                                                                            @Param("nowTime") Date nowTime);
-
-    List<MkActivitiesScoreEntity> queryDetailByTime(@Param("date") Date date);
+                                                                            @Param("storeId") Integer storeId);
 
     /**
      * 查询积分抵扣活动信息

kmall-admin/src/main/java/com/kmall/admin/dto/ScoreReductionDTO.java

@@ -16,8 +16,6 @@ public class ScoreReductionDTO implements Serializable {
     private String prodBarcode;
     private String sku;
     private Integer storeId;
-    private Date deadline;
-    private String deadlineStr;
     private String reject;
 
     public String getProdBarcode() {
@@ -44,22 +42,6 @@ public class ScoreReductionDTO implements Serializable {
         this.storeId = storeId;
     }
 
-    public Date getDeadline() {
-        return deadline;
-    }
-
-    public void setDeadline(Date deadline) {
-        this.deadline = deadline;
-    }
-
-    public String getDeadlineStr() {
-        return deadlineStr;
-    }
-
-    public void setDeadlineStr(String deadlineStr) {
-        this.deadlineStr = deadlineStr;
-    }
-
     public String getReject() {
         return reject;
     }

kmall-admin/src/main/java/com/kmall/admin/entity/mk/MkActivitiesScoreEntity.java

@@ -36,10 +36,6 @@ public class MkActivitiesScoreEntity implements Serializable {
      */
     private Long mkaId;
     /**
-     * 截止日期
-     */
-    private Date deadline;
-    /**
      * 是否参与，0:参与 1:不参与
      */
     private String reject;
@@ -125,19 +121,6 @@ public class MkActivitiesScoreEntity implements Serializable {
     public Long getMkaId() {
         return mkaId;
     }
-    /**
-     * 设置：截止日期
-     */
-    public void setDeadline(Date deadline) {
-        this.deadline = deadline;
-    }
-
-    /**
-     * 获取：截止日期
-     */
-    public Date getDeadline() {
-        return deadline;
-    }
 
     public String getReject() {
         return reject;

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivitiesScoreServiceImpl.java

@@ -112,16 +112,13 @@ public class MkActivitiesScoreServiceImpl implements MkActivitiesScoreService {
                 builder.put("sku", "商品SKU");
                 builder.put("prodBarcode", "商品条码");
                 builder.put("reject", "是否参与");
-                builder.put("deadlineStr", "截止日期");
 
                 R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
 
-                Date nowTime = new Date();
-
-                MkActivitiesScoreEntity mkActivitiesScoreEntity = queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(scoreReductionDTO.getProdBarcode(), scoreReductionDTO.getSku(), scoreReductionDTO.getStoreId(), nowTime);
+                MkActivitiesScoreEntity mkActivitiesScoreEntity = queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(scoreReductionDTO.getProdBarcode(), scoreReductionDTO.getSku(), scoreReductionDTO.getStoreId());
 
                 if (Objects.nonNull(mkActivitiesScoreEntity)) {
                     throw new RRException("该商品已经参与本次活动，商品{"+mkActivitiesScoreEntity.getProdBarcode()+"},sku,{"+mkActivitiesScoreEntity.getSku()+"}", 500);
@@ -130,8 +127,8 @@ public class MkActivitiesScoreServiceImpl implements MkActivitiesScoreService {
                 MkActivitiesScoreEntity scoreEntity = new MkActivitiesScoreEntity();
                 BeanUtils.copyProperties(scoreReductionDTO, scoreEntity);
                 Date updateTime = new Date();
-                DateTime dateTime = DateUtil.parseDate(scoreReductionDTO.getDeadlineStr());
-                scoreEntity.setDeadline(dateTime);
+//                DateTime dateTime = DateUtil.parseDate(scoreReductionDTO.getDeadlineStr());
+//                scoreEntity.setDeadline(dateTime);
                 scoreEntity.setMkaId(Long.parseLong(mkaId));
                 scoreEntity.setCreaterSn("0");
                 scoreEntity.setCreateTime(updateTime);
@@ -153,12 +150,11 @@ public class MkActivitiesScoreServiceImpl implements MkActivitiesScoreService {
      * @param prodBarcode 条码
      * @param sku         sku
      * @param storeId     门店id
-     * @param nowTime     当前时间
      * @return 实体
      */
     @Override
-    public MkActivitiesScoreEntity queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(String prodBarcode, String sku, Integer storeId, Date nowTime) {
-        return mkActivitiesScoreDao.queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(prodBarcode, sku, storeId, nowTime);
+    public MkActivitiesScoreEntity queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(String prodBarcode, String sku, Integer storeId) {
+        return mkActivitiesScoreDao.queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(prodBarcode, sku, storeId);
     }
 
     /**
@@ -173,17 +169,6 @@ public class MkActivitiesScoreServiceImpl implements MkActivitiesScoreService {
     }
 
     /**
-     * 查询当前时间的参与积分抵扣的sku
-     *
-     * @param date 当前时间
-     * @return sku
-     */
-    @Override
-    public List<MkActivitiesScoreEntity> queryDetailByTime(Date date) {
-        return mkActivitiesScoreDao.queryDetailByTime(date);
-    }
-
-    /**
      * 查询积分抵扣活动信息
      *
      * @param mkaIdList 活动id集合

kmall-admin/src/main/java/com/kmall/admin/service/mk/MkActivitiesScoreService.java

@@ -86,10 +86,9 @@ public interface MkActivitiesScoreService {
      * @param prodBarcode   条码
      * @param sku           sku
      * @param storeId       storeId
-     * @param nowTime       当前时间
      * @return              实体
      */
-    MkActivitiesScoreEntity queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(String prodBarcode, String sku, Integer storeId, Date nowTime);
+    MkActivitiesScoreEntity queryEntityByProdBarcodeAndSkuAndStoreIdAndTime(String prodBarcode, String sku, Integer storeId);
 
     /**
      * 批量新增
@@ -98,13 +97,6 @@ public interface MkActivitiesScoreService {
     void saveBatch(List<MkActivitiesScoreEntity> mkActivitiesScoreEntities);
 
     /**
-     * 查询当前时间的参与积分抵扣的sku
-     * @param date  当前时间
-     * @return      sku
-     */
-    List<MkActivitiesScoreEntity> queryDetailByTime(Date date);
-
-    /**
      * 查询积分抵扣活动信息
      * @param mkaIdList 活动id集合
      * @return          活动

kmall-admin/src/main/resources/XmlTemplate/ScoreReductionDTOList.xml

@@ -9,7 +9,6 @@
                 <mapping row="1" col="1">ScoreReductionDTO.prodBarcode</mapping>
                 <mapping row="1" col="2">ScoreReductionDTO.sku</mapping>
                 <mapping row="1" col="3">ScoreReductionDTO.reject</mapping>
-                <mapping row="1" col="4">ScoreReductionDTO.deadlineStr</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivitiesScoreDao.xml

@@ -9,7 +9,6 @@
         <result property="sku" column="sku"/>
         <result property="storeId" column="store_id"/>
         <result property="mkaId" column="mka_id"/>
-        <result property="deadline" column="deadline"/>
         <result property="reject" column="reject"/>
         <result property="createTime" column="create_time"/>
         <result property="createrSn" column="creater_sn"/>
@@ -24,7 +23,6 @@
 			`sku`,
 			`store_id`,
 			`mka_id`,
-			`deadline`,
 			`reject`,
 			`create_time`,
 			`creater_sn`,
@@ -41,7 +39,6 @@
     		`sku`,
     		`store_id`,
     		`mka_id`,
-    		`deadline`,
     		`reject`,
     		`create_time`,
     		`creater_sn`,
@@ -52,6 +49,9 @@
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')
 		</if>
+		<if test="mkaId != null and mkaId.trim() != ''">
+			AND mka_id = #{mkaId}
+		</if>
 		<if test="prodBarcode != null and prodBarcode.trim() != ''">
 			AND `prod_barcode` LIKE concat('%',#{prodBarcode},'%')
 		</if>
@@ -74,6 +74,9 @@
         <if test="name != null and name.trim() != ''">
             AND name LIKE concat('%',#{name},'%')
         </if>
+		<if test="mkaId != null and mkaId.trim() != ''">
+			AND mka_id = #{mkaId}
+		</if>
 		<if test="prodBarcode != null and prodBarcode.trim() != ''">
 			AND `prod_barcode` LIKE concat('%',#{prodBarcode},'%')
 		</if>
@@ -87,31 +90,13 @@
     		`sku`,
     		`store_id`,
     		`mka_id`,
-    		`deadline`,
-    		`reject`,
-    		`create_time`,
-    		`creater_sn`,
-    		`moder_sn`,
-    		`update_time`
-		from mk_activities_score
-		where prod_barcode = #{prodBarcode} and sku = #{sku} and store_id = #{storeId} and (deadline &gt; #{nowTime})
-	</select>
-
-    <select id="queryDetailByTime" resultType="com.kmall.admin.entity.mk.MkActivitiesScoreEntity">
-		select
-    		`id`,
-    		`prod_barcode`,
-    		`sku`,
-    		`store_id`,
-    		`mka_id`,
-    		`deadline`,
     		`reject`,
     		`create_time`,
     		`creater_sn`,
     		`moder_sn`,
     		`update_time`
 		from mk_activities_score
-		where deadline &gt; #{date}
+		where prod_barcode = #{prodBarcode} and sku = #{sku} and store_id = #{storeId}
 	</select>
 
     <select id="queryActivityInfoByMkaIdList" resultType="com.kmall.admin.entity.mk.MkActivitiesScoreEntity">
@@ -130,7 +115,6 @@
 			`sku`,
 			`store_id`,
 			`mka_id`,
-			`deadline`,
 			`reject`,
 			`create_time`,
 			`creater_sn`,
@@ -141,7 +125,6 @@
 			#{sku},
 			#{storeId},
 			#{mkaId},
-			#{deadline},
 			#{reject},
 			#{createTime},
 			#{createrSn},
@@ -155,7 +138,6 @@
 			`sku`,
 			`store_id`,
 			`mka_id`,
-			`deadline`,
 			`reject`,
 			`create_time`,
 			`creater_sn`,
@@ -168,7 +150,6 @@
 				#{item.sku},
 				#{item.storeId},
 				#{item.mkaId},
-				#{item.deadline},
 				#{item.reject},
 				#{item.createTime},
 				#{item.createrSn},
@@ -185,7 +166,6 @@
 			<if test="sku != null">`sku` = #{sku}, </if>
 			<if test="storeId != null">`store_id` = #{storeId}, </if>
 			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
-			<if test="deadline != null">`deadline` = #{deadline}, </if>
 			<if test="reject != null">`reject` = #{reject}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesscore.html

@@ -57,9 +57,9 @@
             <Form-item label="门店id" prop="storeId">
                 <i-input v-model="mkActivitiesScore.storeId" placeholder="门店id"/>
             </Form-item>
-            <Form-item label="抵扣比例" prop="scoreLimit">
+            <!--<Form-item label="抵扣比例" prop="scoreLimit">
                 <i-input v-model="mkActivitiesScore.scoreLimit" placeholder="抵扣比例"/>
-            </Form-item>
+            </Form-item>-->
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkActivitiesScore.mkaId" placeholder="营销活动编号"/>
             </Form-item>

kmall-admin/src/main/webapp/js/mk/mkactivitiesscore.js

@@ -27,7 +27,7 @@ $(function () {
 			{label: '商品条码', name: 'prodBarcode', index: 'prod_barcode', width: 150},
 			{label: 'sku', name: 'sku', index: 'sku', width: 150},
 			{label: '门店id', name: 'storeId', index: 'store_id', width: 80},
-			{label: '抵扣比例', name: 'scoreLimit', index: 'score_limit', width: 80},
+			// {label: '抵扣比例', name: 'scoreLimit', index: 'score_limit', width: 80},
 			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 100}
 			// {label: '截止日期', name: 'deadline', index: 'deadline', width: 200,
 			// 	formatter: function (value) {

sql/init/other_table.sql

@@ -177,7 +177,7 @@ CREATE TABLE `haikong_member_order_sync_resend`  (
   `order_amount` decimal(10, 3) DEFAULT NULL COMMENT '订单金额',
   `order_no` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '订单编号',
   `order_score` int(8) DEFAULT NULL COMMENT '订单抵扣积分数量',
-  `member_sys_order_id` int(11) DEFAULT NULL COMMENT '会员系统订单id，请求成功返回',
+  `member_sys_order_id` varchar(32) DEFAULT NULL COMMENT '会员系统订单id，请求成功返回',
   `resend_status` char(1) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '重发状态，0:等待重发 1:重发成功 2:重发失败 3:无需重发',
   `last_resend_time` datetime(0) DEFAULT NULL COMMENT '最后一次重发时间',
   `create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
@@ -3112,9 +3112,9 @@ CREATE TABLE `mk_activities_score`  (
   `prod_barcode` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '商品条码',
   `sku` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT 'sku',
   `store_id` int(11) DEFAULT NULL COMMENT '门店id',
-  `score_limit` decimal(10, 2) DEFAULT NULL COMMENT '积分最大抵扣比例，如：设为0.3，则积分最多抵扣当前订单价的30%',
+--   `score_limit` decimal(10, 2) DEFAULT NULL COMMENT '积分最大抵扣比例，如：设为0.3，则积分最多抵扣当前订单价的30%',
   `mka_id` bigint(20) DEFAULT NULL COMMENT '营销活动编号',
-  `deadline` datetime(0) DEFAULT NULL COMMENT '截止日期',
+--   `deadline` datetime(0) DEFAULT NULL COMMENT '截止日期',
   `reject` char(1) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '\n0：参与\n 1：不参与，如导入的商品为参与积分抵扣，则默认其余商品为不参与积分抵扣，\n如导入的商品为不参与积分抵扣，则默认其余商品为参与积分抵扣\r',
   `create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
   `creater_sn` varchar(22) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人编号',