From 0b84792aafdba69069702321f67475fa05e144f9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Apr 2023 15:09:52 +0800
Subject: [PATCH] 判断空
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 97 ++++++++++++++++++++++++++++--------------------
1 files changed, 56 insertions(+), 41 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 761b355..91affc1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -72,6 +72,7 @@
private final AgentProducer agentProducer;
private final IPayService payService;
private final IMallAchieveService mallAchieveService;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
private final UnipayService unipayService;
private final MallMemberBankSignMapper mallMemberBankSignMapper;
@@ -325,53 +326,21 @@
orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
+ this.baseMapper.updateById(orderInfo);
+ //新增业绩，第一次购买套餐则升级用户为普通会员
- boolean hasTc = false;
- // 静态倍数
- List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
- if (CollUtil.isNotEmpty(orderItems)) {
- for (MallOrderItem orderItem : orderItems) {
- MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
- BigDecimal score = BigDecimal.ZERO;
- MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
- if (mallGoods.getIsNormal() == 2) {
- hasTc = true;
- score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
-// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti();
-// score = sku.getPresentPrice().multiply(staticMulti);
- // 普通商品也及时结算，不再10天结算
- } else {
- score = sku.getPresentPrice();
- }
-
- if (score.compareTo(BigDecimal.ZERO) > 0) {
- memberWalletService.add(score, member.getId(), "score");
- mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
-
- // 添加业绩
- mallAchieveService.add(orderItem.getId());
- }
- }
- }
-
- // 购买套餐后，升级为普通会员
- if (hasTc) {
- MallMember mallMember = memberMapper.selectById(member.getId());
- if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
- memberMapper.updateById(mallMember);
- }
- }
+ addAchieveAndUpdateLevel(orderInfo.getId(),member.getId());
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
+// agentProducer.sendOrderReturn(orderInfo.getId());
+ agentProducer.sendReturnMoneyMsg(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
throw new FebsException("非积分订单，无法使用积分支付");
}
- payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "prizeScore");
+ payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "score");
orderInfo.setPayOrderNo(orderInfo.getOrderNo());
orderInfo.setPayMethod("积分支付");
@@ -379,7 +348,7 @@
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
- mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue());
+ mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
break;
case "5":
// AgreementSignDto agreementSignDto = new AgreementSignDto();
@@ -457,6 +426,52 @@
return map;
}
+ /**
+ * 新增业绩，第一次购买套餐则升级用户为普通会员
+ * @param orderId
+ * @param memberId
+ */
+ private void addAchieveAndUpdateLevel(Long orderId,Long memberId){
+ MallOrderInfo orderInfo = this.baseMapper.selectById(orderId);
+ MallMember member = memberMapper.selectById(memberId);
+
+ boolean hasTc = false;
+ BigDecimal achieveAmount = BigDecimal.ZERO;
+ List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderId);
+ if (CollUtil.isNotEmpty(orderItems)) {
+ for (MallOrderItem orderItem : orderItems) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
+ MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
+ if (mallGoods.getIsNormal() == 2) {
+ hasTc = true;
+ achieveAmount = achieveAmount.add(sku.getPresentPrice().multiply(new BigDecimal(orderItem.getCnt())));
+ }
+ }
+ }
+
+ if (hasTc){
+ if(achieveAmount.compareTo(BigDecimal.ZERO) > 0) {
+ // 添加业绩
+ MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
+ mallAchieveRecord.setMemberId(memberId);
+ mallAchieveRecord.setAmount(achieveAmount);
+ mallAchieveRecord.setAchieveTime(orderInfo.getPayTime());
+ mallAchieveRecord.setOrderId(orderInfo.getId());
+ mallAchieveRecord.setIsNormal(2);
+ mallAchieveRecord.setPayTime(orderInfo.getPayTime());
+ mallAchieveRecordMapper.insert(mallAchieveRecord);
+ //得到三倍补助
+// BigDecimal multiply = achieveAmount.multiply(new BigDecimal(3));
+// memberWalletService.add(multiply, memberId, "commission");
+
+ }
+ if(member.getLevel().equals(MemberLevelEnum.FANS.getType())){
+ member.setLevel(MemberLevelEnum.NORMAL.getType());
+ memberMapper.updateById(member);
+ }
+ }
+ }
+
public static void main(String[] args) {
String str = "{\"biz_code\":\"JS000000\",\"biz_msg\":\"成功\",\"data\":\"{\\\"order_status\\\":\\\"P2000\\\",\\\"jp_order_no\\\":\\\"100120220826446740396081496064\\\",\\\"err_msg\\\":\\\"短信验证码不符\\\",\\\"err_code\\\":\\\"CP110026\\\",\\\"sign_no\\\":\\\"\\\",\\\"mch_order_no\\\":\\\"NO_2022082618263952399\\\"}\",\"mch_no\":\"888118000001971\",\"rand_str\":\"an2w7ulf5ru6upkk5bdg441kdi3gnpvu\",\"resp_code\":\"SUCCESS\",\"sec_key\":\"\",\"sign\":\"NiJXRTSIZ9xZMUOwEHiEHdZXmgL2cHUU5WUa1NbMRRzui0DIiuZSW4e31LjnBxwVwmy3uuPMP+tqhY8VLyC8uCFOdGdZI7e72VuRvyvaiW7/sqCrsfgPOBEjiGE/CmSMRoEXv9HmqCyNBF6iHSEhQJql5Yge30dQdyB6xFfqjk0=\",\"sign_type\":\"2\"}";
@@ -513,7 +528,8 @@
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
+ Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
+ if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
orderDetailVo.setExpressNo(expressInfo.getExpressNo());
orderDetailVo.setExpressCom(expressInfo.getExpressCom());
@@ -531,7 +547,6 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
}
- Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
if(2 == deliverType){
MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
if(ObjectUtil.isNotEmpty(mallShopApply)){
--
Gitblit v1.9.1