添加骑手额外配送费

db/insert_250930.sql

@@ -0,0 +1,2 @@
+INSERT INTO common_info (id,create_at, min, type, value,condition_from)
+VALUES (443,'2025-09-30 10:10:00', '骑手额外配送费', 443, 0,'fuwufei');

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1026,10 +1026,24 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         sumMoney = sumMoney.subtract(order.getInsideDeliveryFee());
 
         BigDecimal shopMoney = sumMoney.multiply(shopRate);
-        order.setShopIncomeMoney(shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
 
-        log.info("preOrder==>[{}]，订单计算店铺预计收益，商家佣金比例[{}]，本单用户应付金额[{}]，本单店铺预计收益[{}]",
-                order.getOrderId(), shopRate, sumMoney, order.getShopIncomeMoney());
+        BigDecimal rider = new BigDecimal(0);
+        if (ObjectUtils.isNotEmpty(order.getOrderTypeExtra())&&order.getOrderTypeExtra()==2) {
+            //        获取骑手额外配送费
+            CommonInfo commonInfo = commonInfoService.findOne(443);
+            if (ObjectUtils.isNotEmpty(commonInfo)) {
+                rider =rider.add(new BigDecimal(commonInfo.getValue()));
+                shopMoney=shopMoney.subtract(rider);
+            }
+            order.setShopIncomeMoney(shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
+            log.info("preOrder==>[{}]，订单计算店铺预计收益，商家佣金比例[{}]，本单用户应付金额[{}]，本单店铺预计收益[{}]，骑手额外配送费[{}]",
+                    order.getOrderId(), shopRate, sumMoney, order.getShopIncomeMoney(),rider);
+        }else {
+            order.setShopIncomeMoney(shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
+            log.info("preOrder==>[{}]，订单计算店铺预计收益，商家佣金比例[{}]，本单用户应付金额[{}]，本单店铺预计收益[{}]",
+                    order.getOrderId(), shopRate, sumMoney, order.getShopIncomeMoney());
+        }
+
     }
 
     /**
@@ -1780,7 +1794,19 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             sumMoney = sumMoney.subtract(tbOrder.getInsideDeliveryFee());
 
             BigDecimal shopMoney = sumMoney.multiply(shopRate);
+
+            BigDecimal rider = new BigDecimal(0);
+            if (ObjectUtils.isNotEmpty(order.getOrderTypeExtra())&&order.getOrderTypeExtra()==2) {
+                //        获取骑手额外配送费
+                CommonInfo commonInfo = commonInfoService.findOne(443);
+                if (ObjectUtils.isNotEmpty(commonInfo)) {
+                    rider =rider.add(new BigDecimal(commonInfo.getValue()));
+                    shopMoney=shopMoney.subtract(rider);
+                }
+            }
+
             shopMoney = (shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
+
             tbOrder.setShopIncomeMoney(shopMoney);
 
             SenInfoCheckUtil.sendMsg(userEntity.getOpenId(), one.getValue(), msgList, 1);
@@ -2138,6 +2164,18 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             }*/
         }
 
+        StringBuffer contentBuffer = new StringBuffer();
+        BigDecimal rider = new BigDecimal(0);
+        if (ObjectUtils.isNotEmpty(tbOrder.getOrderTypeExtra())&&tbOrder.getOrderTypeExtra()==2) {
+            //        获取骑手额外配送费
+            CommonInfo commonInfo = commonInfoService.findOne(443);
+            if (ObjectUtils.isNotEmpty(commonInfo)) {
+                rider =rider.add(new BigDecimal(commonInfo.getValue()));
+                shopMoney=shopMoney.subtract(rider);
+            }
+            log.info("订单id【{}】,骑手额外配送费【{}】", orderId,rider);
+        }
+
         tbOrder.setShopIncomeMoney(shopMoney);
         appOrderDao.updateById(tbOrder);
         log.info("订单id【{}】,商户应得金额计算完毕", orderId);
@@ -2148,7 +2186,6 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         userMoneyDetails1.setShopId(goodsShop.getShopId());
         userMoneyDetails1.setTitle("商户订单收入，订单号：" + tbOrder.getOrderNumber());
 
-        StringBuffer contentBuffer = new StringBuffer();
         // 订单金额
         BigDecimal orderAmount = tbOrder.getPayMoney().add(couponMoney).add(activityDiscountAmount);
         contentBuffer.append("订单金额:").append(orderAmount.setScale(2, BigDecimal.ROUND_DOWN));
@@ -2165,11 +2202,18 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             contentBuffer.append("跑腿费:").append(errandMoney.setScale(2, BigDecimal.ROUND_DOWN)).append("(").append(tbOrder.getErrandMoneyIsShop()).append(")").append(",");
         }
 
+
         contentBuffer.append("特殊地址跑腿费:").append(tbOrder.getInsideDeliveryFee().setScale(2, BigDecimal.ROUND_DOWN)).append(",");
         contentBuffer.append("平台服务费:").append(pingRate.setScale(2, BigDecimal.ROUND_DOWN)).append(",");
         contentBuffer.append("短信服务费:").append(smsSendMoney.setScale(2, BigDecimal.ROUND_DOWN)).append(",");
+        if (ObjectUtils.isNotEmpty(tbOrder.getOrderTypeExtra())&&tbOrder.getOrderTypeExtra()==2) {
+            contentBuffer.append("骑手额外配送费:").append(rider.setScale(2, BigDecimal.ROUND_DOWN)).append(",");
+        }
         contentBuffer.append("到账金额:").append(shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
 
+
+
+
         if (shopIds == 0) {
             contentBuffer.append("(本单为平台优惠券,平台补贴)");
         } else if (shopIds != -1) {