核销文案

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/scan/ScanController.java

@@ -71,6 +71,14 @@ public class ScanController {
         logger.info("订单信息={}", JSON.toJSONString(ret));
         //订单
         if (ret.isSuccess() && detail != null) {
+            if(detail.getOrderInfo().getOrderStep()==4) {
+                logger.info("提货码已核销={}", writeOffCode);
+                return RestResponse.failure("9999", "提货码已核销");
+            }
+            if (!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
+                logger.info("核销门店不符合={}", writeOffCode);
+                return RestResponse.failure("9999", "此自提点无法核销,请确认订单核销门店");
+            }
             // 已核销,且不是好办核销的
             if (null != detail.getOrderInfo().getDeliveryOptType()
                     && detail.getOrderInfo().getDeliveryOptType() != 1) {