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

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

@@ -123,7 +123,7 @@ public class Mall2PointsRulesController {
             return R.error("导入失败！");
         }
 
-        return mall2PointsRulesService.rulesUploadDetil(mall2RulesDtoList,mkaId);
+        return mall2PointsRulesService.rulesUploadDetil(mall2RulesDtoList,mkaId,false);
     }
 
     /**

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

@@ -51,7 +51,7 @@ public class Mall2PointsRulesDetilServiceImpl implements Mall2PointsRulesDetilSe
         mall2RulesDto.setRulesType(Integer.toString(rulesType));
         List<Mall2RulesDto> mall2RulesDtos = new ArrayList<>();
         mall2RulesDtos.add(mall2RulesDto);
-        return mall2PointsRulesService.rulesUploadDetil(mall2RulesDtos, mall2RulesDto.getMkaId());
+        return mall2PointsRulesService.rulesUploadDetil(mall2RulesDtos, mall2RulesDto.getMkaId(),false);
     }
 
     @Override
@@ -60,7 +60,7 @@ public class Mall2PointsRulesDetilServiceImpl implements Mall2PointsRulesDetilSe
         mall2RulesDto.setRulesType(Integer.toString(rulesType));
         List<Mall2RulesDto> mall2RulesDtos = new ArrayList<>();
         mall2RulesDtos.add(mall2RulesDto);
-        return mall2PointsRulesService.updateRulesDetil(mall2RulesDtos,mall2RulesDto.getMkaId());
+        return mall2PointsRulesService.rulesUploadDetil(mall2RulesDtos,mall2RulesDto.getMkaId(),true);
     }
 
     @Override

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

@@ -80,19 +80,25 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
 
     /**
      * 积分规则明细导入
+     * 使用原来逻辑和修改整合在一起
+     * isUpdate是否是修改
      * @param pointsRulesList
      * @param mkaId
      */
     @Override
-    public R rulesUploadDetil(List<Mall2RulesDto> pointsRulesList, Long mkaId) {
+    public R rulesUploadDetil(List<Mall2RulesDto> pointsRulesList, Long mkaId,Boolean isUpdate) {
         StringBuilder stringBuilder = new StringBuilder();
         Integer pointsType = mall2PointsRulesDao.queryRulesDetilId(mkaId);
         if(pointsRulesList.size()>0){
             for(Mall2RulesDto mall2RulesDto : pointsRulesList) {
+                log.debug("积分规则明细导入数据:{}",JacksonUtil.toJson(mall2RulesDto));
                 //校验参数
                 checkMsg(pointsType,mall2RulesDto);
                 //获取门店ID
                 Long id = storeDao.queryObjectRulesByName(Objects.isNull(mall2RulesDto.getStoreName()) ? "": mall2RulesDto.getStoreName().trim());
+                if (Objects.isNull(id)){
+                    return R.error("门店名称不存在请确认再进行添加");
+                }
                 mall2RulesDto.setStoreId(id);
                 switch (pointsType) {
                     //门店
@@ -100,6 +106,7 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
                         Long store = storeDao.queryObjectRulesByName(mall2RulesDto.getPointsRulesName().trim());
                         if (Objects.isNull(store)){
                             stringBuilder.append(mall2RulesDto.getPointsRulesName()+"的门店名称不存在请确认再添加,");
+                            continue;
 //                            return R.error("门店名称不存在请确认再添加");
                         }
                         mall2RulesDto.setRulesId(store+"");
@@ -109,6 +116,7 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
                         Long category = categoryDao.queryObjectCategoryByName(mall2RulesDto.getPointsRulesName().trim());
                         if (Objects.isNull(category)){
                             stringBuilder.append(mall2RulesDto.getPointsRulesName()+"的类别名称不存在请确认再添加,");
+                            continue;
 //                            return R.error("类别名称不存在请确认再添加");
                         }
                         mall2RulesDto.setRulesId( category+ "");
@@ -118,6 +126,7 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
                         String s = productStoreRelaDao.queryproductStoreByName(mall2RulesDto.getPointsRulesName().trim(), id);
                         if (Objects.isNull(s)){
                             stringBuilder.append(mall2RulesDto.getPointsRulesName()+"的商品条码不存在请确认再添加,");
+                            continue;
 //                            return R.error("商品条码不存在请确认再添加");
                         }
                         mall2RulesDto.setRulesId(mall2RulesDto.getPointsRulesName().trim());
@@ -144,10 +153,16 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
                 return R.error(stringBuilder.toString());
             }
 
-            if(pointsRulesList.size()>0){
+            if(pointsRulesList.size()>0 && isUpdate == false){
                 log.debug("积分规则明细导入数据:{}", JacksonUtil.toJson(pointsRulesList));
                 mall2PointsRulesDao.saveMall2PointsRulesDetil(pointsRulesList);
             }
+            if(pointsRulesList.size()>0 && isUpdate){
+                log.debug("积分规则明细修改数据:{}", JacksonUtil.toJson(pointsRulesList));
+                mall2PointsRulesDao.updateMall2PointsRulesDetil(pointsRulesList);
+            }
+
+
         }
         return R.ok();
     }

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

@@ -76,7 +76,7 @@ public interface Mall2PointsRulesService {
      */
     int deleteBatch(Integer[] mprIds);
 
-    R rulesUploadDetil(List<Mall2RulesDto> pointsRulesList, Long mkaId);
+    R rulesUploadDetil(List<Mall2RulesDto> pointsRulesList, Long mkaId,Boolean isUpdate);
 
     R updateRulesDetil(List<Mall2RulesDto> pointsRulesList, Long mkaId);
 

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2PointsRulesDao.xml

@@ -231,10 +231,10 @@
 					points_rules_type=#{item.pointsRulesType},
 				</if>
 				<if test="item.rulesId != null and item.rulesId !=''">
-					points_detil_name=#{item.rulesId},
+					points_detil_name=#{item.pointsRulesName},
 				</if>
 				<if test="item.pointsRulesName != null and item.pointsRulesName !=''">
-					points_detil_name_id=#{item.pointsRulesName},
+					points_detil_name_id=#{item.rulesId},
 				</if>
 				<if test="item.storeName != null and item.storeName !=''">
 					points_store_name=#{item.storeName},

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

@@ -56,23 +56,23 @@
 <!--                </i-select>-->
 <!--            </Form-item>-->
             <div v-show="pointsType==0">
-                <Form-item label="门店名称" prop="goodsSn">
+                <Form-item label="门店名称" prop="pointsRulesName">
                     <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="门店名称"/>
                 </Form-item>
             </div>
             <div v-show="pointsType==1">
-                <Form-item label="类别名称" prop="goodsSn">
+                <Form-item label="类别名称" prop="pointsRulesName">
                     <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="类别名称"/>
                 </Form-item>
-                <Form-item label="对应的商品门店" prop="goodsSn">
+                <Form-item label="对应的商品门店" prop="storeName">
                     <i-input v-model="mall2PointsRulesDetil.storeName" placeholder="门店名称"/>
                 </Form-item>
             </div>
             <div v-show="pointsType==2">
-                <Form-item label="商品条码" prop="goodsSn">
+                <Form-item label="商品条码" prop="pointsRulesName">
                     <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="商品条码"/>
                 </Form-item>
-                <Form-item label="对应的商品门店" prop="goodsSn">
+                <Form-item label="对应的商品门店" prop="storeName">
                     <i-input v-model="mall2PointsRulesDetil.storeName" placeholder="门店名称"/>
                 </Form-item>
             </div>