no message

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java

@@ -815,6 +815,18 @@ public class OrderDetailController extends BaseController {
 
             orderListResponse.setOrderType(orderMaster.getOrderType());
             orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder());
+
+
+             Shop shop = shopService.getShop(goods.getShopId());
+
+            // 计算主单地址与店铺的距离
+           // shop = calculateShopDistance(orderMaster, shop);
+            Shop serviceShop = shopService.getShop(orderMaster.getServiceShopId());
+            // serviceShop=calculateShopDistance(orderMaster, serviceShop);
+            orderListResponse.setServiceShop(serviceShop);
+            orderListResponse.setShop(shop);
+            orderListResponse.setServiceShopId(serviceShop.getShopId());
+
             // 编辑返回属性
             orderListResponse.setShareAccountCountdownEndTime(detail.getShareAccountCountdownEndTime());
             orderListResponse.setShareAccountCountdownDuration(detail.getShareAccountCountdownDuration());
@@ -1168,7 +1180,7 @@ public class OrderDetailController extends BaseController {
                 e.printStackTrace();
             }
         }
-        if (orderDetail.getIsQuicklyDelivery()==1) {
+        if (orderDetail.getIsQuicklyDelivery()!=null&&orderDetail.getIsQuicklyDelivery()==1) {
             // 立即发货时更新订单商品的已发货数量
             logger.info("立即发货订单[{}]开始更新商品已发货数量", orderDetail.getId());
             try {

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -1866,6 +1866,7 @@ public class OrderMasterController extends BaseController {
             }
             String masterWorkerName = "";
             String masterCompanyName = "";
+            String masterCompanyPhone="";
             Worker masterWorker = workerService.selectById(orderMaster.getWorkerId());
             Worker goodsWorker =new Worker();
             OrderMaster goodsOrderMaster =null;
@@ -1894,6 +1895,7 @@ public class OrderMasterController extends BaseController {
                     workerRealInfo=goodsWorkerRealInfo;
                 }
                 masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName();
+                masterCompanyPhone=workerRealInfo == null ? null : workerRealInfo.getLegalPersionPhoneNum();
                
             }
             // 商品信息
@@ -1982,6 +1984,7 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setShop(shop);
             orderListResponse.setServiceShop(serviceShop);
 
+            orderListResponse.setMasterCompanyPhone(masterCompanyPhone);
             orderListResponse.setOriginalWorkerId(goodsOrderMaster != null ? goodsOrderMaster.getWorkerId() : null);
             orderListResponse.setGoodsOrderMasterId(orderMaster.getGoodsOrderMasterId());
             orderListResponse.setGoods(goods);
@@ -2438,17 +2441,23 @@ public class OrderMasterController extends BaseController {
         try {
          //   判断是否为服务订单且需要退还服务金额
             if (isServiceOrder(orderMasterInfo) &&
-                    orderMasterInfo.getGoodsOrderMasterId() != null &&
+                    orderMasterInfo.getGoodsOrderMasterId() != null ) {
-                    orderMasterInfo.getServerGoodsMoney() != null &&
+               FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterInfo.getId());
-                    orderMasterInfo.getServerGoodsMoney().compareTo(BigDecimal.ZERO) > 0) {
-
                 logger.info("检测到服务订单退单，开始退还服务金额：订单[{}]，金额[{}]，目标商品订单[{}]",
-                        orderMasterInfo.getId(), orderMasterInfo.getServerGoodsMoney(),
+                        orderMasterInfo.getId(), financialMaster.getServerMoney(),
                         orderMasterInfo.getGoodsOrderMasterId());
-
+                 orderMasterService.deleteOrderMasterByIds(orderMasterInfo.getId().toString());
+                 // 删除对应的财务主单
+                // 删除财务主单及其子单
+            
+                if (financialMaster != null) {
+                    
+                    // 再删除财务主单
+                    financialMasterService.deleteFinancialMasterByIds(financialMaster.getId().toString());
+                }
                 // 退还服务金额到商品订单
                 refundServerMoneyToGoodsOrder(orderMasterInfo.getGoodsOrderMasterId(),
-                        orderMasterInfo.getServerGoodsMoney());
+                        financialMaster.getServerMoney());
 
                 // 重置配件主单的服务订单派发状态
                 OrderMaster goodsOrderUpdate = new OrderMaster();
@@ -2508,10 +2517,10 @@ public class OrderMasterController extends BaseController {
             }
 
             // 3. 更新商品订单的可用金额（增加退还的服务金额）
-            BigDecimal currentPayMoney = goodsFinancial.getPayMoney();
+            BigDecimal currentPayMoney = goodsFinancial.getServerMoney();
             BigDecimal newPayMoney = currentPayMoney.add(serverGoodsMoney);
 
-            goodsFinancial.setPayMoney(newPayMoney);
+            goodsFinancial.setServerMoney(newPayMoney);
             financialMasterService.updateFinancialMaster(goodsFinancial);
 
             logger.info("服务订单退单成功，已退还{}元服务金额到商品订单[{}]", serverGoodsMoney, goodsOrderMasterId);

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java

@@ -53,6 +53,8 @@ public class OrderListResponse {
 
     private String masterCompanyName;
 
+    private String masterCompanyPhone;
+
     private String customerName;
 
     private String customerPhone;

ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -65,9 +65,9 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="areaDesc != null">area_desc = #{areaDesc},</if>
             <if test="type != null">type = #{type},</if>
-            <if test="storeService != null">store_service = #{storeService},</if>
+            store_service = #{storeService},
-            <if test="installService != null">install_service = #{installService},</if>
+            install_service = #{installService},
-            <if test="deliveryService != null">delivery_service = #{deliveryService},</if>
+            delivery_service = #{deliveryService},
             shop_id = #{shopId},
             <if test="shopName != null">shop_name = #{shopName},</if>
             update_time = sysdate()