订单

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

@@ -185,6 +185,7 @@ public class GicOrderController {
         if (status == 2) {
             qdto.setWriteOffClerkId(clerkId);
             qdto.setOrderStep("4");
+            qdto.setDeliveryOptType(1);
         }
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
@@ -250,6 +251,11 @@ public class GicOrderController {
             OrderDetailDTO detail = ret.getResult() ;
             logger.info("订单信息={}", JSON.toJSONString(ret, true));
             if (ret.isSuccess()) {
+                // 已核销,且不是好办核销的
+                if(null != detail.getOrderInfo().getDeliveryOptType() && detail.getOrderInfo().getDeliveryOptType()!=1) {
+                    logger.info("已核销,且不是好办核销的={}",writeOffCode);
+                    return RestResponse.failure("9999", "此自提点无法核销"); 
+                }
                 if(!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
                     return RestResponse.failure("9999", "此自提点无法核销"); 
                 }