From ac9720570fea0c9efda4e21297c5abe6b3e8d272 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 11 Mar 2025 17:09:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=B0=E9=87=8D=20=E5=90=91=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=96=E6=95=B4=20=E4=BC=9A=E5=91=98=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/service/ShopActivateService.java  |  3 ++-
 .../service/impl/ShopActivateServiceImpl.java | 13 ++++-----
 .../czg/service/order/dto/VipPayParamDTO.java |  1 +
 .../service/impl/OrderInfoServiceImpl.java    | 14 +++++-----
 .../order/service/impl/PayServiceImpl.java    | 27 ++++++++++++++-----
 5 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateService.java
index 594e2b6c8..421a3fca0 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateService.java
@@ -24,11 +24,12 @@ public interface ShopActivateService extends IService<ShopActivate> {
 
     /**
      * @param memAmount  充值金额
+     * @param activateId 参加活动Id
      * @param relationId 关联Id
      *                   霸王餐时 订单id
      *                   充值奖励 的关联id 是tb_shop_user_flow的充值 记录id
      *                   支付/退款 tb_order_payment.id
      */
-    void giveActivate(ShopUser shopUser, BigDecimal memAmount, Long relationId);
+    void giveActivate(ShopUser shopUser, BigDecimal memAmount, Long activateId, Long relationId);
 
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
index c273dea22..ca18e9929 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
@@ -81,11 +81,11 @@ public class ShopActivateServiceImpl extends ServiceImpl<ShopActivateMapper, Sho
     }
 
     @Override
-    public void giveActivate(ShopUser shopUser, BigDecimal memAmount, Long relationId) {
-        ShopActivate activate = queryChain().select().eq(ShopActivate::getShopId, shopUser.getShopId())
-                .le(ShopActivate::getAmount, memAmount)
-                .orderBy(ShopActivate::getGiftAmount, false)
-                .one();
+    public void giveActivate(ShopUser shopUser, BigDecimal memAmount, Long activateId, Long relationId) {
+        if (activateId == null) {
+            return;
+        }
+        ShopActivate activate = getById(activateId);
         if (ObjectUtil.isNull(activate)) {
             return;
         }
@@ -164,7 +164,8 @@ public class ShopActivateServiceImpl extends ServiceImpl<ShopActivateMapper, Sho
     private List<ShopCoupon> getCoupons(String couponJson) {
         Map<String, Integer> couponMap;
         try {
-            couponMap = JSONObject.parseObject(couponJson, new TypeReference<>() {});
+            couponMap = JSONObject.parseObject(couponJson, new TypeReference<>() {
+            });
         } catch (Exception e) {
             return new ArrayList<>();
         }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
index 315f977a4..e3ccbbd81 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
@@ -16,6 +16,7 @@ public class VipPayParamDTO {
     @NotNull(message = "店铺不能为空")
     private Long shopId;
     private Long shopUserId;
+    private Long activateId;
     /**
      * 霸王餐使用
      */
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 2071a5f29..46f2eed9a 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -429,13 +429,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         couponNum = couponNum.subtract(orderDetail.getNum());
                     } else {
                         orderDetail.setCouponNum(couponNum);
-                        orderDetail.setPayAmount((orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(couponNum)).multiply(orderDetail.getUnitPrice()));
+                        orderDetail.setPayAmount((orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(couponNum)).multiply(orderDetail.getUnitPrice()).setScale(2, RoundingMode.DOWN));
                         couponNum = BigDecimal.ZERO;
                     }
-                    prodCouponAmount.setPrice((prodCouponAmount.getPrice().add(orderDetail.getUnitPrice())).multiply(orderDetail.getCouponNum()));
+                    prodCouponAmount.setPrice((prodCouponAmount.getPrice().add(orderDetail.getUnitPrice())).multiply(orderDetail.getCouponNum()).setScale(2, RoundingMode.DOWN));
                 } else {
                     orderDetail.setCouponNum(BigDecimal.ZERO);
-                    orderDetail.setPayAmount((orderDetail.getNum().subtract(orderDetail.getReturnNum())).multiply(orderDetail.getUnitPrice()));
+                    orderDetail.setPayAmount((orderDetail.getNum().subtract(orderDetail.getReturnNum())).multiply(orderDetail.getUnitPrice()).setScale(2, RoundingMode.DOWN));
                 }
                 totalAmount.setPrice(totalAmount.getPrice().add(orderDetail.getPayAmount()));
                 resultList.add(orderDetail);
@@ -535,8 +535,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     } else {
                         shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.CASH_IN);
                     }
