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

[积分][修改]:B端商管商户能看到所有操作的兑换记录

release_toaliyun_real
hanxueda 7 лет назад
Родитель
Сommit
0572dbfa89
2 измененных файлов: 19 добавлений и 0 удалений
  1. +14
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  2. +5
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java

+ 14
- 0
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.common.ResultData;
import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxCreditHistory; 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.domain.vo.WxCreditHistoryVo;
import com.iformall.enums.EnumUserType; import com.iformall.enums.EnumUserType;
import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.WxCreditHistoryService; import com.iformall.service.WxCreditHistoryService;
import com.iformall.service.WxMerchantService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -31,6 +34,9 @@ public class WxCreditHistoryController extends BaseController {
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Autowired
private WxMerchantService wxMerchantService;

@ApiOperation("根据商户ID和消费金额获取所增加积分 取data里credit的值, 服务台会查询一般商户的信息,普通商户只会调用自己的id") @ApiOperation("根据商户ID和消费金额获取所增加积分 取data里credit的值, 服务台会查询一般商户的信息,普通商户只会调用自己的id")
@GetMapping("/findByMerchantIdAndSpend") @GetMapping("/findByMerchantIdAndSpend")
@ApiImplicitParams({ @ApiImplicitParams({
@@ -74,7 +80,15 @@ public class WxCreditHistoryController extends BaseController {
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list");
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); 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<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); final PageInfo<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }

} }

+ 5
- 0
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -140,6 +140,10 @@ public class BaseController {
if (basicInfo.getPoins() == null) { if (basicInfo.getPoins() == null) {
basicInfo.setPoins(user.getScore()); basicInfo.setPoins(user.getScore());
} }
// 积分
if (basicInfo.getCredit() == null) {
basicInfo.setCredit(user.getCredit());
}
wxCUserBasicInfoService.updateObj(basicInfo, user.getId()); wxCUserBasicInfoService.updateObj(basicInfo, user.getId());
} else { } else {
Date cur = new Date(); Date cur = new Date();
@@ -152,6 +156,7 @@ public class BaseController {
basicInfo.setPoins(user.getScore()); basicInfo.setPoins(user.getScore());
basicInfo.setCreateDate(cur); basicInfo.setCreateDate(cur);
basicInfo.setUpdateDate(cur); basicInfo.setUpdateDate(cur);
basicInfo.setCredit(user.getCredit());
wxCUserBasicInfoService.save(basicInfo); wxCUserBasicInfoService.save(basicInfo);
} }
} }


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