202508091201

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "RuoYi-Vue-master",
+  "name": "202508091038",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/OrderUtil.java

@@ -944,7 +944,7 @@ public class OrderUtil {
             Order order = new Order();
             order.setOdertype(1); // 拼团
             order.setStatus(9L); // 9=待成团
-            order.setPayPrice(order.getPayPrice().add(payBefor.getAllmoney()));
+
             order.setOrderId(ptorderid);
             order.setUid(payBefor.getUid());
             order.setNum(payBefor.getNum()); // 默认1，可根据业务调整
@@ -976,7 +976,8 @@ public class OrderUtil {
             order.setType(1); // 服务订单
             order.setCreateType(1); // 用户自主下单
             order.setUname(user.getName());
-            System.out.println("订单基本信息设置完成");
+            //20250809处理过的一个故障
+            order.setPayPrice(payBefor.getAllmoney());
             order.setReceiveType(Long.valueOf(dispatchtype)); // 自由抢单
             // 预约时间
             System.out.println("预约时间: " + payBefor.getMaketime());

ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java

@@ -81,7 +81,7 @@ public class WechatPayUtil {
     private static final String WECHAT_TRANSFER_URL = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"; // 企业付款
 
 
-    public static final String PAY_FH = "https://73bb8889.r3.cpolar.top/";
+    public static final String PAY_FH = "https://api.huafurenjia.cn/";
     /**
      * 其他配置常量
      */

ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WorkerCommissionUtil.java

@@ -11,6 +11,8 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 import com.alibaba.fastjson.JSONArray;
@@ -889,9 +891,17 @@ public class WorkerCommissionUtil {
                 moneyLog.setPrice(finalCommissionWithDoorFee);
                 moneyLog.setType(1); // 1:收入
                 moneyLog.setGongshi(commissionSummary);
-                moneyLog.setCreatedAt(new Date());
-                moneyLog.setUpdatedAt(new Date());
 
+                //系统要求给师傅的分佣有七天的锁定期，锁定期内不允许师傅体现的操作
+                moneyLog.setStatus(1);//锁单
+                moneyLog.setStatusType(0);//后台锁定
+                moneyLog.setBeginlook(new Date());
+                //7天锁单
+                LocalDateTime ldt = LocalDateTime.now().plusDays(7);
+                Date end = Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant());
+                moneyLog.setEndlook(end);
+                moneyLog.setLookday(7);
+                moneyLog.setLookMoney(moneyLog.getPrice());
                 int moneyLogResult = workerMoneyLogService.insertWorkerMoneyLog(moneyLog);
                 if (moneyLogResult > 0) {
                     logger.info("师傅佣金流水记录添加成功 - 佣金: {}元", finalCommissionWithDoorFee);