1、更改货币账户相关

2、更改门墩儿订单相关

citu-module-mall/citu-module-promotion-api/src/main/java/com/citu/module/promotion/enums/MessageTemplateConstants.java

@@ -7,8 +7,14 @@ package com.citu.module.promotion.enums;
  */
 public interface MessageTemplateConstants {
 
-    //======================= 小程序订阅消息模版 =======================
+    // ======================= 短信消息模版 =======================
 
-    String COMBINATION_SUCCESS = "拼团结果通知";
+    String SMS_ORDER_DELIVERY = "order_delivery"; // 短信模版编号
 
+    String SMS_BROKERAGE_WITHDRAW_AUDIT_APPROVE = "brokerage_withdraw_audit_approve"; // 佣金提现（审核通过）
+    String SMS_BROKERAGE_WITHDRAW_AUDIT_REJECT = "brokerage_withdraw_audit_reject"; // 佣金提现（审核不通过）
+
+    // ======================= 小程序订阅消息模版 =======================
+
+    String WXA_ORDER_DELIVERY = "订单发货通知";
 }

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/service/combination/CombinationRecordServiceImpl.java

@@ -47,7 +47,7 @@ import static com.citu.framework.common.util.collection.CollectionUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.afterNow;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.beforeNow;
 import static com.citu.module.promotion.enums.ErrorCodeConstants.*;
-import static com.citu.module.promotion.enums.MessageTemplateConstants.COMBINATION_SUCCESS;
+import static com.citu.module.promotion.enums.MessageTemplateConstants.WXA_ORDER_DELIVERY;
 
 // TODO 芋艿：等拼团记录做完，完整 review 下
 
@@ -228,7 +228,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
         // 构建并发送模版消息
         socialClientApi.sendWxaSubscribeMessage(new SocialWxaSubscribeMessageSendReqDTO()
                 .setUserId(record.getUserId()).setUserType(UserTypeEnum.MEMBER.getValue())
-                .setTemplateTitle(COMBINATION_SUCCESS)
+                .setTemplateTitle(WXA_ORDER_DELIVERY)
                 .setPage("pages/order/detail?id=" + record.getOrderId()) // 订单详情页
                 .addMessage("thing1", "商品拼团活动") // 活动标题
                 .addMessage("thing2", "恭喜您拼团成功！我们将尽快为您发货。")); // 温馨提示

citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -21,6 +21,8 @@ import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import com.citu.module.pay.enums.order.PayOrderStatusEnum;
 import com.citu.module.product.api.comment.ProductCommentApi;
 import com.citu.module.product.api.comment.dto.ProductCommentCreateReqDTO;
+import com.citu.module.system.api.social.SocialClientApi;
+import com.citu.module.system.api.social.dto.SocialWxaSubscribeMessageSendReqDTO;
 import com.citu.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
 import com.citu.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
 import com.citu.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
@@ -69,6 +71,7 @@ import static com.citu.framework.common.util.collection.CollectionUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.minusTime;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getTerminal;
+import static com.citu.module.promotion.enums.MessageTemplateConstants.WXA_ORDER_DELIVERY;
 import static com.citu.module.trade.enums.ErrorCodeConstants.*;
 
 /**

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/framework/pay/config/PayProperties.java

@@ -22,7 +22,7 @@ public class PayProperties {
      *
      * 实际上，对应的 PayNotifyController 的 notifyOrder 方法的 URL
      *
-     * 回调顺序：支付渠道（支付宝支付、微信支付） => yudao-module-pay 的 orderNotifyUrl 地址 => 业务的 PayAppDO.orderNotifyUrl 地址
+     * 回调顺序：支付渠道（支付宝支付、微信支付） => citu-module-pay 的 orderNotifyUrl 地址 => 业务的 PayAppDO.orderNotifyUrl 地址
      */
     @NotEmpty(message = "支付回调地址不能为空")
     @URL(message = "支付回调地址的格式必须是 URL")

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyRechargeServiceImpl.java

@@ -41,7 +41,6 @@ import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exce
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.addTime;
 import static com.citu.framework.common.util.json.JsonUtils.toJsonString;
 import static com.citu.framework.common.util.number.MoneyUtils.fenToYuanStr;
-import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
 import static com.citu.module.pay.enums.ErrorCodeConstants.*;
 import static com.citu.module.pay.enums.MessageTemplateConstants.WXA_WALLET_RECHARGER_PAID;
 import static com.citu.module.pay.enums.refund.PayRefundStatusEnum.*;
@@ -55,10 +54,7 @@ import static com.citu.module.pay.enums.refund.PayRefundStatusEnum.*;
 @Slf4j
 public class PayCurrencyRechargeServiceImpl implements PayCurrencyRechargeService {
 
-    /**
-     * TODO 芋艿：放到 payconfig
-     */
-    private static final Long WALLET_PAY_APP_ID = 11L;
+    private static final String PAY_APP_KEY = "currency";
 
     private static final String RECHARGE_ORDER_SUBJECT = "账户充值";
     /**
@@ -120,7 +116,7 @@ public class PayCurrencyRechargeServiceImpl implements PayCurrencyRechargeServic
 
         // 2.1 创建支付单
         Long payOrderId = payOrderService.createOrder(new PayOrderCreateReqDTO()
-                .setAppId(WALLET_PAY_APP_ID).setUserIp(userIp)
+                .setAppKey(PAY_APP_KEY).setUserIp(userIp)
                 .setMerchantOrderId(recharge.getId().toString()) // 业务的订单编号
                 .setSubject(RECHARGE_ORDER_SUBJECT).setBody("")
                 .setPrice(Math.toIntExact(recharge.getPayPrice()))
@@ -224,7 +220,7 @@ public class PayCurrencyRechargeServiceImpl implements PayCurrencyRechargeServic
         String currencyRechargeId = String.valueOf(id);
         String refundId = currencyRechargeId + "-refund";
         Long payRefundId = payRefundService.createPayRefund(new PayRefundCreateReqDTO()
-                .setAppId(WALLET_PAY_APP_ID).setUserIp(userIp)
+                .setAppKey(PAY_APP_KEY).setUserIp(userIp)
                 .setMerchantOrderId(currencyRechargeId)
                 .setMerchantRefundId(refundId)
                 .setReason("想退钱").setPrice(Math.toIntExact(currencyRecharge.getPayPrice())));

menduner/menduner-mall-api/pom.xml

@@ -11,18 +11,7 @@
 
     <artifactId>menduner-mall-api</artifactId>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <dependencies>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.26</version>
-        </dependency>
-
         <dependency>
             <groupId>com.citu</groupId>
             <artifactId>menduner-common</artifactId>

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/TradeOrderTypeMq.java

@@ -14,4 +14,6 @@ public class TradeOrderTypeMq {
 
     /** 发布众聘职位订单 **/
     public static final String PUBLISH_JOB_HIRE_ORDER_TOPIC = "PUBLISH_JOB_HIRE_ORDER_TOPIC";
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/order/TradeOrderServiceImpl.java

@@ -62,7 +62,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
      * <p>
      * 从 [支付管理 -> 应用信息] 里添加
      */
-    private static final Long PAY_APP_ID = 10L;
+    private static final String PAY_APP_KEY = "mde_job";
     @Resource
     private PayOrderApi payOrderApi;
     @Resource
@@ -97,7 +97,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
 
         // 2.1 创建支付单
         Long payOrderId = payOrderApi.createOrder(new PayOrderCreateReqDTO()
-                .setAppId(PAY_APP_ID).setUserIp(getClientIP()) // 支付应用
+                .setAppKey(PAY_APP_KEY).setUserIp(getClientIP()) // 支付应用
                 .setMerchantOrderId(tradeOrderDO.getId().toString()) // 业务的订单编号
                 .setSubject(createReqVO.getSpuName()).setBody("")
                 .setPrice(Math.toIntExact(createReqVO.getPrice())) // 价格信息
@@ -215,7 +215,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         String refundId = order.getId() + "-refund";
         // 2.2 创建退款单
         Long payRefundId = payRefundApi.createRefund(new PayRefundCreateReqDTO()
-                .setAppId(PAY_APP_ID).setUserIp(getClientIP()) // 支付应用
+                .setAppKey(PAY_APP_KEY).setUserIp(getClientIP()) // 支付应用
                 .setMerchantOrderId(String.valueOf(order.getId())) // 支付单号
                 .setMerchantRefundId(refundId)
                 .setReason("想退钱").setPrice(Math.toIntExact(order.getPrice()))).getCheckedData();// 价格信息