diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 0e69b2dc4..af83de8b8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -5,10 +5,13 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCreditHistory; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.enums.EnumUserType; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCreditHistoryService; +import com.iformall.service.WxMerchantService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -31,6 +34,9 @@ public class WxCreditHistoryController extends BaseController { @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Autowired + private WxMerchantService wxMerchantService; + @ApiOperation("根据商户ID和消费金额获取所增加积分 取data里credit的值, 服务台会查询一般商户的信息,普通商户只会调用自己的id") @GetMapping("/findByMerchantIdAndSpend") @ApiImplicitParams({ @@ -74,7 +80,15 @@ public class WxCreditHistoryController extends BaseController { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); + WxMerchantBUser bUser = getUser(); + WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); + if (merchant != null && merchant.getIsAdmin() == 1) { + wxCreditHistory.setOperatorId(bUser.getId()); + wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); + wxCreditHistory.setMerchantId(null); + } final PageInfo page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } + } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index bb4a0896f..89915c6b5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -140,6 +140,10 @@ public class BaseController { if (basicInfo.getPoins() == null) { basicInfo.setPoins(user.getScore()); } + // 积分 + if (basicInfo.getCredit() == null) { + basicInfo.setCredit(user.getCredit()); + } wxCUserBasicInfoService.updateObj(basicInfo, user.getId()); } else { Date cur = new Date(); @@ -152,6 +156,7 @@ public class BaseController { basicInfo.setPoins(user.getScore()); basicInfo.setCreateDate(cur); basicInfo.setUpdateDate(cur); + basicInfo.setCredit(user.getCredit()); wxCUserBasicInfoService.save(basicInfo); } }