zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' into test

pull/17/head
tangqian 2023-06-17 16:43:26 +08:00
parent 7ca2a339b2 9c88d5c6e1
commit 41c099eaf6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -124,6 +124,9 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
@Override @Override
public PageResult<RechargeOrderRespVO> getRechargeOrderPage(RechargeOrderPageReqVO pageReqVO) { public PageResult<RechargeOrderRespVO> getRechargeOrderPage(RechargeOrderPageReqVO pageReqVO) {
Page<RechargeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); Page<RechargeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
Long tenantId = TenantContextHolder.getTenantId();
pageReqVO.setTenantId(tenantId);
rechargeOrderMapper.findListPage(page, pageReqVO); rechargeOrderMapper.findListPage(page, pageReqVO);
return new PageResult<>(page.getRecords(), page.getTotal()); return new PageResult<>(page.getRecords(), page.getTotal());
} }
@ -170,7 +173,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
if (promoterDrawVO.getOrderCount() == null) { if (promoterDrawVO.getOrderCount() == null) {
promoterDrawVO.setOrderCount(new BigDecimal(0)); promoterDrawVO.setOrderCount(new BigDecimal(0));
} }
promoterDrawVO.setDrawAmount(NumberUtil.mul(promoterDrawVO.getDealAmount(), NumberUtil.div(promoterDrawVO.getMemberCommission().toString(), "100"), 2)); promoterDrawVO.setDrawAmount(NumberUtil.mul(promoterDrawVO.getDealAmount(), NumberUtil.div(promoterDrawVO.getMemberCommission().toString(), "100")));
// PromoterDrawVO promoterDrawNew = nameList.get(promoterDrawVO.getUserId()); // PromoterDrawVO promoterDrawNew = nameList.get(promoterDrawVO.getUserId());
// if (promoterDrawNew != null) { // if (promoterDrawNew != null) {