核销文案

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

@@ -256,7 +256,8 @@ public class GicOrderController {
         OrderDetailDTO detail = ret.getResult();
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
         if (ret.isSuccess()) {
-            if(detail.getOrderInfo().getOrderStep()==4) {
+            if(detail.getOrderInfo().getOrderStep()==4 && null != detail.getOrderInfo().getDeliveryOptType()
+                    && detail.getOrderInfo().getDeliveryOptType() != 1) {
                 logger.info("提货码已核销={}", writeOffCode);
                 return RestResponse.failure("9999", "提货码已核销");
             }