angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 业绩汇总添加赠品专区返回；

This commit is contained in:
cabbage 2025-10-27 16:37:19 +08:00
parent 0527468f5b
commit b2d29d0498
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -3238,12 +3238,22 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setDiscountAmount(disAmount); censusSummaryVo.setDiscountAmount(disAmount);
censusSummaryVo.setDiscountPv(disAchieve); censusSummaryVo.setDiscountPv(disAchieve);
// 赠品
BigDecimal giftPointAmount = BigDecimal.ZERO;
BigDecimal giftPointAchieve = BigDecimal.ZERO;
if (memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()) != null) {
giftPointAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()).getAmount();
giftPointAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()).getAchieve();
}
censusSummaryVo.setGiftPointAmount(giftPointAmount);
censusSummaryVo.setGiftPointPv(giftPointAchieve);
// 金额总计 // 金额总计
censusSummaryVo.setAmountTotal(censusSummaryVo.getRegisterAmount().add(censusSummaryVo.getUpgradeAmount()) censusSummaryVo.setAmountTotal(censusSummaryVo.getRegisterAmount().add(censusSummaryVo.getUpgradeAmount())
.add(censusSummaryVo.getRepurchaseAmount()).add(censusSummaryVo.getDiscountAmount())); .add(censusSummaryVo.getRepurchaseAmount()).add(censusSummaryVo.getDiscountAmount()).add(censusSummaryVo.getGiftPointAmount()));
// 业绩汇总 // 业绩汇总
censusSummaryVo.setPvTotal(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv()) censusSummaryVo.setPvTotal(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv())
.add(censusSummaryVo.getRepurchasePv()).add(censusSummaryVo.getDiscountPv())); .add(censusSummaryVo.getRepurchasePv()).add(censusSummaryVo.getDiscountPv()).add(censusSummaryVo.getGiftPointPv()));
censusSummaryList.add(censusSummaryVo); censusSummaryList.add(censusSummaryVo);
} }
return censusSummaryList; return censusSummaryList;

6
bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java
View File

@ -42,6 +42,12 @@ public class CensusSummaryVo {
@Excel(name = "五折业绩") @Excel(name = "五折业绩")
private BigDecimal discountPv; private BigDecimal discountPv;
@Excel(name = "赠品金额")
private BigDecimal giftPointAmount;
@Excel(name = "赠品业绩")
private BigDecimal giftPointPv;
/** /**
* 金额总计 * 金额总计
*/ */

2
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -630,7 +630,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
// } // }
} }
// 在线支付的订单支付方式为钱包 // 在线支付的订单支付方式为在线
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue()); saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
RetailOrderRegisterParam registerParam = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_REG_PARAM + pkMember + orderCode); RetailOrderRegisterParam registerParam = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_REG_PARAM + pkMember + orderCode);

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java
View File

@ -44,10 +44,12 @@ public enum EOrderType {
* 复购专区 -- 甄选专区（使用精品专区的商品） * 复购专区 -- 甄选专区（使用精品专区的商品）
*/ */
RETAIL_UPGRADE(42, "复购专区", 0), RETAIL_UPGRADE(42, "复购专区", 0),
/** /**
* 北大甄选 -- 商城专区 * 北大甄选 -- 商城专区
*/ */
RETAIL_REPURCHASE(43, "北大甄选", 0), RETAIL_REPURCHASE(43, "北大甄选", 0),
/** /**
* 赠品订单 * 赠品订单
*/ */