diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java index c34919f03..3b3cd4851 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -63,23 +63,6 @@ public class WxCreditHistoryController extends BaseController return new ResultData(); } - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCreditHistory wxCreditHistory) { - logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::update"); - wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::delete"); - wxCreditHistoryService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java index bbd372faa..ab8c80314 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java @@ -11,6 +11,6 @@ public class WxMerchantSimpleVo { private Long id; /**商户名**/ - @ApiModelProperty(value="商户名",name="name") + @ApiModelProperty(value="商户名",name="merchantName") private String merchantName; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumScoreRules.java b/mallinkService/src/main/java/com/iformall/enums/EnumScoreRules.java new file mode 100644 index 000000000..8c1167f68 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreRules.java @@ -0,0 +1,33 @@ +package com.iformall.enums; + +public enum EnumScoreRules { + + SCORE(1, "成长值"), + CREDIT(2, "积分") + ; + + public static EnumScoreRules getEnum(Integer code) { + for (EnumScoreRules value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumScoreRules(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index e76c60b2e..b11d822db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -225,7 +225,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return spendCredit(record); } if (record.getCreditType() == EnumScoreType.CHANGE_CREDIT.getCode()) { - //TODO 待实现 return changeCredit(record); } if (record.getCreditType() == EnumScoreType.CONSUMPTION.getCode()) { @@ -297,8 +296,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } private int changeCredit(WxCreditHistory record){ - //TODO 积分兑换扣减规则 - return 0; + int changeCredit = record.getCreditNum(); + return -changeCredit; } private int payAddCredit(WxCreditHistory record) { 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 24578eb3a..aacb927b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.enums.EnumBusiness; +import com.iformall.enums.EnumScoreRules; import com.iformall.enums.EnumScoreType; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.mapper.WxCUserMapper; @@ -60,7 +61,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxScoreRules scoreRules = new WxScoreRules(); scoreRules.setTenantId(tenantId); - scoreRules.setType(1); + scoreRules.setType(EnumScoreRules.SCORE.getCode()); List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { scoreRules = list.get(0); @@ -83,6 +84,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { //当成长值或积分规则新增时,将新增的数据一并返回给接口调用端 private String getScoreRulesNew(String scoreRules){ + //getJSONObject(1) 为EnumScoreType.CONSUMPTION(2, "消费")的下标值 JSONArray jsonArrayOld = JSONArray.parseArray(scoreRules).getJSONObject(1).getJSONArray("childs"); JSONArray jsonArrayDefault = JSONArray.parseArray(WxScoreRules.getDefaultRules()).getJSONObject(1).getJSONArray("childs"); if (jsonArrayOld.size() < jsonArrayDefault.size()) { @@ -109,8 +111,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { //将变更后的childs替换 JSONArray originalJSONArray = JSONArray.parseArray(scoreRules); JSONObject newJSONObject = new JSONObject(); - newJSONObject.put("id",2); + newJSONObject.put("id",EnumScoreType.CONSUMPTION.getCode()); newJSONObject.put("childs",childsJsonArray); + //移除下标为1的JSONArray 即:EnumScoreType.CONSUMPTION(2, "消费") originalJSONArray.remove(1); originalJSONArray.add(1,newJSONObject); return originalJSONArray.toJSONString(); @@ -133,7 +136,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxScoreRules scoreRules = new WxScoreRules(); scoreRules.setTenantId(tenantId); - scoreRules.setType(2); + scoreRules.setType(EnumScoreRules.CREDIT.getCode()); List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { scoreRules = list.get(0); @@ -166,7 +169,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { wxScoreRulesMapper.updateByPrimaryKeySelective(record); } - if (record != null && record.getType() == 1) { + if (record != null && record.getType() == EnumScoreRules.SCORE.getCode()) { // 缓存存在,删除缓存 String key = keyPrev + record.getTenantId(); boolean hasKey = scoreRulesRedisTemplate.hasKey(key); @@ -175,7 +178,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { logger.info("WxScoreRulesServiceImpl.saveOrUpdate() : 从缓存中删除成长值设置 >> " + record.toString()); } } - if (record != null && record.getType() == 2) { + if (record != null && record.getType() == EnumScoreRules.CREDIT.getCode()) { // 缓存存在,删除缓存 String key = creditKeyPrev + record.getTenantId(); boolean hasKey = scoreRulesRedisTemplate.hasKey(key);