From b3346765e430b43376b1a9ccecb34e13506f1923 Mon Sep 17 00:00:00 2001
From: DB <2502523450@qq.com>
Date: Wed, 24 Apr 2024 18:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8B=BC=E5=9B=A2=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cpop/core/base/enums/OrderSource.java    |  2 +-
 .../jambox/business/bo/EasyLearnUnionPayBo.java  |  2 +-
 .../service/impl/EasyLearnOrderServiceImpl.java  |  5 +++--
 .../framework/enums/EasyLearnPayPayEnum.java     |  8 +++++++-
 .../java/com/cpop/mall/web/CpopWxPayTests.java   | 16 ++++++++--------
 .../oam/web/CpopEasyLearnDataAnalyseTest.java    |  2 +-
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java b/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java
index fb981da..c0ce752 100644
--- a/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java
+++ b/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java
@@ -14,7 +14,7 @@ public enum OrderSource {
     MALL("Mall",0.002),
 
     /**
-     * 一次性支付
+     * 放心学
      */
     EASY_LEARN("EasyLearn",0.002),
 
diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java
index 979089c..bf5a687 100644
--- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java
+++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java
@@ -65,7 +65,7 @@ public class EasyLearnUnionPayBo {
      * 订单类型
      */
     @NotBlank(message = "联合支付类型不能为空")
-    @ApiModelProperty(value = "联合支付类型(WX_PAY:微信支付;PREPAYMENT:预付;REPAYMENT:还款;MEMBER:会员)",required = true)
+    @ApiModelProperty(value = "联合支付类型(WX_PAY:微信支付;PREPAYMENT:预付;REPAYMENT:还款;MEMBER:会员;GROUP_BOOKING:拼团)",required = true)
     private String easyLearnUnionPay;
 
     /**
diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java
index f076506..b9d4a87 100644
--- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java
+++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java
@@ -615,7 +615,7 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl<EasyLearnOrderMapper,
                             .setBody("联合支付")
                             .setOutTradeNo(easyLearnOrder.getId())
                             //元转分
-                            .setTotalFee(easyLearnOrder.getTotalAmount().scaleByPowerOfTen(2).intValue())
+                            .setTotalFee(StringUtils.equals(SpringUtils.getActiveProfile(), "prod") ? easyLearnOrder.getTotalAmount().scaleByPowerOfTen(2).intValue() : 1)
                             .setTradeType("JSAPI");
                     return wxPayService.createOrder(orderRequest);
                 }
@@ -667,7 +667,8 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl<EasyLearnOrderMapper,
                 //需要分账
                 String subMchId = wxPayHandler.getSubMchId(easyLearnOrder.getBrandId(), easyLearnOrder.getStoreId());
                 config.setSubMchId(subMchId);
-                wxPayAsyncTask.asyncWxPayProfitSharing(orderId, notifyResult, wxPayService, OrderSource.EASY_LEARN, easyLearnOrder.getRate());
+                wxPayAsyncTask.asyncWxPayProfitSharing(orderId, notifyResult, wxPayService,
+                        easyLearnOrder.getOrderType().equals(EasyLearnPayPayEnum.GROUP_BOOKING.getOrderType()) ? OrderSource.MALL : OrderSource.EASY_LEARN, easyLearnOrder.getRate());
             }
             JSONObject jsonObject = new JSONObject();
             EasyLearnPayPayEnum easyLearnPayPayEnum = EasyLearnPayPayEnum.getEasyLearnPayPayEnum(easyLearnOrder.getOrderType());
diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java
index 424d987..83e05b0 100644
--- a/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java
+++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java
@@ -43,7 +43,13 @@ public enum EasyLearnPayPayEnum {
     /**
      * 会员
      */
-    MEMBER("MEMBER",7);
+    MEMBER("MEMBER",7),
+
+    /**
+     * 拼团
+     */
+    GROUP_BOOKING("GROUP_BOOKING",8);
+
 
     EasyLearnPayPayEnum(String name, Integer orderType) {
         this.orderType = orderType;
diff --git a/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java b/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java
index 330eded..2b2ef17 100644
--- a/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java
+++ b/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java
@@ -56,14 +56,14 @@ public class CpopWxPayTests {
         amount.setRefund(refund)
                 .setTotal(refund)
                 .setCurrency("CNY");
-        request.setTransactionId("4200002123202402194880609914")
+        request.setTransactionId("4200002176202404245283534577")
                 //.setOutTradeNo("1000000000202401121937112562856")
                 //.setTransactionId(order.getOutOrderNo())
                 //.setOutTradeNo(order.getId())
                 .setNotifyUrl(wxPayProperties.getNotifyRefund())
                 .setOutRefundNo(IdUtil.getSnowflakeNextIdStr())
-                .setSubMchid("1618925571")
-                .setReason("先学后付测试退款")
+                .setSubMchid("1670749045")
+                .setReason("拼团测试退款")
                 .setAmount(amount);
         WxPayRefundV3Result result = wxPayService.refundV3(request);
         System.out.println(result);
@@ -136,8 +136,8 @@ public class CpopWxPayTests {
     @Test
     public void getOrderInfo() throws WxPayException {
         WxPayConfig config = wxPayService.getConfig();
-        config.setSubMchId("1661323640");
-        WxPayOrderQueryResult wxPayOrderQueryResult = wxPayService.queryOrder("4200002096202401188599394121", null);
+        config.setSubMchId("1670749045");
+        WxPayOrderQueryResult wxPayOrderQueryResult = wxPayService.queryOrder("4200002205202404240308986697", null);
         System.out.println(JSONObject.toJSONString(wxPayOrderQueryResult));
     }
 
@@ -175,10 +175,10 @@ public class CpopWxPayTests {
     @Test
     public void profitSharingFinish() throws WxPayException {
         ProfitSharingUnfreezeRequest profitSharingFinishRequest = new ProfitSharingUnfreezeRequest();
-        profitSharingFinishRequest.setTransactionId("4200002122202401129346519359");
-        profitSharingFinishRequest.setOutOrderNo("1745820005743910912");
+        profitSharingFinishRequest.setTransactionId("4200002205202404240308986697");
+        profitSharingFinishRequest.setOutOrderNo("140678614679425024");
         profitSharingFinishRequest.setDescription("结束分账");
-        profitSharingFinishRequest.setSubMchId("1661323640");
+        profitSharingFinishRequest.setSubMchId("1670749045");
         wxPayService.getProfitSharingService().profitSharingFinish(profitSharingFinishRequest);
     }
 
diff --git a/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopEasyLearnDataAnalyseTest.java b/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopEasyLearnDataAnalyseTest.java
index 96c378e..fbb8414 100644
--- a/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopEasyLearnDataAnalyseTest.java
+++ b/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopEasyLearnDataAnalyseTest.java
@@ -51,7 +51,7 @@ public class CpopEasyLearnDataAnalyseTest{
                     .select("out_order_no")
                     .select("create_time")
                     .from("j_wx_pay_profit_sharing")
-                    .where("create_time >= ?", "2024-04-08 19:00:00")
+                    .where("create_time >= ?", "2024-04-16 00:00:00")
                     //.between("create_time", "2023-04-23 00:00:00","2023-11-13 22:00:00")
                     .list();
             List<Row> insertList = new ArrayList<>();