订单操作人

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

@@ -34,6 +34,7 @@ import com.gic.business.order.dto.setting.MallOrderSettingDTO;
 import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.enums.OrderEnum.DeliveryOptTypeEnum;
 import com.gic.business.order.enums.OrderEnum.SearchOrderTypeEnum;
+import com.gic.business.order.qdto.OperationUserQDTO;
 import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
@@ -77,7 +78,6 @@ import com.gic.integralmall.api.enums.IntegralMallExchangeLogStatusEnums;
 import com.gic.integralmall.api.service.IntegralmallService;
 import com.gic.integralmall.api.service.result.DubboResult;
 import com.gic.store.goods.dto.stock.GoodsStockBaseQDTO;
-import com.gic.store.goods.enums.ProductStockChannelType;
 import com.gic.store.goods.service.ProductStockApiService;
 
 @RestController
@@ -401,7 +401,7 @@ public class GicOrderController {
     // type : 1: 下单 2：换货
     @RequestMapping("modify-order-logistics")
     public RestResponse<Object> modifyOrderDeliver(String memberId, String enterpriseId, String orderId, String storeId,
-            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,
+            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,String clerkId ,
             @RequestParam(defaultValue = "1") int type) {
         logger.info("修改物流={},{}", orderId, type);
         UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO();
@@ -413,10 +413,20 @@ public class GicOrderController {
         qdto.setOrderId(orderId);
         qdto.setLogisticsId(logisticsId);
         qdto.setType(type);
-        this.webOrderManageApiService.updateOrderLogistics(qdto);
+        this.webOrderManageApiService.updateOrderLogistics(qdto,this.getOper(clerkId));
         return RestResponse.successResult();
     }
-
+    
+    private OperationUserQDTO getOper(String clerkId) {
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        OperationUserQDTO dto = new OperationUserQDTO() ;
+        dto.setOperatorId(clerk.getClerkId()) ;
+        dto.setOperatorType(clerk.getClerkType());
+        dto.setOperatorName(clerk.getClerkName());
+        dto.setOperatorCode(clerk.getClerkCode());
+        return dto ;
+    }
+    
     /**
      * 核销订单
      */

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

@@ -24,6 +24,7 @@ import com.gic.business.order.dto.ordermanage.OrderRefundConsultDTO;
 import com.gic.business.order.dto.ordermanage.OrderRefundDetailDTO;
 import com.gic.business.order.dto.ordermanage.OrderRefundExchangeListDTO;
 import com.gic.business.order.dto.ordermanage.RefundAddressDTO;
+import com.gic.business.order.qdto.OperationUserQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeAddressQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeBaseQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
@@ -177,10 +178,10 @@ public class GicOrderRefundController {
             RefundRefusedQDTO qdto = EntityUtil.changeEntityByJSON(RefundRefusedQDTO.class, baseQDTO);
             qdto.setReason(remark);
             if (step == 1) {
-                resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
-                resp = this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         // 同意
@@ -189,13 +190,13 @@ public class GicOrderRefundController {
                 RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerAgreeQDTO.class, baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
                 qdto.setExchangeAddress(address);
-                resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
                 RefundSellerConfirmGoodsQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerConfirmGoodsQDTO.class,
                         baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
-                resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         if (!resp.isSuccess()) {
@@ -223,10 +224,10 @@ public class GicOrderRefundController {
             ExchangeRefusedQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeRefusedQDTO.class, baseQDTO);
             qdto.setRemark(remark);
             if (step == 1) {
-                resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
-                resp = this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         // 同意
@@ -235,10 +236,10 @@ public class GicOrderRefundController {
                     baseQDTO);
             if (step == 1) {
                 qdto.setExchangeAddress(address);
-                resp = this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
-                resp = this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         if (!resp.isSuccess()) {
@@ -315,7 +316,7 @@ public class GicOrderRefundController {
     @RequestMapping(value = "exchange-order-deliver")
     @ResponseBody
     public RestResponse<Object> exchangeDeliver(String enterpriseId, String memberId, String companyCode,
-            String logisticsNo, String companyId, String companyName, String storeId, ExchangeBaseQDTO baseQDTO) {
+            String logisticsNo, String companyId, String companyName, String storeId, ExchangeBaseQDTO baseQDTO,String clerkId) {
         ExchangeDeliveryBackQDTO qdto = new ExchangeDeliveryBackQDTO();
         qdto.setCourierNumber(logisticsNo);
         qdto.setOrderId(baseQDTO.getOrderId());
@@ -326,7 +327,7 @@ public class GicOrderRefundController {
         qdto.setLogisticsCompanyName(companyName);
         qdto.setDeliveryStoreId(storeId);
         ServiceResponse<Void> resp = this.afterSalesManageApiService.exchangeSellerDeliveryGoods(enterpriseId, memberId,
-                qdto);
+                qdto,this.getOper(clerkId));
         logger.info("换货单发货={}", JSON.toJSONString(resp));
         if (resp.isSuccess()) {
             return RestResponse.successResult();
@@ -362,5 +363,15 @@ public class GicOrderRefundController {
             }
         }
     }
+    
+    private OperationUserQDTO getOper(String clerkId) {
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        OperationUserQDTO dto = new OperationUserQDTO() ;
+        dto.setOperatorId(clerk.getClerkId()) ;
+        dto.setOperatorType(clerk.getClerkType());
+        dto.setOperatorName(clerk.getClerkName());
+        dto.setOperatorCode(clerk.getClerkCode());
+        return dto ;
+    }
 
 }