门店

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

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.business.order.api.service.order.AfterSalesManageApiService;
+import com.gic.business.order.dto.member.MemberStoreInfoDTO;
 import com.gic.business.order.dto.ordermanage.OrderExchangeConsultDTO;
 import com.gic.business.order.dto.ordermanage.OrderExchangeDetailDTO;
 import com.gic.business.order.dto.ordermanage.OrderRefundConsultDTO;
@@ -30,11 +31,13 @@ import com.gic.business.order.qdto.aftersales.RefundRefusedQDTO;
 import com.gic.business.order.qdto.aftersales.RefundSellerAgreeQDTO;
 import com.gic.business.order.qdto.aftersales.RefundSellerConfirmGoodsQDTO;
 import com.gic.business.order.qdto.ordermanage.RefundExchangeQDTO;
+import com.gic.business.order.service.activity.MemberReferClerkApiService;
 import com.gic.business.order.service.ordermanage.MallSellerAddressApiService;
 import com.gic.business.order.service.ordermanage.OrderRefundApiService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.web.controller.marketing.MemberMarketingController;
+import com.gic.haoban.manage.web.vo.order.MemberInfoVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeConsultVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeDetailVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderRefundConsultVO;
@@ -59,6 +62,8 @@ public class GicOrderRefundController {
     private AfterSalesManageApiService afterSalesManageApiService;
     @Autowired
     private ProductStockApiService productStockApiService;
+    @Autowired
+    private MemberReferClerkApiService memberReferClerkApiService;
 
     /**
      * 
@@ -80,9 +85,10 @@ public class GicOrderRefundController {
     // 退款-详情
     @RequestMapping(value = "order-refund-detail")
     @ResponseBody
-    public RestResponse<Object> refundDetail(String orderRefundId) {
+    public RestResponse<Object> refundDetail(String enterpriseId, String orderRefundId) {
         ServiceResponse<OrderRefundDetailDTO> resp = this.orderRefundApiService.refundDetail(orderRefundId);
         OrderRefundDetailVO vo = EntityUtil.changeEntityNew(OrderRefundDetailVO.class, resp.getResult());
+        this.fillMemberInfo(enterpriseId, vo.getMemberId(), vo, null);
         return RestResponse.successResult(vo);
     }
 
@@ -105,6 +111,7 @@ public class GicOrderRefundController {
         if (stockResp.isSuccess() && null != stockResp.getResult()) {
             vo.setTargetProStock(stockResp.getResult());
         }
+        this.fillMemberInfo(enterpriseId, vo.getMemberId(), null, vo);
         return RestResponse.successResult(vo);
     }
 
@@ -242,4 +249,33 @@ public class GicOrderRefundController {
         return RestResponse.successResult(vo);
     }
 
+    private void fillMemberInfo(String enterpriseId, String memberId, OrderRefundDetailVO refund,
+            OrderExchangeDetailVO exchange) {
+        ServiceResponse<MemberStoreInfoDTO> memberResp = this.memberReferClerkApiService.getMemberInfo(enterpriseId,
+                memberId);
+        MemberStoreInfoDTO memberInfo = memberResp.getResult();
+        if (null != memberInfo) {
+            if (null != refund) {
+                refund.setMemberId(memberId);
+                refund.setMemberName(memberInfo.getMemberName());
+                refund.setMemberImage(memberInfo.getMemberImage());
+                refund.setMemberCardNo(memberInfo.getMemberCardNo());
+                refund.setMainClerkName(memberInfo.getMainClerkName());
+                refund.setMainStoreName(memberInfo.getMainStoreName());
+                refund.setOpenClerkName(memberInfo.getOpenClerkName());
+                refund.setOpenStoreName(memberInfo.getOpenStoreName());
+            }
+            if (null != exchange) {
+                exchange.setMemberId(memberId);
+                exchange.setMemberName(memberInfo.getMemberName());
+                exchange.setMemberImage(memberInfo.getMemberImage());
+                exchange.setMemberCardNo(memberInfo.getMemberCardNo());
+                exchange.setMainClerkName(memberInfo.getMainClerkName());
+                exchange.setMainStoreName(memberInfo.getMainStoreName());
+                exchange.setOpenClerkName(memberInfo.getOpenClerkName());
+                exchange.setOpenStoreName(memberInfo.getOpenStoreName());
+            }
+        }
+    }
+
 }

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

@@ -8,21 +8,94 @@ public class MemberInfoVO implements Serializable {
     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
     */
     private static final long serialVersionUID = -2814959714712832104L;
-    
-    private String memberId ;
+
+    private String memberId;
     // 会员信息
     private String memberName;
     private String memberImage;
     private String mainClerkId;
     private String mainClerkName;
+    private String mainClerkCode;
     private String mainStoreId;
     private String mainStoreName;
+    private String mainStoreCode;
+
+    private String openClerkId;
+    private String openClerkName;
+    private String openClerkCode;
+    private String openStoreId;
+    private String openStoreName;
+    private String openStoreCode;
 
     // 收货地址
     private String addressName;
     private String addressPhone;
     private String addressDetail;
-    
+
+    public String getMainClerkCode() {
+        return mainClerkCode;
+    }
+
+    public String getMainStoreCode() {
+        return mainStoreCode;
+    }
+
+    public String getOpenClerkCode() {
+        return openClerkCode;
+    }
+
+    public String getOpenStoreCode() {
+        return openStoreCode;
+    }
+
+    public void setMainClerkCode(String mainClerkCode) {
+        this.mainClerkCode = mainClerkCode;
+    }
+
+    public void setMainStoreCode(String mainStoreCode) {
+        this.mainStoreCode = mainStoreCode;
+    }
+
+    public void setOpenClerkCode(String openClerkCode) {
+        this.openClerkCode = openClerkCode;
+    }
+
+    public void setOpenStoreCode(String openStoreCode) {
+        this.openStoreCode = openStoreCode;
+    }
+
+    public String getOpenClerkId() {
+        return openClerkId;
+    }
+
+    public String getOpenClerkName() {
+        return openClerkName;
+    }
+
+    public String getOpenStoreId() {
+        return openStoreId;
+    }
+
+    public String getOpenStoreName() {
+        return openStoreName;
+    }
+
+    public void setOpenClerkId(String openClerkId) {
+        this.openClerkId = openClerkId;
+    }
+
+    public void setOpenClerkName(String openClerkName) {
+        this.openClerkName = openClerkName;
+    }
+
+    public void setOpenStoreId(String openStoreId) {
+        this.openStoreId = openStoreId;
+    }
+
+    public void setOpenStoreName(String openStoreName) {
+        this.openStoreName = openStoreName;
+    }
+
     public String getMemberId() {
         return memberId;
     }

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

@@ -39,6 +39,11 @@ public class OrderExchangeDetailVO implements Serializable {
 
     private String memberName;
     private String memberCardNo;
+    private String memberImage;
+    private String mainClerkName;
+    private String mainStoreName;
+    private String openClerkName ;
+    private String openStoreName ;
 
     /**
      * 换货商品件数（或单位 贵金属-重量等）
@@ -217,6 +222,47 @@ public class OrderExchangeDetailVO implements Serializable {
     private String amountPayableInfo;
     private Double orderItemFreight;
     
+    
+    public String getMemberImage() {
+        return memberImage;
+    }
+
+    public String getMainClerkName() {
+        return mainClerkName;
+    }
+
+    public String getMainStoreName() {
+        return mainStoreName;
+    }
+
+    public String getOpenClerkName() {
+        return openClerkName;
+    }
+
+    public String getOpenStoreName() {
+        return openStoreName;
+    }
+
+    public void setMemberImage(String memberImage) {
+        this.memberImage = memberImage;
+    }
+
+    public void setMainClerkName(String mainClerkName) {
+        this.mainClerkName = mainClerkName;
+    }
+
+    public void setMainStoreName(String mainStoreName) {
+        this.mainStoreName = mainStoreName;
+    }
+
+    public void setOpenClerkName(String openClerkName) {
+        this.openClerkName = openClerkName;
+    }
+
+    public void setOpenStoreName(String openStoreName) {
+        this.openStoreName = openStoreName;
+    }
+
     public Integer getDeliveryMode() {
         return deliveryMode;
     }

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

@@ -42,8 +42,15 @@ public class OrderRefundDetailVO implements Serializable {
     private String sellerRemark; // 商家备注
 
     private String memberId;
-    private String memberName;
     private String memberCardNo;
+    private String memberName;
+    private String memberImage;
+    private String mainClerkName;
+    private String mainStoreName;
+    private String openClerkName ;
+    private String openStoreName ;
+    
+    
     // 赠品1是0否
     private int giftFlag;
 
@@ -84,10 +91,76 @@ public class OrderRefundDetailVO implements Serializable {
 
     // 1 电商发货 2门店发货
     private Integer deliveryMode = 1;
-
+    // 发货门店
+    private String deliverStoreId ;
+    private String deliverStoreName ;
+    private String deliverStoreCode ;
     private String amountPayableInfo;
-
     private Double orderItemFreight;
+    
+    public String getMemberImage() {
+        return memberImage;
+    }
+
+    public String getMainClerkName() {
+        return mainClerkName;
+    }
+
+    public String getMainStoreName() {
+        return mainStoreName;
+    }
+
+    public String getOpenClerkName() {
+        return openClerkName;
+    }
+
+    public String getOpenStoreName() {
+        return openStoreName;
+    }
+
+    public void setMemberImage(String memberImage) {
+        this.memberImage = memberImage;
+    }
+
+    public void setMainClerkName(String mainClerkName) {
+        this.mainClerkName = mainClerkName;
+    }
+
+    public void setMainStoreName(String mainStoreName) {
+        this.mainStoreName = mainStoreName;
+    }
+
+    public void setOpenClerkName(String openClerkName) {
+        this.openClerkName = openClerkName;
+    }
+
+    public void setOpenStoreName(String openStoreName) {
+        this.openStoreName = openStoreName;
+    }
+
+    public String getDeliverStoreId() {
+        return deliverStoreId;
+    }
+
+    public String getDeliverStoreName() {
+        return deliverStoreName;
+    }
+
+    public String getDeliverStoreCode() {
+        return deliverStoreCode;
+    }
+
+    public void setDeliverStoreId(String deliverStoreId) {
+        this.deliverStoreId = deliverStoreId;
+    }
+
+    public void setDeliverStoreName(String deliverStoreName) {
+        this.deliverStoreName = deliverStoreName;
+    }
+
+    public void setDeliverStoreCode(String deliverStoreCode) {
+        this.deliverStoreCode = deliverStoreCode;
+    }
 
     public Double getOrderItemFreight() {
         return orderItemFreight;

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

@@ -22,8 +22,35 @@ public class RefundAddressVO implements Serializable {
     private int addressType;
     private String phone;
     private String name;
+    private String storeName;
+    private String storeCode;
     private String address;
     private int ifDefault;
+    private String areaId ;
+    
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
 
     public int getIfDefault() {
         return ifDefault;