bug修复

kmall-admin/src/main/java/com/kmall/admin/controller/vip/Mall2PointsRulesController.java

@@ -85,9 +85,7 @@ public class Mall2PointsRulesController {
 //    @RequiresPermissions("mall2pointsrules:update")
     @ResponseBody
     public R update(@RequestBody Mall2PointsRulesEntity mall2PointsRules) {
-        mall2PointsRulesService.update(mall2PointsRules);
-
-        return R.ok();
+        return mall2PointsRulesService.update(mall2PointsRules);
     }
 
     /**

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

@@ -5,6 +5,7 @@ import com.kmall.admin.dto.Mall2RulesDto;
 import com.kmall.admin.entity.vip.Mall2PointsRulesDetilEntity;
 import com.kmall.admin.service.vip.Mall2PointsRulesDetilService;
 import com.kmall.admin.service.vip.Mall2PointsRulesService;
+import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,7 +50,10 @@ public class Mall2PointsRulesDetilServiceImpl implements Mall2PointsRulesDetilSe
     public R save(Mall2RulesDto mall2RulesDto) {
         Integer rulesType = mall2PointsRulesService.getRulesDetilId(mall2RulesDto.getMkaId());
         mall2RulesDto.setRulesType(Integer.toString(rulesType));
-        mall2RulesDto.setStoreName(mall2RulesDto.getPointsRulesName());
+        if (Dict.pointsType.item_0.getItem().equals(rulesType.toString())){
+            //门店再设置
+            mall2RulesDto.setStoreName(mall2RulesDto.getPointsRulesName());
+        }
         List<Mall2RulesDto> mall2RulesDtos = new ArrayList<>();
         mall2RulesDtos.add(mall2RulesDto);
         return mall2PointsRulesService.rulesUploadDetil(mall2RulesDtos, mall2RulesDto.getMkaId(),false);

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

@@ -72,6 +72,15 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
         if ((!mall2PointsRulesEntities.isEmpty()) && Dict.isValid.item_0.getItem().equals(mall2PointsRules.getIsValid())){
             return R.error("已存在该积分类型有效数据,请确认再进行操作");
         }
+        //积分规则适用开始时间
+        Date pointsBeginTime = mall2PointsRules.getPointsBeginTime();
+        //积分规则适用结束时间
+        Date pointsEndTime = mall2PointsRules.getPointsEndTime();
+        // 开始时间>结束时间 时间设置有问题
+        if (pointsBeginTime.getTime() > pointsEndTime.getTime()){
+            return R.error("设置的开始时间和结束时间冲突");
+        }
+
         log.debug("积分规则添加数据:{}",JacksonUtil.toJson(mall2PointsRules));
         mall2PointsRulesDao.save(mall2PointsRules);
 
@@ -79,8 +88,26 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
     }
 
     @Override
-    public int update(Mall2PointsRulesEntity mall2PointsRules) {
-        return mall2PointsRulesDao.update(mall2PointsRules);
+    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();
+        //积分规则适用结束时间
+        Date pointsEndTime = mall2PointsRules.getPointsEndTime();
+        // 开始时间>结束时间 时间设置有问题
+        if (pointsBeginTime.getTime() > pointsEndTime.getTime()){
+            return R.error("设置的开始时间和结束时间冲突");
+        }
+        log.debug("积分规则修改数据:{}",JacksonUtil.toJson(mall2PointsRules));
+        mall2PointsRulesDao.update(mall2PointsRules);
+        return R.ok("修改成功");
     }
 
     @Override

kmall-admin/src/main/java/com/kmall/admin/service/vip/Mall2PointsRulesService.java

@@ -58,7 +58,7 @@ public interface Mall2PointsRulesService {
      * @param mall2PointsRules 实体
      * @return 更新条数
      */
-    int update(Mall2PointsRulesEntity mall2PointsRules);
+    R update(Mall2PointsRulesEntity mall2PointsRules);
 
     /**
      * 根据主键删除

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

@@ -134,10 +134,10 @@ let vm = new Vue({
 		},
 		saveOrUpdate: function (event) {
             let url = vm.mall2PointsRules.mprId == null ? "../mall2pointsrules/save" : "../mall2pointsrules/update";
+            var pointsBeginTime=vm.mall2PointsRules.pointsBeginTime;
+            var pointsEndTime=vm.mall2PointsRules.pointsEndTime;
 			vm.mall2PointsRules.pointsBeginTime=vm.mall2PointsRules.pointsBeginTime.replaceAll("T"," ")+":00";
 			vm.mall2PointsRules.pointsEndTime=vm.mall2PointsRules.pointsEndTime.replaceAll("T"," ")+":00";
-			console.log(vm.mall2PointsRules.pointsBeginTime)
-			console.log(vm.mall2PointsRules.pointsEndTime)
 			$.ajax({
 				type: "POST",
 			    url: url,
@@ -153,6 +153,12 @@ let vm = new Vue({
                     }
                 }
 			});
+			//修改会出现问题
+			if (vm.mall2PointsRules.mprId != null){
+				vm.mall2PointsRules.pointsBeginTime=pointsBeginTime.replaceAll(" ","T");
+				vm.mall2PointsRules.pointsEndTime=pointsEndTime.replaceAll(" ","T");
+			}
+
 		},
         // 管理商品
 		showMkactivitiesGoods: function(mkaId){
@@ -186,8 +192,8 @@ let vm = new Vue({
 		getInfo: function(mprId){
 			$.get("../mall2pointsrules/info/"+mprId, function (r) {
                 vm.mall2PointsRules = r.mall2PointsRules;
-				vm.mall2PointsRules.pointsBeginTime = transDate(r.mall2PointsRules.pointsBeginTime, 'yyyy-MM-dd')
-				vm.mall2PointsRules.pointsEndTime = transDate(r.mall2PointsRules.pointsEndTime, 'yyyy-MM-dd')
+				vm.mall2PointsRules.pointsBeginTime=r.mall2PointsRules.pointsBeginTime.replaceAll(" ","T");
+				vm.mall2PointsRules.pointsEndTime=r.mall2PointsRules.pointsEndTime.replaceAll(" ","T");
             });
 		},
         reloadSearch: function() {