Merge branch 'feature-积分商城迁移' into 'developer'

Feature 积分商城迁移

See merge request !1301

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/vo/order/refund/ConsultOperVO.java

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+
+public class ConsultOperVO implements Serializable {
+
+    private int operType;
+    private String operName;
+    private String operCode;
+
+    public int getOperType() {
+        return operType;
+    }
+
+    public String getOperName() {
+        return operName;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperType(int operType) {
+        this.operType = operType;
+    }
+
+    public void setOperName(String operName) {
+        this.operName = operName;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+    
+}

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

@@ -59,6 +59,16 @@ public class OrderExchangeConsultVO implements Serializable {
      * 更新时间
      */
     private Date updateTime;
+    
+    private ConsultOperVO operInfo ;
+    
+    public ConsultOperVO getOperInfo() {
+        return operInfo;
+    }
+
+    public void setOperInfo(ConsultOperVO operInfo) {
+        this.operInfo = operInfo;
+    }
 
     public String getReason() {
         return reason;

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

@@ -84,6 +84,16 @@ public class OrderRefundConsultVO implements Serializable {
     private Integer refundDeliverType;
 
     private String extJson ;
+    
+    private ConsultOperVO operInfo ;
+    
+    public ConsultOperVO getOperInfo() {
+        return operInfo;
+    }
+
+    public void setOperInfo(ConsultOperVO operInfo) {
+        this.operInfo = operInfo;
+    }
 
     public String getExtJson() {
         return extJson;