1

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/controller/PaymentController.java

@@ -145,11 +145,10 @@ public class PaymentController {
         } else if (PaymentWay.WX.getVal().equals(paymentParam.getPaymentCategory())) {
             // 微信支付：创建微信支付订单
             WechatPayJsapiOrderDto orderDto = new WechatPayJsapiOrderDto();
-            orderDto.setOutTradeNo("ORDER_" + paymentParam.getOrderId() + "_" + System.currentTimeMillis());
+            orderDto.setOutTradeNo("ORDER_" + ctx.getSn() + "_" + System.currentTimeMillis());
-            orderDto.setDescription("订单支付-" + paymentParam.getOrderId());
+            orderDto.setDescription("订单支付-" + ctx.getSn());
             orderDto.setTotal(dbTotalAmount.multiply(new BigDecimal("100")).longValue()); // 转换为分
-            // TODO: 需要从上下文中获取用户openid，暂时使用固定值
+            orderDto.setOpenid(ctx.getWechatOpenid());
-            orderDto.setOpenid("test_openid");
 
             WechatPayJsapiOrderResponseDto response = wechatPayService.createMiniProgramOrder(orderDto);
 
@@ -158,7 +157,7 @@ public class PaymentController {
                     .eq(OrderInfoEntity::getId, paymentParam.getOrderId())
                     .set(OrderInfoEntity::getPaymentStatus, PaymentStatus.WeiZhiFu)
                     .set(OrderInfoEntity::getPaymentCategory, paymentParam.getPaymentCategory())
-                    .set(OrderInfoEntity::getSn, orderDto.getOutTradeNo())
+                    .set(OrderInfoEntity::getOutTradeNo, orderDto.getOutTradeNo())
                     .update();
 
             log.info("微信支付订单创建成功，订单ID：{}，微信订单号：{}", paymentParam.getOrderId(), orderDto.getOutTradeNo());

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java

@@ -270,4 +270,14 @@ public class OrderInfoEntity {
     @TableLogic
     private Boolean deleted;
 
+    /**
+     * 商户订单号
+     */
+    private String outTradeNo;
+
+    /**
+     * 支付时间
+     */
+    private LocalDateTime payTime;
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/PaymentContextResult.java

@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 public class PaymentContextResult {
 
     private Long orderId;
+    private String sn;
     private Long transCompanyId;
 
     private Long companyUserId;
@@ -22,6 +23,8 @@ public class PaymentContextResult {
 
     private String settlementWay;
 
+    private String wechatOpenid;
+
 }
 
 

njzscloud-svr/src/main/resources/application-dev.yml

@@ -56,15 +56,15 @@ mybatis-plus:
       port: 33061
 
 wechat:
-  app-id: wx3c06d9dd4e56c58d
+  app-id: wx989ea47a5ddf9bfb
-  app-secret: ff280a71a4c06fc2956178f8c472ef96
+  app-secret: 66c98dc487a372acb4f1931b38fee8ff
   base-url: https://api.weixin.qq.com
   pay:
     # 子商户配置
-    sub-app-id: wx3c06d9dd4e56c58d
+    sub-app-id: wx989ea47a5ddf9bfb
     sub-mch-id: 1900000100
     # API密钥（32位字符串）
-    api-key: your-32-character-api-key-here
+    api-key: 66c98dc487a372acb4f1931b38fee8ff
     # 证书序列号
     cert-serial-no: your-cert-serial-number
     # 私钥文件路径

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -195,13 +195,17 @@
         SELECT
             a.id AS orderId,
             a.trans_company_id AS transCompanyId,
+            a.sn,
             bc.user_id AS companyUserId,
             ma1.id AS companyAccountId,
             ma1.money AS companyBalance,
-            bc.settlement_way
+            bc.settlement_way,
+            sua.wechat_openid
         FROM order_info a
              LEFT JOIN biz_company bc ON bc.id = a.trans_company_id
              LEFT JOIN money_account ma1 ON ma1.user_id = bc.user_id
+             LEFT JOIN biz_driver bd ON a.driver_id = bd.id
+             LEFT JOIN sys_user_account sua ON bd.user_id = sua.user_id
         WHERE a.id = #{orderId}
     </select>
     <select id="getTruckInfo" resultType="com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity">