diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 01f9bd332..2b3cb0dd3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxBusinessDataVo; import com.iformall.enums.EnumCouponContentType; import com.iformall.enums.EnumCouponSourceType; @@ -14,6 +15,7 @@ import com.iformall.enums.EnumRentContractAppStatus; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.WxBusinessService; +import com.iformall.service.WxMerchantService; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; @@ -39,6 +41,9 @@ public class WxBusinessController extends BaseController { private WxBusinessService wxBusinessService; @Autowired private ExcelService excelService; + @Autowired + private WxMerchantService wxMerchantService; + @ApiOperation("业态全列表接口") @@ -107,6 +112,15 @@ public class WxBusinessController extends BaseController { if (b.getIsSystem().intValue() == EnumYesOrNo.YES.getCode().intValue()) { return new ResultData(Result.ERROR,"不能修改系统默认业态"); } + //已经关联商户了不能删 + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(tenantEntity); + merchantQ.setBusinessId(b.getId()); + List merchantList = wxMerchantService.findList(merchantQ); + if (null != merchantList && merchantList.size() > 0 ) { + return new ResultData(Result.ERROR,"存在已关联的商户,不能删除"); + } + b.setIsDel(EnumYesOrNo.YES.getCode()); wxBusinessService.saveOrUpdate(b); return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index f71562115..4d6c5cb77 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -120,24 +120,29 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { //当成长值或积分规则新增时,将新增的数据一并返回给接口调用端 private String getScoreRulesNew(TenantEntity tenantEntity,String scoreRules,EnumScoreRules enumScoreRules){ JSONObject businessObject = WxScoreRules.getRuleObj(scoreRules, EnumScoreType.CONSUMPTION); - Map businessRuleMap = new HashMap(); + Map currentBusinessRuleMap = new HashMap(); if (null != businessObject) { JSONArray jsonArrayOld = businessObject.getJSONArray("childs"); if (null != jsonArrayOld && jsonArrayOld.size() > 0 ) { for (int i = 0 ; i < jsonArrayOld.size(); i++) { JSONObject o = jsonArrayOld.getJSONObject(i); Integer bussinessId = o.getInteger("businessId"); - businessRuleMap.put(bussinessId, o); + currentBusinessRuleMap.put(bussinessId, o); } } } //根据业态来匹配 + Map businessRuleMap = new HashMap(); List rootBusiness = wxBusinessService.findListAll(true,tenantEntity, null, null); if (null != rootBusiness && rootBusiness.size() > 0 ) { for (int i = 0 ; i < rootBusiness.size(); i++){ WxBusiness bu = rootBusiness.get(i); - if (!businessRuleMap.containsKey(bu.getId())){ - businessRuleMap.put(bu.getId(), WxScoreRules.createBusinessDefaultJson(bu.getId(),bu.getTitle())); + if (currentBusinessRuleMap.containsKey(bu.getId())) { + businessRuleMap.put(bu.getId(),currentBusinessRuleMap.get(bu.getId())); + }else { + if (!businessRuleMap.containsKey(bu.getId())){ + businessRuleMap.put(bu.getId(), WxScoreRules.createBusinessDefaultJson(bu.getId(),bu.getTitle())); + } } } }