Procházet zdrojové kódy

fix business

release_toaliyun_real
lin před 3 roky
rodič
revize
9494de54ed
3 změnil soubory, kde provedl 33 přidání a 0 odebrání
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java
  2. +27
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java Zobrazit soubor

@@ -68,6 +68,9 @@ public class WxScoreRulesController extends BaseController {
}else{ }else{
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"type"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"type");
} }
if (!wxScoreRules.checkRules()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"规则内容有项重复");
}
wxScoreRulesService.saveOrUpdate(wxScoreRules); wxScoreRulesService.saveOrUpdate(wxScoreRules);
return new ResultData(); return new ResultData();
} }


+ 27
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java Zobrazit soubor

@@ -12,7 +12,9 @@ import lombok.EqualsAndHashCode;




import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;


/** /**
* 1. 每天登录首次给成长值 * 1. 每天登录首次给成长值
@@ -161,5 +163,30 @@ public class WxScoreRules extends BaseTenantEntity {
String json = "{\"businessId\":"+businessId+",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" ; String json = "{\"businessId\":"+businessId+",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" ;
return JSONObject.parseObject(json); return JSONObject.parseObject(json);
} }
public boolean checkRules() {
if (rules == null)
return true;

List<JSONObject> list = JSONObject.parseArray(rules, JSONObject.class);
if (list == null)
return true;
if (list.size() == 0)
return true;

Map<Integer,Integer> rootIdCount = new HashMap<Integer,Integer>();
for (JSONObject jo:list) {
Integer id = jo.getInteger(WxScoreRules.ID);
if ( id!= null){
Integer idcont = rootIdCount.get(id);
if (null != idcont && idcont > 0) {
return false;
}else {
rootIdCount.put(id, 1);
}
}
}
return true;
}


} }

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java Zobrazit soubor

@@ -208,6 +208,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {


@Override @Override
public void saveOrUpdate(WxScoreRules record) { public void saveOrUpdate(WxScoreRules record) {
//校验规则不能重复
Date date = new Date(); Date date = new Date();
record.setUpdateDate(date); record.setUpdateDate(date);
if (record.getId() == null) { if (record.getId() == null) {


Načítá se…
Zrušit
Uložit