Преглед изворни кода

[修复][数据]增加积分接口异常数据修复

release_toaliyun_real
Burce пре 6 година
родитељ
комит
9fe5db1e4c
1 измењених фајлова са 17 додато и 2 уклоњено
  1. +17
    -2
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java

+ 17
- 2
mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java Прегледај датотеку

@@ -8,6 +8,7 @@ import com.iformall.domain.po.*;
import com.iformall.enums.EnumMsgModel; import com.iformall.enums.EnumMsgModel;
import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumScoreType;
import com.iformall.enums.EnumUserType; import com.iformall.enums.EnumUserType;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxCreditHistoryService; import com.iformall.service.WxCreditHistoryService;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
@@ -56,6 +57,9 @@ public class DataInitController extends BaseController {
@Resource @Resource
private WxMerchantBUserMapper merchantBUserMapper; private WxMerchantBUserMapper merchantBUserMapper;


@Resource
private WxMerchantMapper wxMerchantMapper;



@GetMapping("/init") @GetMapping("/init")
public ResultData init() { public ResultData init() {
@@ -130,7 +134,18 @@ public class DataInitController extends BaseController {
return; return;
} }


Map<String, Integer> result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(), wxCreditHistory.getTenantId());
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setStatus(1);
wxMerchant.setId(wxCreditHistory.getMerchantId());
List<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant);
if (wxMerchantList == null || wxMerchantList.size() == 0) {
log.debug(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage());
return;
}
//根据商户id和花费金额计算需要新增的积分
Map<String, Integer> result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(),wxCreditHistory.getTenantId());

//Map<String, Integer> result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(), wxCreditHistory.getTenantId());
Integer creditDB = wxCreditHistory.getCreditNum(); Integer creditDB = wxCreditHistory.getCreditNum();
Integer credit = result.get("credit"); Integer credit = result.get("credit");
if (Objects.equals(credit, creditDB)) { if (Objects.equals(credit, creditDB)) {
@@ -187,7 +202,7 @@ public class DataInitController extends BaseController {


} }
if (ret != null) { if (ret != null) {
log.debug("用户已有积分历史id: {}", ret.getId());
log.debug(" : {}", ret.getId());
return; return;
} }
WxCUser cuUser = cUserMapper.selectByPrimaryKey(co.getcUserId()); WxCUser cuUser = cUserMapper.selectByPrimaryKey(co.getcUserId());


Loading…
Откажи
Сачувај