Просмотр исходного кода

fix business

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
290a1f53c5
2 измененных файлов: 23 добавлений и 4 удалений
  1. +14
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
  2. +9
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java

+ 14
- 0
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<WxMerchant> 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();


+ 9
- 4
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<Integer,JSONObject> businessRuleMap = new HashMap<Integer,JSONObject>();
Map<Integer,JSONObject> currentBusinessRuleMap = new HashMap<Integer,JSONObject>();
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<Integer,JSONObject> businessRuleMap = new HashMap<Integer,JSONObject>();
List<WxBusiness> 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()));
}
}
}
}


Загрузка…
Отмена
Сохранить