Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2573,7 +2573,6 @@ public class OrderServiceImpl implements OrderService {
 
             processRecordEntity.setPaymentStartTime(new Date());
             // 判断是微信的支付码还是支付宝的支付码
-            env="prod";
             if (!org.springframework.util.StringUtils.isEmpty(env) && Constants.PROD.equals(env)) {
                 if (parCode.startsWith("28")) {
                     // 支付宝支付

kmall-admin/src/main/java/com/kmall/admin/service/impl/vip/Mall2PointsRulesServiceImpl.java

@@ -64,14 +64,6 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
 
     @Override
     public R save(Mall2PointsRulesEntity mall2PointsRules) {
-        //校验 积分类型和是否启用 查询出不让增加
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("pointsType",mall2PointsRules.getPointsType());
-        map.put("isValid", Dict.isValid.item_0.getItem());
-        List<Mall2PointsRulesEntity> mall2PointsRulesEntities = mall2PointsRulesDao.queryList(map);
-        if ((!mall2PointsRulesEntities.isEmpty()) && Dict.isValid.item_0.getItem().equals(mall2PointsRules.getIsValid())){
-            return R.error("已存在该积分类型有效数据,请确认再进行操作");
-        }
         //积分规则适用开始时间
         Date pointsBeginTime = mall2PointsRules.getPointsBeginTime();
         //积分规则适用结束时间
@@ -80,7 +72,22 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
         if (pointsBeginTime.getTime() > pointsEndTime.getTime()){
             return R.error("设置的开始时间和结束时间冲突");
         }
+        //校验 积分类型和是否启用 查询出不让增加
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("pointsType",mall2PointsRules.getPointsType());
+        map.put("isValid", Dict.isValid.item_0.getItem());
+        List<Mall2PointsRulesEntity> mall2PointsRulesEntities = mall2PointsRulesDao.queryList(map);
+        for (Mall2PointsRulesEntity mall2PointsRulesEntity : mall2PointsRulesEntities) {
+            if (Dict.isValid.item_0.getItem().equals(mall2PointsRules.getIsValid())){
+                //  之前结束时间要小于新增得开始时间
+                Boolean aBoolean = DateUtils.IsInterSection(mall2PointsRules.getPointsBeginTime(),mall2PointsRules.getPointsEndTime(),mall2PointsRulesEntity.getPointsBeginTime(),mall2PointsRulesEntity.getPointsEndTime());
+                if (aBoolean){
+                    return R.error("设置时间存在交集,请确认");
+                }
+                //不存在交集
+            }
 
+        }
         log.debug("积分规则添加数据:{}",JacksonUtil.toJson(mall2PointsRules));
         mall2PointsRulesDao.save(mall2PointsRules);
 
@@ -89,14 +96,6 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
 
     @Override
     public R update(Mall2PointsRulesEntity mall2PointsRules) {
-        //校验 积分类型和是否启用 查询出不让增加
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("pointsType",mall2PointsRules.getPointsType());
-        map.put("isValid", Dict.isValid.item_0.getItem());
-        List<Mall2PointsRulesEntity> mall2PointsRulesEntities = mall2PointsRulesDao.queryList(map);
-        if ((!mall2PointsRulesEntities.isEmpty()) && Dict.isValid.item_0.getItem().equals(mall2PointsRules.getIsValid())){
-            return R.error("已存在该积分类型有效数据,请确认再进行操作");
-        }
         //积分规则适用开始时间
         Date pointsBeginTime = mall2PointsRules.getPointsBeginTime();
         //积分规则适用结束时间
@@ -105,6 +104,22 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
         if (pointsBeginTime.getTime() > pointsEndTime.getTime()){
             return R.error("设置的开始时间和结束时间冲突");
         }
+        //校验 积分类型和是否启用 查询出不让增加
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("pointsType",mall2PointsRules.getPointsType());
+        map.put("isValid", Dict.isValid.item_0.getItem());
+        List<Mall2PointsRulesEntity> mall2PointsRulesEntities = mall2PointsRulesDao.queryList(map);
+        for (Mall2PointsRulesEntity mall2PointsRulesEntity : mall2PointsRulesEntities) {
+            if (Dict.isValid.item_0.getItem().equals(mall2PointsRules.getIsValid())){
+                //  之前结束时间要小于新增得开始时间
+                Boolean aBoolean = DateUtils.IsInterSection(mall2PointsRules.getPointsBeginTime(),mall2PointsRules.getPointsEndTime(),mall2PointsRulesEntity.getPointsBeginTime(),mall2PointsRulesEntity.getPointsEndTime());
+                if (aBoolean){
+                    return R.error("设置时间存在交集,请确认");
+                }
+                //不存在交集
+            }
+
+        }
         log.debug("积分规则修改数据:{}",JacksonUtil.toJson(mall2PointsRules));
         mall2PointsRulesDao.update(mall2PointsRules);
         return R.ok("修改成功");

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

@@ -27,7 +27,15 @@ $(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: 'reject', index: 'reject', width: 80},
+			{label: '是否参与', name: 'reject', index: 'reject', width: 80,formatter: function (value) {
+					if (value == '0') {
+						return '参与';
+					} else if (value == '1') {
+						return '不参与';
+					}
+					return '-';
+				}
+			},
 			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 100}
 			// {label: '截止日期', name: 'deadline', index: 'deadline', width: 200,
 			// 	formatter: function (value) {

kmall-admin/src/main/webapp/js/vip/mall2pointsrules.js

@@ -155,8 +155,8 @@ let vm = new Vue({
 			});
 			//修改会出现问题
 			if (vm.mall2PointsRules.mprId != null){
-				vm.mall2PointsRules.pointsBeginTime=pointsBeginTime.replaceAll(" ","T");
-				vm.mall2PointsRules.pointsEndTime=pointsEndTime.replaceAll(" ","T");
+				vm.mall2PointsRules.pointsBeginTime=pointsBeginTime;
+				vm.mall2PointsRules.pointsEndTime=pointsEndTime;
 			}
 
 		},

kmall-common/src/main/java/com/kmall/common/utils/DateUtils.java

@@ -324,4 +324,35 @@ public class DateUtils {
         return add(Calendar.DATE,date,value);
     }
 
+    /**
+     * 判断时间是否存在交集
+     * @param startDateOne 第一个时间段的开始时间
+     * @param endDateOne 第一个时间段的结束时间
+     * @param startDateTwo 第二个时间段的开始时间
+     * @param endDateTwo 第二个时间段的结束时间
+     * @return
+     * true 代表存在
+     * false 不存在
+     */
+    public static Boolean IsInterSection(Date startDateOne,Date endDateOne,Date startDateTwo,Date endDateTwo)
+    {
+        Date maxStartDate = startDateOne;
+        if(maxStartDate.before(startDateTwo))
+        {
+            maxStartDate = startDateTwo;
+        }
+
+        Date minEndDate = endDateOne;
+        if(endDateTwo.before(minEndDate))
+        {
+            minEndDate = endDateTwo;
+        }
+        if(maxStartDate.before(minEndDate) || (maxStartDate.getTime() == minEndDate.getTime()))
+        {
+            return true;
+        }
+        else {
+            return  false;
+        }
+    }
 }