订单

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -184,7 +184,7 @@ public class GicOrderController {
     // 订单详情 (客户信息+收货地址+商品详情+订单信息 + 订单状态)
     @RequestMapping("order-detail")
     public RestResponse<Object> orderDetail(String enterpriseId, String clerkId, String searchParams,
-            @RequestParam(defaultValue = "1") int orderType, String orderId) {
+            @RequestParam(defaultValue = "1") int orderType, String orderId, String storeId) {
         QueryOrderDetailQDTO queryOrderDetailQDTO = new QueryOrderDetailQDTO();
         queryOrderDetailQDTO.setOrderId(orderId);
         queryOrderDetailQDTO.setEnterpriseId(enterpriseId);
@@ -194,7 +194,7 @@ public class GicOrderController {
         }
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
         OrderDetailVO detail = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
-                ret.getResult().getOrderItemList());
+                ret.getResult().getOrderItemList(), storeId);
         detail.setCreateTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.PLACE_AN_ORDER,
                 ret.getResult().getOrderNodeList()));
         detail.setPayTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.PAY_ORDER,
@@ -223,7 +223,7 @@ public class GicOrderController {
     }
 
     private OrderDetailVO getOrderDetail(String enterpriseId, OrderInfoDTO orderInfo,
-            List<ListOrderItemDTO> orderItemDTOList) {
+            List<ListOrderItemDTO> orderItemDTOList, String storeId) {
         OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class, orderInfo);
         orderDetailVO.setBuyerRemark(orderInfo.getRemarks());
         List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,
@@ -245,10 +245,20 @@ public class GicOrderController {
         member.setAddressDetail(orderInfo.getAddressInfo());
         orderDetailVO.setMember(member);
         // 判断能否发货
-        boolean canDeliverFlag = true;
+        // 导购发货，一笔订单仅允许单门店发货
+        boolean canDeliverFlag = false;
+        // 发货操作类型(0后台/1好办门店):用于判断好办操作发货还是后台，防止双边发货
+        Integer deliveryOptType = orderInfo.getDeliveryOptType();
+        String deliverStoreId = null;
+        logger.info("发货类型={},发货门店={},orderId={}", deliveryOptType, deliverStoreId, orderInfo.getOrderId());
+        if (null == deliveryOptType) {
+            canDeliverFlag = true;
+        } else if (deliveryOptType == 1 && storeId.equals(deliverStoreId)) {
+            canDeliverFlag = true;
+        }
         orderDetailVO.setCanDeliverFlag(canDeliverFlag);
         // 核销导购
-        String verificationClerkName = "" ;
+        String verificationClerkName = "";
         orderDetailVO.setVerificationClerkName("核销导购");
         return orderDetailVO;
     }
@@ -257,7 +267,7 @@ public class GicOrderController {
      * 扫码二维码
      */
     @RequestMapping("/scan")
-    public RestResponse<Object> scan(String enterpriseId, String writeOffCode) {
+    public RestResponse<Object> scan(String enterpriseId, String writeOffCode, String storeId) {
         if (StringUtils.isEmpty(writeOffCode)) {
             return RestResponse.failure("9999", "核销码为空");
         }
@@ -271,7 +281,7 @@ public class GicOrderController {
             logger.info("订单信息={}", JSON.toJSONString(ret, true));
             if (ret.isSuccess()) {
                 OrderDetailVO orderDetailVO = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
-                        ret.getResult().getOrderItemList());
+                        ret.getResult().getOrderItemList(), storeId);
                 return RestResponse.successResult(orderDetailVO);
             } else {
                 return RestResponse.failure("9999", ret.getMessage());