物流

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

@@ -409,22 +409,26 @@ public class GicOrderController {
      * 核销订单
      */
     @RequestMapping("/verification")
-    public RestResponse<Object> verification(String enterpriseId, String clerkId, String writeOffCode) {
+    public RestResponse<Object> verification(String enterpriseId, String clerkId, String writeOffCode , String orderId) {
         if (StringUtils.isEmpty(writeOffCode)) {
             return RestResponse.failure("9999", "核销码为空");
         }
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         if (null == clerkDTO) {
-            logger.info("积分商城订单核销开始，核销码：{} ,核销人不存在 ", writeOffCode);
-            throw new ShowFrontMessageException("核销人不存在，核销失败！");
+            return RestResponse.failure("9999", "核销人不存在");
         }
         // 微商城核销
         if (writeOffCode.startsWith("M")) {
+            if(StringUtils.isEmpty(orderId)) {
+                return RestResponse.failure("9999", "订单ID为空");
+            }
             SelfPickOffQDTO qdto = new SelfPickOffQDTO();
             qdto.setEnterpriseId(enterpriseId);
             qdto.setWriteOffClerkId(clerkId);
             qdto.setWriteOffCode(writeOffCode);
             qdto.setSource(1);
+            qdto.setWriteOffClerkCode(clerkDTO.getClerkCode());
+            qdto.setOrderId(orderId);
             ServiceResponse<Boolean> response = webOrderManageApiService.selfPickOff(qdto);
             if (!response.isSuccess()) {
                 return RestResponse.failure(response.getCode(), response.getMessage());

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeDetailVO.java

@@ -224,6 +224,15 @@ public class OrderExchangeDetailVO implements Serializable {
     
     private String buyerLogisticsCompanyId ;
     private String sellerLogisticsCompanyId ;
+    private String sellerLogisticsCompanyCode ;
+    
+    public String getSellerLogisticsCompanyCode() {
+        return sellerLogisticsCompanyCode;
+    }
+
+    public void setSellerLogisticsCompanyCode(String sellerLogisticsCompanyCode) {
+        this.sellerLogisticsCompanyCode = sellerLogisticsCompanyCode;
+    }
 
     public String getBuyerLogisticsCompanyId() {
         return buyerLogisticsCompanyId;