新增分佣

src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java

@@ -73,7 +73,8 @@ public class SecurityConfig {
                         "/api/cms/form-record",
                         "/api/shop/merchant-account/getMerchantAccountByPhone",
                         "/api/hjm/hjm-car/**",
-                        "/api/chat/**"
+                        "/api/chat/**",
+                        "/api/shop/shop-order/test"
                   )
                 .permitAll()
                 .anyRequest()

src/main/java/com/gxwebsoft/common/core/utils/RequestUtil.java

@@ -4,6 +4,7 @@ import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.system.entity.DictData;
 import com.gxwebsoft.common.system.entity.Payment;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.entity.UserRole;
@@ -121,6 +122,24 @@ public class RequestUtil {
     return null;
   }
 
+  public User getByUserIdWithoutLogin(Integer userId) {
+    String path = "/system/user/getByUserId/" + userId;
+    try {
+      // 链式构建请求
+      String result = HttpRequest.get(getServerUrl().concat(path))
+        .header("Tenantid", TENANT_ID)
+        .timeout(20000)//超时，毫秒
+        .execute().body();
+      JSONObject jsonObject = JSONObject.parseObject(result);
+      System.out.println("jsonObject = " + jsonObject);
+      final String data = jsonObject.getString("data");
+      return JSONObject.parseObject(data, User.class);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
   // 新增用户
   public boolean saveUserByPhone(ShopMerchantAccount merchantAccount) {
     String path = "/system/user/";
@@ -173,7 +192,6 @@ public class RequestUtil {
     try {
       // 链式构建请求
       final String result = HttpRequest.get(getServerUrl().concat("/system/user-referee/getReferee/" + userId))
-        .header("Authorization", ACCESS_TOKEN)
         .header("Tenantid", TENANT_ID)
         .timeout(20000)
         .execute().body();
@@ -202,6 +220,21 @@ public class RequestUtil {
     }
   }
 
+  // 更新用户信息
+  public void updateWithoutLogin(User user) {
+    String path = "/system/user/updateWithoutLogin";
+    try {
+      // 链式构建请求
+      final String body = HttpRequest.put(getServerUrl().concat(path))
+        .header("Tenantid", TENANT_ID)
+        .body(JSONUtil.toJSONString(user))
+        .timeout(20000)
+        .execute().body();
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
   public String getMpOrderQrCode(String orderNo) {
     String path = "/wx-login/getOrderQRCode/";
     try {
@@ -271,6 +304,21 @@ public class RequestUtil {
     }
   }
 
+  public ApiResult<?> pageDictData(Integer dictId) {
+    String path = "/system/dict-data/page";
+    try {
+      // 链式构建请求
+      final String body = HttpRequest.get(getServerUrl().concat(path).concat("?dictId=" + dictId))
+        .header("tenantId", TENANT_ID)
+        .timeout(20000)
+        .execute().body();
+      return JSONUtil.parseObject(body, ApiResult.class);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+  }
+
   // 余额支付通知
   public void pushBalancePayNotify(Transaction transaction, Payment payment) {
     System.out.println("payment = " + payment);

src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java

@@ -3,11 +3,7 @@ package com.gxwebsoft.common.core.utils;
 import com.wechat.pay.java.core.Config;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-
-import javax.annotation.Resource;
 
 /**
  * 微信支付证书自动配置工具类
@@ -20,15 +16,6 @@ import javax.annotation.Resource;
 @Component
 public class WechatCertAutoConfig {
 
-    @Value("${spring.profiles.active:prod}")
-    private String activeProfile;
-
-    @Resource
-    private ConfigProperties configProperties;
-
-    @Resource
-    private ConfigProperties configProperties;
-
     /**
      * 创建微信支付自动证书配置
      * 
@@ -75,35 +62,15 @@ public class WechatCertAutoConfig {
     
     /**
      * 使用默认开发环境配置创建自动证书配置
-     * 根据当前环境自动选择证书路径
-     * 开发环境拼接规则：配置文件upload-path + dev/wechat/ + 租户ID
      * 
      * @return 微信支付配置对象
      */
     public Config createDefaultDevConfig() {
         String merchantId = "1723321338";
-        String privateKeyPath;
+        String privateKeyPath = "src/main/resources/certs/dev/wechat/apiclient_key.pem";
         String merchantSerialNumber = "2B933F7C35014A1C363642623E4A62364B34C4EB";
         String apiV3Key = "0kF5OlPr482EZwtn9zGufUcqa7ovgxRL";
         
-        // 根据环境选择证书路径
-        if ("dev".equals(activeProfile)) {
-            // 开发环境：使用配置文件upload-path拼接证书路径
-            String uploadPath = configProperties.getUploadPath(); // 配置文件路径
-            String tenantId = "10550"; // 租户ID
-            String certPath = uploadPath + "dev/wechat/" + tenantId + "/";
-            privateKeyPath = certPath + "apiclient_key.pem";
-
-            log.info("开发环境：使用配置文件upload-path拼接证书路径");
-            log.info("配置文件upload-path: {}", uploadPath);
-            log.info("证书基础路径: {}", certPath);
-            log.info("私钥文件路径: {}", privateKeyPath);
-        } else {
-            // 生产环境：使用相对路径，由系统动态解析
-            privateKeyPath = "src/main/resources/certs/dev/wechat/apiclient_key.pem";
-            log.info("生产环境：使用相对证书路径 - {}", privateKeyPath);
-        }
-
         return createAutoConfig(merchantId, privateKeyPath, merchantSerialNumber, apiV3Key);
     }
     

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -119,7 +119,7 @@ public class User implements UserDetails {
     private String payMoney;
 
     @Schema(description = "实际消费的金额(不含退款)")
-    private String expendMoney;
+    private BigDecimal expendMoney;
 
     @Schema(description = "会员等级ID")
     private Integer gradeId;

src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java

@@ -6,14 +6,15 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.config.CertificateProperties;
-import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.utils.*;
-import com.gxwebsoft.common.core.utils.CertificateLoader;
-import com.gxwebsoft.common.core.utils.WechatCertAutoConfig;
-import com.gxwebsoft.common.core.utils.WechatPayConfigValidator;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.DictData;
 import com.gxwebsoft.common.system.entity.Payment;
+import com.gxwebsoft.shop.entity.ShopGoods;
+import com.gxwebsoft.shop.service.ShopGoodsService;
 import com.gxwebsoft.shop.service.ShopOrderGoodsService;
 import com.gxwebsoft.shop.service.ShopOrderService;
 import com.gxwebsoft.shop.service.OrderBusinessService;
@@ -39,7 +40,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -72,8 +75,20 @@ public class ShopOrderController extends BaseController {
     private WechatCertAutoConfig wechatCertAutoConfig;
     @Resource
     private WechatPayConfigValidator wechatPayConfigValidator;
+    @Resource
+    private ShopGoodsService shopGoodsService;
     @Value("${spring.profiles.active}")
     String active;
+    @Resource
+    private RequestUtil requestUtil;
+
+    @Operation(summary = "分页查询订单")
+    @GetMapping("/test")
+    public ApiResult<?> test() {
+        requestUtil.setTenantId("10550");
+        User user = requestUtil.getByUserIdWithoutLogin(33035);
+        return success(user);
+    }
 
     @Operation(summary = "分页查询订单")
     @GetMapping("/page")
@@ -99,17 +114,37 @@ public class ShopOrderController extends BaseController {
 
     @Operation(summary = "添加订单")
     @PostMapping()
-  public ApiResult<?> save(@RequestBody OrderCreateRequest request) {
+    public ApiResult<?> save(@Valid @RequestBody OrderCreateRequest request) {
         User loginUser = getLoginUser();
         if (loginUser == null) {
             return fail("用户未登录");
         }
-
+        if (request.getTotalPrice() == null || request.getTotalPrice().compareTo(BigDecimal.ZERO) <= 0) {
+            if (request.getGoodsItems() != null && !request.getGoodsItems().isEmpty()) {
+                BigDecimal totalPrice = BigDecimal.ZERO;
+                int totalNum = 0;
+                for (OrderCreateRequest.OrderGoodsItem item : request.getGoodsItems()) {
+                    ShopGoods goods = shopGoodsService.getById(item.getGoodsId().toString());
+                    if (goods != null) {
+                        BigDecimal price = goods.getPrice().multiply(new BigDecimal(item.getQuantity().toString()));
+                        totalPrice = totalPrice.add(price);
+                        totalNum += Integer.parseInt(item.getQuantity().toString());
+                    }
+                }
+                request.setTotalPrice(totalPrice);
+                request.setPayPrice(totalPrice);
+                request.setTotalNum(totalNum);
+                request.setFormId(Integer.parseInt(request.getGoodsItems().get(0).getQuantity().toString()));
+            }
+        }
+        if (request.getTenantId() == null) {
+            request.setTenantId(getTenantId());
+        }
         try {
             Map<String, String> wxOrderInfo = orderBusinessService.createOrder(request, loginUser);
             return success("下单成功", wxOrderInfo);
         } catch (Exception e) {
-      logger.error("创建订单失败 - 用户ID：{}，请求：{}", loginUser.getUserId(), request, e);
+            logger.error("创建订单失败", e);
             return fail(e.getMessage());
         }
     }
@@ -199,19 +234,13 @@ public class ShopOrderController extends BaseController {
     @PutMapping("/repair")
     public ApiResult<?> repair(@RequestBody ShopOrder shopOrder) {
         final ShopOrder order = shopOrderService.getByOutTradeNo(shopOrder.getOrderNo());
-    if(order != null){
+        if (order != null) {
             shopOrderService.queryOrderByOutTradeNo(order);
             return success("修复成功");
         }
         return fail("修复失败");
     }
 
-  @Operation(summary = "统计订单总金额")
-  @GetMapping("/total")
-  public ApiResult<BigDecimal> total() {
-    return success(shopOrderService.total());
-  }
-
     @Schema(description = "异步通知")
     @PostMapping("/notify/{tenantId}")
     public String wxNotify(@RequestHeader Map<String, String> header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) {
@@ -249,41 +278,40 @@ public class ShopOrderController extends BaseController {
         // 创建通知配置 - 使用与下单方法相同的证书配置逻辑
         NotificationConfig config;
         try {
-      if (active.equals("dev")) {
+//            if (active.equals("dev")) {
-        // 开发环境 - 使用配置文件的upload-path构建证书路径
+//                // 开发环境 - 构建包含租户号的私钥路径
-        String uploadPath = conf.getUploadPath();
+//                String tenantCertPath = "dev/wechat/" + tenantId;
-        String tenantCertPath = uploadPath + "dev/wechat/" + tenantId;
+//                String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();
-        String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();
+//
-
+//                logger.info("开发环境异步通知证书路径: {}", privateKeyPath);
-        logger.info("开发环境异步通知证书路径: {}", privateKeyPath);
+//                logger.info("租户ID: {}, 证书目录: {}", tenantId, tenantCertPath);
-        logger.info("租户ID: {}, 证书目录: {}", tenantId, tenantCertPath);
+//
-
+//                // 检查证书文件是否存在
-        // 检查证书文件是否存在
+//                if (!certificateLoader.certificateExists(privateKeyPath)) {
-        if (!certificateLoader.certificateExists(privateKeyPath)) {
+//                    logger.error("证书文件不存在: {}", privateKeyPath);
-          logger.error("证书文件不存在: {}", privateKeyPath);
+//                    throw new RuntimeException("证书文件不存在: " + privateKeyPath);
-          throw new RuntimeException("证书文件不存在: " + privateKeyPath);
+//                }
-        }
+//
-
+//                String privateKey = certificateLoader.loadCertificatePath(privateKeyPath);
-        String privateKey = certificateLoader.loadCertificatePath(privateKeyPath);
+//
-
+//                // 使用验证器获取有效的 APIv3 密钥
-        // 使用验证器获取有效的 APIv3 密钥
+//                String apiV3Key = wechatPayConfigValidator.getValidApiV3Key(payment);
-        String apiV3Key = wechatPayConfigValidator.getValidApiV3Key(payment);
+//
-
+//                logger.info("私钥文件加载成功: {}", privateKey);
-        logger.info("私钥文件加载成功: {}", privateKey);
+//                logger.info("使用APIv3密钥来源: {}", payment.getApiKey() != null && !payment.getApiKey().trim().isEmpty() ? "数据库配置" : "配置文件默认");
-        logger.info("使用APIv3密钥来源: {}", payment.getApiKey() != null && !payment.getApiKey().trim().isEmpty() ? "数据库配置" : "配置文件默认");
+//                logger.info("APIv3密钥长度: {}", apiV3Key != null ? apiV3Key.length() : 0);
-        logger.info("APIv3密钥长度: {}", apiV3Key != null ? apiV3Key.length() : 0);
+//                logger.info("商户证书序列号: {}", payment.getMerchantSerialNumber());
-        logger.info("商户证书序列号: {}", payment.getMerchantSerialNumber());
+//
-
+//                // 使用自动证书配置
-        // 使用自动证书配置
+//                config = new RSAAutoCertificateConfig.Builder()
-        config = new RSAAutoCertificateConfig.Builder()
+//                        .merchantId(payment.getMchId())
-          .merchantId(payment.getMchId())
+//                        .privateKeyFromPath(privateKey)
-          .privateKeyFromPath(privateKey)
+//                        .merchantSerialNumber(payment.getMerchantSerialNumber())
-          .merchantSerialNumber(payment.getMerchantSerialNumber())
+//                        .apiV3Key(apiV3Key)
-          .apiV3Key(apiV3Key)
+//                        .build();
-          .build();
+//
-
+//                logger.info("✅ 开发环境使用自动证书配置创建通知解析器成功");
-        logger.info("✅ 开发环境使用自动证书配置创建通知解析器成功");
+//            } else {
-      } else {
             // 生产环境 - 使用自动证书配置
             final String certRootPath = certConfig.getCertRootPath();
             final String certBasePath = certRootPath + "/file";
@@ -304,7 +332,7 @@ public class ShopOrderController extends BaseController {
                     .build();
 
             logger.info("✅ 生产环境使用自动证书配置创建通知解析器成功");
-      }
+//            }
         } catch (Exception e) {
             logger.error("❌ 创建通知配置失败 - 租户ID: {}, 商户号: {}", tenantId, payment.getMchId(), e);
             logger.error("🔍 错误详情: {}", e.getMessage());

src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java

@@ -60,7 +60,7 @@ public class ShopDealerOrder implements Serializable {
     private Integer isSettled;
 
     @Schema(description = "结算时间")
-    private Integer settleTime;
+    private Long settleTime;
 
     @Schema(description = "商城ID")
     private Integer tenantId;

src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java

@@ -69,6 +69,9 @@ public class ShopGoods implements Serializable {
     @Schema(description = "经销商价格")
     private BigDecimal dealerPrice;
 
+    @Schema(description = "佣金")
+    private BigDecimal commission;
+
     @Schema(description = "库存计算方式(10下单减库存 20付款减库存)")
     private Integer deductStockType;
 

src/main/java/com/gxwebsoft/shop/service/ShopOrderGoodsService.java

@@ -39,4 +39,5 @@ public interface ShopOrderGoodsService extends IService<ShopOrderGoods> {
      */
     ShopOrderGoods getByIdRel(Integer id);
 
+    List<ShopOrderGoods> getListByOrderId(Integer orderId);
 }

src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gxwebsoft.shop.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.shop.mapper.ShopOrderGoodsMapper;
 import com.gxwebsoft.shop.service.ShopOrderGoodsService;
@@ -44,4 +45,12 @@ public class ShopOrderGoodsServiceImpl extends ServiceImpl<ShopOrderGoodsMapper,
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public List<ShopOrderGoods> getListByOrderId(Integer orderId) {
+        return list(
+                new LambdaQueryWrapper<ShopOrderGoods>()
+                        .eq(ShopOrderGoods::getOrderId, orderId)
+        );
+    }
+
 }

src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java

@@ -4,30 +4,25 @@
   import cn.hutool.core.util.StrUtil;
   import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
   import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-  import org.springframework.util.CollectionUtils;
   import com.gxwebsoft.common.core.config.ConfigProperties;
   import com.gxwebsoft.common.core.config.CertificateProperties;
-  import com.gxwebsoft.common.core.utils.RedisUtil;
+  import com.gxwebsoft.common.core.utils.*;
-  import com.gxwebsoft.common.core.utils.CertificateLoader;
+  import com.gxwebsoft.common.core.service.PaymentCacheService;
-import com.gxwebsoft.common.core.service.PaymentCacheService;
+  import com.gxwebsoft.common.core.web.ApiResult;
-  import com.gxwebsoft.common.core.utils.WechatPayDiagnostic;
-  import com.gxwebsoft.common.core.utils.WechatPayCertificateDiagnostic;
   import com.gxwebsoft.common.system.entity.Payment;
+  import com.gxwebsoft.common.system.entity.User;
+  import com.gxwebsoft.shop.entity.*;
+  import com.gxwebsoft.shop.service.*;
   import lombok.extern.slf4j.Slf4j;
   import com.gxwebsoft.common.system.service.PaymentService;
   import com.gxwebsoft.common.system.service.SettingService;
-  import com.gxwebsoft.shop.entity.ShopOrderGoods;
   import com.gxwebsoft.shop.mapper.ShopOrderMapper;
-  import com.gxwebsoft.shop.service.ShopOrderGoodsService;
-  import com.gxwebsoft.shop.service.ShopOrderService;
-  import com.gxwebsoft.shop.entity.ShopOrder;
   import com.gxwebsoft.shop.param.ShopOrderParam;
   import com.gxwebsoft.common.core.web.PageParam;
   import com.gxwebsoft.common.core.web.PageResult;
   import com.wechat.pay.java.core.Config;
   import com.wechat.pay.java.core.RSAConfig;
   import com.wechat.pay.java.core.RSAPublicKeyConfig;
-  import com.gxwebsoft.common.core.utils.WechatCertAutoConfig;
   import com.wechat.pay.java.core.exception.ServiceException;
   import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
   import com.wechat.pay.java.service.payments.jsapi.model.*;
@@ -38,10 +33,8 @@ import com.gxwebsoft.common.core.service.PaymentCacheService;
 
   import javax.annotation.Resource;
   import java.math.BigDecimal;
-  import java.util.HashMap;
+  import java.sql.Date;
-  import java.util.List;
+  import java.util.*;
-  import java.util.Map;
-  import java.util.Set;
   import java.util.stream.Collectors;
 
   /**
@@ -62,6 +55,8 @@ import com.gxwebsoft.common.core.service.PaymentCacheService;
     @Resource
     private ShopOrderGoodsService shopOrderGoodsService;
     @Resource
+    private ShopGoodsService shopGoodsService;
+    @Resource
     private PaymentService paymentService;
     @Resource
     private SettingService settingService;
@@ -77,6 +72,12 @@ import com.gxwebsoft.common.core.service.PaymentCacheService;
     private WechatPayDiagnostic wechatPayDiagnostic;
     @Resource
     private WechatPayCertificateDiagnostic certificateDiagnostic;
+    @Resource
+    private RequestUtil requestUtil;
+    @Resource
+    private ShopDealerOrderService shopDealerOrderService;
+    @Resource
+    private ShopDealerCapitalService shopDealerCapitalService;
 
     @Override
     public PageResult<ShopOrder> pageRel(ShopOrderParam param) {
@@ -243,6 +244,61 @@ import com.gxwebsoft.common.core.service.PaymentCacheService;
     @Override
     public void updateByOutTradeNo(ShopOrder order) {
       baseMapper.updateByOutTradeNo(order);
+      if (order.getTenantId().equals(10550)) {
+        requestUtil.setTenantId(order.getTenantId().toString());
+        ApiResult<?> partnerConditionReq = requestUtil.pageDictData(1460);
+        if (partnerConditionReq.getCode().equals(0) && partnerConditionReq.getData() != null) {
+          LinkedHashMap<String, Object> dictDataMap = (LinkedHashMap<String, Object>) partnerConditionReq.getData();
+          List<LinkedHashMap> dictDataList = (List<LinkedHashMap>) dictDataMap.get("list");
+          String dictDataCode = (String) dictDataList.get(0).get("dictDataCode");
+          BigDecimal partnerCondition = new BigDecimal(dictDataCode);
+
+          User user = requestUtil.getByUserIdWithoutLogin(order.getUserId());
+          if (user != null) {
+            user.setExpendMoney(user.getExpendMoney().add(order.getPayPrice()));
+            if (user.getExpendMoney().compareTo(partnerCondition) >= 0) {
+              user.setGradeId(3);
+            }
+            requestUtil.updateWithoutLogin(user);
+
+            // 上级
+            User parent = requestUtil.getParent(order.getUserId());
+            if (parent != null) {
+
+              List<ShopOrderGoods> shopOrderGoodsList = shopOrderGoodsService.getListByOrderId(order.getOrderId());
+              List<Integer> goodsIds = shopOrderGoodsList.stream().map(ShopOrderGoods::getGoodsId).toList();
+              List<ShopGoods> shopGoodsList = shopGoodsService.listByIds(goodsIds);
+              BigDecimal commission = BigDecimal.ZERO;
+              for (ShopOrderGoods shopOrderGoods : shopOrderGoodsList) {
+                ShopGoods shopGoods = shopGoodsList.stream().filter(sG -> sG.getGoodsId().equals(shopOrderGoods.getGoodsId())).findFirst().orElse(null);
+                if (shopGoods != null) {
+                  commission = commission.add(shopGoods.getCommission().multiply(BigDecimal.valueOf(shopOrderGoods.getTotalNum())));
+                }
+              }
+              parent.setBalance(parent.getBalance().add(commission));
+              requestUtil.updateWithoutLogin(user);
+
+              // 分销订单
+              ShopDealerOrder shopDealerOrder = new ShopDealerOrder();
+              shopDealerOrder.setUserId(parent.getUserId());
+              shopDealerOrder.setOrderId(order.getOrderId());
+              shopDealerOrder.setOrderPrice(order.getTotalPrice());
+              shopDealerOrder.setFirstUserId(order.getUserId());
+              shopDealerOrder.setFirstMoney(commission);
+              shopDealerOrder.setIsSettled(1);
+              shopDealerOrder.setSettleTime(DateUtil.currentSeconds());
+              shopDealerOrderService.save(shopDealerOrder);
+
+              // 分销资明细
+              ShopDealerCapital shopDealerCapital = new ShopDealerCapital();
+              shopDealerCapital.setUserId(parent.getUserId());
+              shopDealerCapital.setOrderId(order.getOrderId());
+              shopDealerCapital.setFlowType(10);
+              shopDealerCapitalService.save(shopDealerCapital);
+            }
+          }
+        }
+      }
     }
 
     /**
@@ -304,9 +360,8 @@ import com.gxwebsoft.common.core.service.PaymentCacheService;
 
       // 开发环境配置 - 使用自动证书配置
       if (active.equals("dev")) {
-        // 开发环境 - 使用配置文件的upload-path构建证书路径
+        // 构建包含租户号的证书路径: dev/wechat/{tenantId}/
-        String uploadPath = config.getUploadPath();
+        String tenantCertPath = "dev/wechat/" + order.getTenantId();
-        String tenantCertPath = uploadPath + "dev/wechat/" + order.getTenantId();
         String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();
 
         System.out.println("开发环境证书路径 - 租户ID: " + order.getTenantId());
@@ -396,9 +451,8 @@ import com.gxwebsoft.common.core.service.PaymentCacheService;
             payment.getPubKeyId() != null && !payment.getPubKeyId().isEmpty()) {
 
           try {
-            // 开发环境使用配置文件的upload-path构建公钥路径
+            // 开发环境固定使用 wechatpay_public_key.pem
-            String uploadPath = config.getUploadPath();
+            String tenantCertPath = "dev/wechat/" + order.getTenantId();
-            String tenantCertPath = uploadPath + "dev/wechat/" + order.getTenantId();
             String pubKeyPath = tenantCertPath + "/wechatpay_public_key.pem";
 
             System.out.println("开发环境公钥文件路径: " + pubKeyPath);
@@ -472,8 +526,7 @@ import com.gxwebsoft.common.core.service.PaymentCacheService;
             System.err.println("⚠️ 开发环境回退到基础RSA配置...");
             try {
               // 方案1：尝试使用RSA证书配置（需要商户证书文件）
-              String uploadPath = config.getUploadPath();
+              String tenantCertPath = "dev/wechat/" + order.getTenantId();
-              String tenantCertPath = uploadPath + "dev/wechat/" + order.getTenantId();
               String apiclientCertPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getApiclientCertFile();
 
               if (certificateLoader.certificateExists(apiclientCertPath)) {

src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://1Panel-mysql-Bqdt:3306/website?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://1Panel-mysql-Bqdt:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: modules
     password: 8YdLnk7KsPAyDXGA
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,7 +45,7 @@ mqtt:
 config:
   # 生产环境接口
   server-url: https://server.websoft.top/api
-  upload-path: /www/wwwroot/file.ws
+  upload-path: /www/wwwroot/file.ws/
 
   # 阿里云OSS云存储
   endpoint: https://oss-cn-shenzhen.aliyuncs.com

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 # 多环境配置
 spring:
   profiles:
-    active: dev
+    active: prod
 
   application:
     name: server