修改不同的 类型调入大厅时间 增加详情返回对应的店铺信息 快递信息

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

@@ -25,6 +25,8 @@ import com.ghy.payment.service.AdapayService;
 import com.ghy.payment.service.FinancialChangeRecordService;
 import com.ghy.payment.service.FinancialDetailService;
 import com.ghy.payment.service.FinancialMasterService;
+import com.ghy.shop.domain.Shop;
+import com.ghy.shop.service.ShopService;
 import com.ghy.system.domain.SysArea;
 import com.ghy.system.service.ISysAreaService;
 import com.ghy.system.service.IWxMsgService;
@@ -122,7 +124,8 @@ public class OrderDetailController extends BaseController {
     private IInsuranceManagerService insuranceManagerService;
     @Autowired
     private InsuranceService insuranceService;
-
+ @Autowired
+    private ShopService shopService;
     @Resource
     private IOrderAttachmentRecordService orderAttachmentRecordService;
 
@@ -506,6 +509,8 @@ public class OrderDetailController extends BaseController {
             }
             logger.info("所有的加价订单{}",financialChangeRecords);
 
+             Shop shop=shopService.getShop(goods.getShopId());
+            orderListResponse.setShop(shop);
             // 编辑返回属性
             orderListResponse.setTrackingNumber(orderMaster.getTrackingNumber());
             orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages());
@@ -515,6 +520,7 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setShareAccountCountdownDuration(detail.getShareAccountCountdownDuration());
             orderListResponse.setHandoverImages(detail.getHandoverImages());
             orderListResponse.setHandoverRemark(detail.getHandoverRemark());
+            orderListResponse.setGoods(goods);
 
             orderListResponse.setAddMoneyRemark(addMoneyRemark);
             orderListResponse.setAddMoney(addMoneyTotal);

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

@@ -30,6 +30,8 @@ import com.ghy.payment.service.FinancialChangeRecordService;
 import com.ghy.payment.service.FinancialDetailService;
 import com.ghy.payment.service.FinancialMasterService;
 import com.ghy.payment.service.OrderFineRecordService;
+import com.ghy.shop.domain.Shop;
+import com.ghy.shop.service.ShopService;
 import com.ghy.system.domain.SysArea;
 import com.ghy.system.service.ISysAreaService;
 import com.ghy.web.pojo.vo.*;
@@ -118,6 +120,8 @@ public class OrderMasterController extends BaseController {
     private IOrderAttachmentRecordService orderAttachmentRecordService;
     @Resource
     private InsuranceService insuranceService;
+@Resource
+    private ShopService shopService;
 
     @Resource
     private IInsuranceManagerService insuranceManagerService;
@@ -1162,6 +1166,7 @@ public class OrderMasterController extends BaseController {
             }
 
             // 编辑返回属性
+            orderListResponse.setWorkerRemark(master.getWorkerRemark());
             orderListResponse.setIsNeedBill(master.getIsNeedBill());
             orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder());
             orderListResponse.setOrderImages(master.getOrderImages());
@@ -1841,7 +1846,16 @@ public class OrderMasterController extends BaseController {
             serverMoney=serverMoney.add(financialMaster.getServerMoney());
             serverMoney=serverMoney.add(leaderMoney);
             logger.info("大师傅的服务金额{}大师傅的分成{}",serverMoney,leaderMoney);
+            Shop shop=shopService.getShop(goods.getShopId());
             // 编辑返回属性
+            orderListResponse.setDeliveryType(orderMaster.getDeliveryType());
+            orderListResponse.setDeliveryRemark(orderMaster.getDeliveryRemark());
+            orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages());
+            orderListResponse.setShop(shop);
+
+            orderListResponse.setGoods(goods);
+            orderListResponse.setTrackingNumber(orderMaster.getTrackingNumber());
+            orderListResponse.setWorkerRemark(orderMaster.getWorkerRemark());
             orderListResponse.setOrderImages(orderMaster.getOrderImages());
             orderListResponse.setOrderMasterId(orderMaster.getId());
             orderListResponse.setOrderMasterCode(orderMaster.getCode());

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

@@ -9,6 +9,8 @@ import com.ghy.goods.domain.InsuranceManager;
 import com.ghy.order.domain.AfterServiceRecord;
 import com.ghy.payment.domain.FinancialChangeRecord;
 import com.ghy.payment.domain.OrderTimeoutRecord;
+import com.ghy.shop.domain.Shop;
+
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -295,4 +297,6 @@ public class OrderListResponse {
      */
     @Excel(name = "分账倒计时时长（小时）")
     private Integer shareAccountCountdownDuration;
+
+    private Shop shop;
 }

ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java

@@ -186,12 +186,23 @@ public class OrderServiceImpl implements OrderService {
             Date createTime = order.getCreateTime();
             Date overTime30min = getOverTime(createTime, 30 * 60 * 1000);
             Date overTime1h = getOverTime(createTime, 30 * 60 * 1000);
+            Integer timenumber=45*60*1000;
+            if (order.getOrderType()==1) {
+                timenumber=8*60*60*1000;
+            }else{
+                Goods goods=goodsService.selectById(order.getGoodsId());
+                 if (goods.getStoreService()!=null) {
+                     timenumber=8*60*60*1000;
+                }
+            }
+
+
             boolean flag;
             if (order.getUpdateTime() != null) {
-                flag = getOverTime(order.getUpdateTime(), 8 * 60 * 60 * 1000).before(now);
+                flag = getOverTime(order.getUpdateTime(), timenumber).before(now);
             } else {
-                flag = getOverTime(createTime, 8 * 60 * 60 * 1000).before(now);
+                flag = getOverTime(createTime, timenumber).before(now);
-                log.info("判断时间:{},当前时间:{},结果:{}", getOverTime(createTime, 8 * 60  * 60 * 1000), now, flag);
+                log.info("判断时间:{},当前时间:{},结果:{}", getOverTime(createTime, timenumber), now, flag);
             }
             // 是否已经超时
             boolean timeout = ONE.equals(order.getTimeout());