核销校验提示

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

@@ -187,7 +187,7 @@ public class GicOrderController {
         if (status == 2) {
             qdto.setWriteOffClerkId(clerkId);
             qdto.setOrderStep("4");
-            qdto.setDeliveryOptType(1);
+            //qdto.setDeliveryOptType(1);
         }
         qdto.setSearchOrderParam(search);
         qdto.setBusinessType(businessType);
@@ -256,14 +256,13 @@ 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(detail.getOrderInfo().getOrderStep()==4) {
+                logger.info("提货码已核销={}", writeOffCode);
+                return RestResponse.failure("9999", "提货码已核销");
             }
             if (!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
-                return RestResponse.failure("9999", "此自提点无法核销");
+                logger.info("核销门店不符合={}", writeOffCode);
+                return RestResponse.failure("9999", "此自提点无法核销,请确认订单核销门店");
             }
             OrderDetailVO orderDetailVO = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
                     ret.getResult().getOrderItemList(), storeId);