核销

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

@@ -247,8 +247,12 @@ public class GicOrderController {
             qdto.setEnterpriseId(enterpriseId);
             qdto.setWriteOffCode(writeOffCode);
             ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(qdto);
+            OrderDetailDTO detail = ret.getResult() ;
             logger.info("订单信息={}", JSON.toJSONString(ret, true));
             if (ret.isSuccess()) {
+                if(!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
+                    return RestResponse.failure("9999", "此自提点无法核销"); 
+                }
                 OrderDetailVO orderDetailVO = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
                         ret.getResult().getOrderItemList(), storeId);
                 return RestResponse.successResult(orderDetailVO);