+                    String extParam = czgCallBackDto.getExtParam();
+                    JSONObject jsonObject = JSONObject.parseObject(extParam);
                     if (isFree) {
-                        if (StrUtil.isBlank(czgCallBackDto.getExtParam())) {
+                        if (StrUtil.isBlank(jsonObject.getString("orderId"))) {
                             throw new ValidateException("霸王餐支付，订单号处理失败");
                         }
                         shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.FREE_IN);
@@ -550,8 +552,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
                     if (!isFree) {
                         //会员活动
-                        activateService.giveActivate(shopUser,
-                                new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN), flowId);
+                        activateService.giveActivate(shopUser, new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN),
+                                StrUtil.isNotBlank(jsonObject.getString("activateId")) ? jsonObject.getLong("activateId") : null, flowId);
                     }
 
                 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index 510402071..96b7de568 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -125,7 +125,7 @@ public class PayServiceImpl implements PayService {
             BigDecimalDTO totalAmount = new BigDecimalDTO(BigDecimal.ZERO);
             //最终打包费
             BigDecimalDTO packAmount = new BigDecimalDTO(BigDecimal.ZERO);
-            orderInfoService.processOrderDetails2(orderDetails, null, null, totalAmount, packAmount, payParam.isAllPack(), null,true);
+            orderInfoService.processOrderDetails2(orderDetails, null, null, totalAmount, packAmount, payParam.isAllPack(), null, true);
             BigDecimal payAmount = (totalAmount.getPrice().add(packAmount.getPrice())).multiply(BigDecimal.TWO);
             if (payAmount.compareTo(payParam.getAmount()) != 0) {
                 throw new ValidateException("霸王餐支付金额不正确");
@@ -338,7 +338,7 @@ public class PayServiceImpl implements PayService {
         Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
         if (!isFree) {
             //会员活动
-            shopActivateService.giveActivate(shopUser, payParam.getAmount(), flowId);
+            shopActivateService.giveActivate(shopUser, payParam.getAmount(), payParam.getActivateId(), flowId);
         }
         return CzgResult.success();
     }
@@ -353,7 +353,10 @@ public class PayServiceImpl implements PayService {
         AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空");
         String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
         initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, "", payParam.getAmount()));
-        String extParam = payParam.getOrderId() == null ? "" : payParam.getOrderId().toString();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
+        jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
+        String extParam = jsonObject.toJSONString();
         return jsPay(payParam.getShopId(), payParam.getPayType(), new CzgJsPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
                 "会员充值", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), extParam));
     }
@@ -368,7 +371,10 @@ public class PayServiceImpl implements PayService {
         AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空");
         String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
         initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, "", payParam.getAmount()));
-        String extParam = payParam.getOrderId() == null ? "" : payParam.getOrderId().toString();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
+        jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
+        String extParam = jsonObject.toJSONString();
         return ltPay(payParam.getShopId(), payParam.getPayType(), new CzgLtPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
                 payParam.getPayType(), "会员充值", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), extParam));
     }
@@ -381,7 +387,10 @@ public class PayServiceImpl implements PayService {
         AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在");
         String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
         initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, "", payParam.getAmount()));
-        String extParam = payParam.getOrderId() == null ? "" : payParam.getOrderId().toString();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
+        jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
+        String extParam = jsonObject.toJSONString();
         return scanPay(payParam.getShopId(), new CzgScanPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
                 "会员充值", clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), extParam));
     }
@@ -395,7 +404,10 @@ public class PayServiceImpl implements PayService {
         AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在");
         String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
         initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, payParam.getAuthCode(), payParam.getAmount()));
-        String extParam = payParam.getOrderId() == null ? "" : payParam.getOrderId().toString();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
+        jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
+        String extParam = jsonObject.toJSONString();
         return microPay(payParam.getShopId(), new CzgMicroPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
                 "会员充值", payParam.getAuthCode(), payParam.getBuyerRemark(), extParam));
     }
@@ -746,7 +758,8 @@ public class PayServiceImpl implements PayService {
                     map = JSONObject.parseObject(JSONObject.toJSONString(h5PayResp.getPayInfo()));
             case CzgJsPayResp jsPayResp ->
                     map = JSONObject.parseObject(JSONObject.toJSONString(jsPayResp.getPayInfo()));
-            case CzgLtPayResp ltPayResp -> map = JSONObject.parseObject(JSONObject.toJSONString(ltPayResp.getPayInfo()));
+            case CzgLtPayResp ltPayResp ->
+                    map = JSONObject.parseObject(JSONObject.toJSONString(ltPayResp.getPayInfo()));
             case CzgScanPayResp scanPayResp ->
                     map = JSONObject.parseObject(JSONObject.toJSONString(scanPayResp.getPayInfo()));
             default -> throw new IllegalStateException("Unexpected value: " + data);