订单

haoban-manage3-wx/pom.xml

@@ -215,6 +215,12 @@
             <artifactId>haoban-app-aggregation-api</artifactId>
             <version>${haoban-app-aggregation-api}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-business-order-api</artifactId>
+            <version>${gic-business-order-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

+package com.gic.haoban.manage.web.controller.order;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.logging.log4j.LogManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.business.order.dto.ordermanage.ListOrderDTO;
+import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
+import com.gic.business.order.enums.ActivityPreferentialTypeEnum;
+import com.gic.business.order.enums.OrderEnum;
+import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
+import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
+import com.gic.business.order.qdto.ordermanage.OrderShipmentQDTO;
+import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.web.controller.marketing.MemberMarketingController;
+import com.gic.haoban.manage.web.vo.order.OrderDetailVO;
+import com.gic.haoban.manage.web.vo.order.OrderListItemVO;
+import com.gic.haoban.manage.web.vo.order.OrderListVO;
+
+@RestController
+@RequestMapping("/order")
+public class GicOrderController {
+
+    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(MemberMarketingController.class);
+
+    @Autowired
+    private WebOrderManageApiService webOrderManageApiService;
+
+    // 发货订单列表 (待发货+待收货)
+    @RequestMapping("/list_order")
+    public RestResponse<Object> orderList(String enterpriseId, String clerkId, String search, BasePageInfo pageInfo) {
+        // 查询门店
+        ListOrderManageQDTO qdto = new ListOrderManageQDTO();
+        qdto.setOrderShow(1);
+        qdto.setOrderStep(9);
+        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
+        qdto.setSearchOrderParam(search);
+        qdto.setDeliveryType(-1);
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setPageSizeZero(false);
+        qdto.setCount(false);
+        qdto.setPageNum(pageInfo.getPageNum());
+        qdto.setPageSize(pageInfo.getPageSize());
+        ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);
+        logger.info("订单信息={}", JSON.toJSONString(ret, true));
+        if (ret.isSuccess()) {
+            Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
+            return RestResponse.successResult(retPage);
+        }
+        return RestResponse.failure(ret.getCode(), ret.getMessage());
+    }
+
+    // 数量查询(待发货+待收货)
+    // orderType:1待发货 2待收货
+    public RestResponse<Object> orderCount(String enterpriseId, String clerkId, String searchParams,
+            @RequestParam(defaultValue = "1") int orderType) {
+        int count = 0;
+        return RestResponse.successResult(count);
+    }
+
+    // 订单详情 (客户信息+收货地址+商品详情+订单信息 + 订单状态)
+    public RestResponse<Object> orderDetail(String enterpriseId, String clerkId, String searchParams,
+            @RequestParam(defaultValue = "1") int orderType, String orderId) {
+        ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(enterpriseId, orderId);
+        if (!ret.isSuccess()) {
+            return RestResponse.failure(ret.getCode(), ret.getMessage());
+        }
+        logger.info("订单信息={}", JSON.toJSONString(ret, true));
+        OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class, ret.getResult());
+        String discountAmountInfo = "{}";
+        JSONObject jsonObject = JSONObject.parseObject(discountAmountInfo);
+        // 单品
+        BigDecimal discountActivity = jsonObject
+                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.DISCOUNT_ACTIVITY.getType().toString());
+        discountActivity = (discountActivity != null ? discountActivity : BigDecimal.ZERO);
+        // 等级
+        BigDecimal memberGrade = jsonObject
+                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.MEMBER_GRADE.getType().toString());
+        memberGrade = (memberGrade != null ? memberGrade : BigDecimal.ZERO);
+        // 满减
+        BigDecimal fullReduce = jsonObject
+                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.FULL_REDUCTION.getType().toString());
+        fullReduce = (fullReduce != null ? fullReduce : BigDecimal.ZERO);
+
+        // 抵金券
+        BigDecimal cashCoupon = jsonObject
+                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.CASH_COUPON.getType().toString());
+        cashCoupon = (cashCoupon != null ? cashCoupon : BigDecimal.ZERO);
+
+        // 折扣券
+        BigDecimal discountCoupons = jsonObject
+                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.DISCOUNT_COUPONS.getType().toString());
+        discountCoupons = (discountCoupons != null ? discountCoupons : BigDecimal.ZERO);
+        return RestResponse.successResult(orderDetailVO);
+    }
+
+    // 订单发货商品列表
+    public RestResponse<Object> orderDeliverList(String enterpriseId, String orderId) {
+        List<OrderListItemVO> list = null;
+        return RestResponse.successResult(list);
+    }
+
+    // 发货
+    @RequestMapping("order-logistics-deliver")
+    public RestResponse<Object> orderDeliver(String enterpriseId, String orderId, String storeId,
+            List<String> orderItemIdList, String companyCode, String logisticsNo, String companyId,
+            String companyName) {
+        OrderShipmentQDTO qdto = new OrderShipmentQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setLogisticsCompanyCode(companyCode);
+        qdto.setLogisticsCompanyName(companyName);
+        qdto.setLogisticsCompanyId(companyId);
+        qdto.setCourierNumber(logisticsNo);
+        qdto.setOrderId(orderId);
+        // 门店发货
+        qdto.setDeliveryMode(2);
+        // 好办
+        qdto.setSource(2);
+        List<OrderItemShipmentQDTO> list = new ArrayList<>();
+        orderItemIdList.forEach(o -> {
+            OrderItemShipmentQDTO item = new OrderItemShipmentQDTO();
+            item.setOrderItemId(o);
+            item.setStoreId(storeId);
+            list.add(item);
+        });
+        qdto.setOrderItemShipment(list);
+        ServiceResponse<Boolean> response = webOrderManageApiService.orderShipment(qdto);
+        if (!response.isSuccess()) {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
+        return RestResponse.successResult(response.getResult());
+    }
+
+    // 修改物流
+    @RequestMapping("modify-order-logistics")
+    public RestResponse<Object> modifyOrderDeliver(String enterpriseId, String orderId, String storeId,
+            List<String> orderItemIdList, String companyCode, String logisticsNo, String companyId,
+            String companyName) {
+        OrderShipmentQDTO qdto = new OrderShipmentQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setLogisticsCompanyCode(companyCode);
+        qdto.setLogisticsCompanyName(companyName);
+        qdto.setLogisticsCompanyId(companyId);
+        qdto.setCourierNumber(logisticsNo);
+        qdto.setOrderId(orderId);
+        // 门店发货
+        qdto.setDeliveryMode(2);
+        // 好办
+        qdto.setSource(2);
+        List<OrderItemShipmentQDTO> list = new ArrayList<>();
+        orderItemIdList.forEach(o -> {
+            OrderItemShipmentQDTO item = new OrderItemShipmentQDTO();
+            item.setOrderItemId(o);
+            item.setStoreId(storeId);
+            list.add(item);
+        });
+        qdto.setOrderItemShipment(list);
+        this.webOrderManageApiService.updateLogistics(qdto);
+        return RestResponse.successResult();
+    }
+
+    // 客户详情中的商城订单
+}

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

+package com.gic.haoban.manage.web.controller.order;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+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.ordermanage.OrderExchangeConsultDTO;
+import com.gic.business.order.dto.ordermanage.OrderExchangeDetailDTO;
+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.ordermanage.RefundExchangeQDTO;
+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.vo.order.refund.OrderExchangeConsultVO;
+import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeDetailVO;
+import com.gic.haoban.manage.web.vo.order.refund.OrderRefundConsultVO;
+import com.gic.haoban.manage.web.vo.order.refund.OrderRefundDetailVO;
+import com.gic.haoban.manage.web.vo.order.refund.RefundAddressVO;
+import com.gic.haoban.manage.web.vo.order.refund.SellerAddressVO;
+
+@RestController
+@RequestMapping("/refund")
+public class GicOrderRefundController {
+
+    @Autowired
+    private OrderRefundApiService orderRefundApiService;
+    @Autowired
+    private MallSellerAddressApiService mallSellerAddressApiService;
+    @Autowired
+    private AfterSalesManageApiService afterSalesManageApiService ;
+
+    /**
+     * 
+    * @Title: exchangeConsult
+    * @Description: 售后列表
+    * @author xugh
+    * @param orderExchangeId
+    * @return
+    * @throws
+     */
+    @RequestMapping(value = "order-exchange-refund-list")
+    @ResponseBody
+    public RestResponse<Object> exchangeRefundList(RefundExchangeQDTO qdto) {
+        ServiceResponse<Page<OrderRefundExchangeListDTO>> resp = orderRefundApiService.refundExchangePage(qdto);
+        return RestResponse.successResult(resp.getResult());
+    }
+
+    // 详情
+    @RequestMapping(value = "order-refund-detail")
+    @ResponseBody
+    public RestResponse<Object> refundDetail(String orderRefundId) {
+        ServiceResponse<OrderRefundDetailDTO> resp = this.orderRefundApiService.refundDetail(orderRefundId);
+        OrderRefundDetailVO vo = EntityUtil.changeEntityNew(OrderRefundDetailVO.class, resp.getResult());
+        return RestResponse.successResult(vo);
+    }
+
+    // 详情
+    @RequestMapping(value = "order-exchange-detail")
+    @ResponseBody
+    public RestResponse<Object> exchangeDetail(String orderExchangeId) {
+        ServiceResponse<OrderExchangeDetailDTO> resp = this.orderRefundApiService.exchangeDetail(orderExchangeId);
+        OrderExchangeDetailVO vo = EntityUtil.changeEntityNew(OrderExchangeDetailVO.class, resp.getResult());
+        return RestResponse.successResult(vo);
+    }
+
+    // 审批退款单
+    // 拒绝 1 , 同意2
+    // 拒绝收货 1 同意收货2
+    @RequestMapping(value = "audit-refund-order")
+    @ResponseBody
+    public RestResponse<Object> auditRefund(String enterpriseId, String orderRefundId,
+            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark) {
+
+        return RestResponse.successResult();
+    }
+
+    // 审批换货单
+    // 拒绝 1 , 同意2
+    // 拒绝收货 1 同意收货2
+    @RequestMapping(value = "audit-exchange-order")
+    @ResponseBody
+    public RestResponse<Object> auditExchange(String enterpriseId, String orderRefundId,
+            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark) {
+        return RestResponse.successResult();
+    }
+
+    // 换货单发货
+    @RequestMapping(value = "exchange-order-deliver")
+    @ResponseBody
+    public RestResponse<Object> exchangeDeliver(String enterpriseId, String orderRefundId,
+            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark) {
+        return RestResponse.successResult();
+    }
+
+    // 协商记录-退款
+    @RequestMapping(value = "order-refund-consult")
+    @ResponseBody
+    public RestResponse<Object> refundConsult(String orderRefundId) {
+        ServiceResponse<List<OrderRefundConsultDTO>> resp = orderRefundApiService.listRefundConsult(orderRefundId);
+        List<OrderRefundConsultVO> list = EntityUtil.changeEntityListNew(OrderRefundConsultVO.class, resp.getResult());
+        return RestResponse.successResult(list);
+    }
+
+    // 协商记录-换货
+    @RequestMapping(value = "order-exchange-consult")
+    @ResponseBody
+    public RestResponse<Object> exchangeConsult(String orderExchangeId) {
+        ServiceResponse<List<OrderExchangeConsultDTO>> resp = orderRefundApiService
+                .listExchangeConsult(orderExchangeId);
+        List<OrderExchangeConsultVO> list = EntityUtil.changeEntityListNew(OrderExchangeConsultVO.class,
+                resp.getResult());
+        return RestResponse.successResult(list);
+    }
+
+    // 收货地址
+    @RequestMapping("get-seller-address")
+    @ResponseBody
+    public RestResponse<Object> refundAddressList(String enterpriseId, String orderId, String orderItemId) {
+        SellerAddressVO vo = new SellerAddressVO();
+        ServiceResponse<List<RefundAddressDTO>> resp = this.mallSellerAddressApiService.listRefundAddress(enterpriseId,
+                orderId, orderItemId);
+        List<RefundAddressDTO> list = resp.getResult();
+        List<RefundAddressVO> sellerAddressList = new ArrayList<>();
+        list.forEach(dto -> {
+            RefundAddressVO item = EntityUtil.changeEntityNew(RefundAddressVO.class, dto);
+            if (dto.getAddressType() == 0) {
+                vo.setOwnerStoreAddress(item);
+            }
+            if (dto.getAddressType() == 1) {
+                vo.setDeliverStoreAddress(item);
+            }
+            if (dto.getAddressType() == 2) {
+                sellerAddressList.add(item);
+            }
+        });
+        vo.setSellerAddressList(sellerAddressList);
+        return RestResponse.successResult(vo);
+    }
+
+}

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

+package com.gic.haoban.manage.web.controller.order;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.business.order.qdto.logistics.QueryLogisticsQDTO;
+import com.gic.business.order.service.logistics.LogisticsApiService;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.dict.api.dto.LogisticsCompanyDTO;
+import com.gic.dict.api.service.ManagerDictService;
+import com.gic.haoban.manage.web.qo.order.QueryLogisticsQO;
+import com.gic.thirdparty.api.dto.LogisticsDTO;
+
+/**
+ * 物流
+ */
+@Controller
+public class LogisticsController {
+
+    @Autowired
+    private LogisticsApiService logisticsApiService;
+
+    @Autowired
+    private ManagerDictService managerDictService;
+
+    /**
+     * 物流公司列表
+     *
+     * @return RestResponse
+     */
+    @ResponseBody
+    @RequestMapping("list-logistics")
+    public RestResponse<Object> listLogistics() {
+        List<LogisticsCompanyDTO> response = managerDictService.getLogisticsCompany();
+        return RestResponse.successResult(response);
+    }
+
+    /**
+     * 查询物流
+     *
+     * @param queryLogisticsQO 查询物流
+     * @return RestResponse
+     */
+    @ResponseBody
+    @RequestMapping("get-logistics")
+    public RestResponse<Object> getLogistics(@RequestBody QueryLogisticsQO queryLogisticsQO) {
+        QueryLogisticsQDTO qdto = EntityUtil.changeEntityByJSON(QueryLogisticsQDTO.class, queryLogisticsQO);
+        ServiceResponse<LogisticsDTO> response = logisticsApiService.queryLogistics(qdto);
+        if (response.isSuccess()) {
+            return RestResponse.successResult(response.getResult());
+        }
+        return RestResponse.failure(response.getCode(), response.getMessage());
+    }
+
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -70,6 +70,11 @@ public enum HaoBanErrCode {
     ERR_22(22, "验证码一分钟只能请求一次"),
     
     ERR_10008(10008,"请不要过于频繁点击"),
+    
+    ERR_100010(10003,"该订单已经核销"),
+    ERR_100013(10006,"订单不允许超期核销"),
+    ERR_100014(100014,"订单已被核销"),
+
 
     /**
      * 员工档案模块

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/order/QueryLogisticsQO.java

+package com.gic.haoban.manage.web.qo.order;
+
+import java.io.Serializable;
+
+/**
+ * @description: 这里是描述文字
+ * @author: 巴弗
+ * @createDate: 2023/2/27 13:51
+ */
+public class QueryLogisticsQO implements Serializable {
+    private static final long serialVersionUID = 274417196390718102L;
+
+
+    /**
+     * 类型 0：会员下单 1：退货物流 2：换货-买家 3：换货-卖家
+     * @see com.gic.business.order.enums.LogisticsEnum
+     */
+    private Integer type;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+
+    /**
+     * 主键ID
+     * 会员下单传订单ID
+     * 换货-换货单ID
+     * 退货-退货单ID
+     */
+    private String id;
+    /**
+     * 物流ID
+     * 根据type区分换货，退货退款和下单的物流ID
+     */
+    private String logisticsId;
+
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getLogisticsId() {
+        return logisticsId;
+    }
+
+    public void setLogisticsId(String logisticsId) {
+        this.logisticsId = logisticsId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/order/integral/ClerkQo.java

+package com.gic.haoban.manage.web.qo.order.integral;
+
+/**
+ * @description:
+ * @author:Yaorw
+ * @createTime:2020/4/10 14:09
+ * @version:1.0
+ */
+public class ClerkQo {
+
+    private String haobanClerkId;
+
+    private String storeId;
+    private String clerkId;
+
+    private String clerkCode;
+
+    private String clerkName;
+    private String haobanEnterpriseId;
+    private String enterpriseId;
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getHaobanClerkId() {
+        return haobanClerkId;
+    }
+
+    public void setHaobanClerkId(String haobanClerkId) {
+        this.haobanClerkId = haobanClerkId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getHaobanEnterpriseId() {
+        return haobanEnterpriseId;
+    }
+
+    public void setHaobanEnterpriseId(String haobanEnterpriseId) {
+        this.haobanEnterpriseId = haobanEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+
+}

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

+package com.gic.haoban.manage.web.vo.order;
+
+import java.io.Serializable;
+
+/**
+ * 
+* @ClassName: LogisticsVO
+* @Description: TODO(这里用一句话描述这个类的作用)
+* @author xugh
+* @date 2023年2月27日 下午3:36:38
+*
+ */
+public class LogisticsVO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 7507847399590848004L;
+
+    private String name;
+
+    private String code;
+
+    private String image;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order;
+
+import java.io.Serializable;
+
+public class MemberInfoVO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -2814959714712832104L;
+
+    // 会员信息
+    private String memberName;
+    private String memberImage;
+    private String mainClerkId;
+    private String mainClerkName;
+    private String mainStoreId;
+    private String mainStoreName;
+
+    // 收货地址
+    private String addressName;
+    private String addressPhone;
+    private String addressDetail;
+
+    public String getAddressName() {
+        return addressName;
+    }
+
+    public String getAddressPhone() {
+        return addressPhone;
+    }
+
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressName(String addressName) {
+        this.addressName = addressName;
+    }
+
+    public void setAddressPhone(String addressPhone) {
+        this.addressPhone = addressPhone;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public String getMemberImage() {
+        return memberImage;
+    }
+
+    public String getMainClerkId() {
+        return mainClerkId;
+    }
+
+    public String getMainClerkName() {
+        return mainClerkName;
+    }
+
+    public String getMainStoreId() {
+        return mainStoreId;
+    }
+
+    public String getMainStoreName() {
+        return mainStoreName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setMemberImage(String memberImage) {
+        this.memberImage = memberImage;
+    }
+
+    public void setMainClerkId(String mainClerkId) {
+        this.mainClerkId = mainClerkId;
+    }
+
+    public void setMainClerkName(String mainClerkName) {
+        this.mainClerkName = mainClerkName;
+    }
+
+    public void setMainStoreId(String mainStoreId) {
+        this.mainStoreId = mainStoreId;
+    }
+
+    public void setMainStoreName(String mainStoreName) {
+        this.mainStoreName = mainStoreName;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order;
+
+import java.io.Serializable;
+
+/**
+ * @description: 这里是描述文字
+ * @author: 巴弗
+ * @createDate: 2023/2/21 15:11
+ */
+public class OrderDetailItemVO implements Serializable {
+    private static final long serialVersionUID = 2204393471540203217L;
+
+    /**
+     * 订单项ID
+     */
+    private String orderItemId;
+
+    /**
+     * 商城商品Name
+     */
+    private String mallProName;
+
+    /**
+     * 商城商品零售价(sku单价)
+     */
+    private Double mallProPrice;
+
+    /**
+     * 商城商品图片url
+     */
+    private String mallProImageUrl;
+
+    /**
+     * 商城商品件数（或单位 贵金属-重量等）
+     */
+    private Double mallProNumber;
+
+    /**
+     * 商城商品SKU属性信息展现用 JSON [{propID:xxx,propName:xxx,valueID:xxx,valueName:xxx},...]
+     */
+    private String mallProSkuAttr;
+
+    /**
+     * 商品编号
+     */
+    private String proCode;
+
+    /**
+     * 是否赠品,1是0否
+     */
+    private Integer isGift;
+
+    /**
+     * 实付金额
+     */
+    private Double payAmount;
+    
+   
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public Double getMallProPrice() {
+        return mallProPrice;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public Double getMallProNumber() {
+        return mallProNumber;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public String getProCode() {
+        return proCode;
+    }
+
+    public Integer getIsGift() {
+        return isGift;
+    }
+
+    public Double getPayAmount() {
+        return payAmount;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProPrice(Double mallProPrice) {
+        this.mallProPrice = mallProPrice;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProNumber(Double mallProNumber) {
+        this.mallProNumber = mallProNumber;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setProCode(String proCode) {
+        this.proCode = proCode;
+    }
+
+    public void setIsGift(Integer isGift) {
+        this.isGift = isGift;
+    }
+
+    public void setPayAmount(Double payAmount) {
+        this.payAmount = payAmount;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description: 这里是描述文字
+ * @author: 巴弗
+ * @createDate: 2023/2/20 15:42
+ */
+public class OrderDetailVO implements Serializable {
+
+    private static final long serialVersionUID = 5215230055823016992L;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNumber;
+
+    /**
+     * 下单时间
+     */
+    private Date createTime;
+    // 付款时间
+    private Date payTime;
+    // 买家留言
+    private String buyerRemark;
+
+    /**
+     * 订单来源 0:会员自行购买 1导购推荐订单 （原字段为 订单类型：0:微商城 1:导购推荐订单）
+     */
+    private Integer orderType;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 会员姓名
+     */
+    private String memberRealName;
+
+    /**
+     * 会员卡号
+     */
+    private String memberCardNum;
+
+    /**
+     * 发货渠道类型(0自提，1快递)
+     */
+    private String deliveryChannel;
+
+    /**
+     * 订单流程阶段 0交易关闭 1未付款（待付款、等待买家付款） 2已付款未发货（待发货、买家已付款） 3已发货未签收（待收货、已发货） 4已确认交易结束,5已发货订单项退款中,6待付款订单项退款中,7部分发货
+     */
+    private String orderStep;
+
+    /**
+     * 实付金额 不含运费
+     */
+    private Double payAmount;
+
+    /**
+     * 最终实际运费（可手动修改）
+     */
+    private Double actualFreight;
+
+    /**
+     * 订单项列表
+     */
+    private List<OrderDetailItemVO> orderItemList;
+
+    /**
+     * 客户信息
+     */
+    private MemberInfoVO member;
+
+    /**
+     * 订单支付信息
+     */
+    private OrderPayInfoVO orderPayInfo;
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public String getBuyerRemark() {
+        return buyerRemark;
+    }
+
+    public OrderPayInfoVO getOrderPayInfo() {
+        return orderPayInfo;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public void setBuyerRemark(String buyerRemark) {
+        this.buyerRemark = buyerRemark;
+    }
+
+    public void setOrderPayInfo(OrderPayInfoVO orderPayInfo) {
+        this.orderPayInfo = orderPayInfo;
+    }
+
+    public MemberInfoVO getMember() {
+        return member;
+    }
+
+    public void setMember(MemberInfoVO member) {
+        this.member = member;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getMemberRealName() {
+        return memberRealName;
+    }
+
+    public void setMemberRealName(String memberRealName) {
+        this.memberRealName = memberRealName;
+    }
+
+    public String getMemberCardNum() {
+        return memberCardNum;
+    }
+
+    public void setMemberCardNum(String memberCardNum) {
+        this.memberCardNum = memberCardNum;
+    }
+
+    public String getDeliveryChannel() {
+        return deliveryChannel;
+    }
+
+    public void setDeliveryChannel(String deliveryChannel) {
+        this.deliveryChannel = deliveryChannel;
+    }
+
+    public String getOrderStep() {
+        return orderStep;
+    }
+
+    public void setOrderStep(String orderStep) {
+        this.orderStep = orderStep;
+    }
+
+    public Double getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(Double payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public Double getActualFreight() {
+        return actualFreight;
+    }
+
+    public void setActualFreight(Double actualFreight) {
+        this.actualFreight = actualFreight;
+    }
+
+    public List<OrderDetailItemVO> getOrderItemList() {
+        return orderItemList;
+    }
+
+    public void setOrderItemList(List<OrderDetailItemVO> orderItemList) {
+        this.orderItemList = orderItemList;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order;
+
+import java.io.Serializable;
+
+/**
+ * @description: 这里是描述文字
+ * @author: 巴弗
+ * @createDate: 2023/2/21 15:11
+ */
+public class OrderListItemVO implements Serializable {
+    private static final long serialVersionUID = 2204393471540203217L;
+
+    /**
+     * 订单项ID
+     */
+    private String orderItemId;
+
+    /**
+     * 商城商品Name
+     */
+    private String mallProName;
+
+    /**
+     * 商城商品零售价(sku单价)
+     */
+    private Double mallProPrice;
+
+    /**
+     * 商城商品图片url
+     */
+    private String mallProImageUrl;
+
+    /**
+     * 商城商品件数（或单位 贵金属-重量等）
+     */
+    private Double mallProNumber;
+
+    /**
+     * 商城商品SKU属性信息展现用 JSON [{propID:xxx,propName:xxx,valueID:xxx,valueName:xxx},...]
+     */
+    private String mallProSkuAttr;
+
+    /**
+     * 商品编号
+     */
+    private String proCode;
+
+    /**
+     * 是否赠品,1是0否
+     */
+    private Integer isGift;
+
+    /**
+     * 实付金额
+     */
+    private Double payAmount;
+    
+   
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public Double getMallProPrice() {
+        return mallProPrice;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public Double getMallProNumber() {
+        return mallProNumber;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public String getProCode() {
+        return proCode;
+    }
+
+    public Integer getIsGift() {
+        return isGift;
+    }
+
+    public Double getPayAmount() {
+        return payAmount;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProPrice(Double mallProPrice) {
+        this.mallProPrice = mallProPrice;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProNumber(Double mallProNumber) {
+        this.mallProNumber = mallProNumber;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setProCode(String proCode) {
+        this.proCode = proCode;
+    }
+
+    public void setIsGift(Integer isGift) {
+        this.isGift = isGift;
+    }
+
+    public void setPayAmount(Double payAmount) {
+        this.payAmount = payAmount;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description: 这里是描述文字
+ * @author: 巴弗
+ * @createDate: 2023/2/20 15:42
+ */
+public class OrderListVO implements Serializable {
+
+    private static final long serialVersionUID = 5215230055823016992L;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNumber;
+
+    /**
+     * 下单时间
+     */
+    private Date orderTime;
+
+    /**
+     * 订单来源 0:会员自行购买 1导购推荐订单 （原字段为 订单类型：0:微商城 1:导购推荐订单）
+     */
+    private Integer orderType;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 会员姓名
+     */
+    private String memberRealName;
+
+    /**
+     * 会员卡号
+     */
+    private String memberCardNum;
+
+    /**
+     * 发货渠道类型(0自提，1快递)
+     */
+    private String deliveryChannel;
+
+    /**
+     * 订单流程阶段 0交易关闭 1未付款（待付款、等待买家付款） 2已付款未发货（待发货、买家已付款） 3已发货未签收（待收货、已发货） 4已确认交易结束,5已发货订单项退款中,6待付款订单项退款中,7部分发货
+     */
+    private String orderStep;
+
+    /**
+     * 实付金额 不含运费
+     */
+    private Double payAmount;
+
+    /**
+     * 最终实际运费（可手动修改）
+     */
+    private Double actualFreight;
+
+    /**
+     * 订单项列表
+     */
+    private List<OrderListItemVO> orderItemList;
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public Date getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(Date orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getMemberRealName() {
+        return memberRealName;
+    }
+
+    public void setMemberRealName(String memberRealName) {
+        this.memberRealName = memberRealName;
+    }
+
+    public String getMemberCardNum() {
+        return memberCardNum;
+    }
+
+    public void setMemberCardNum(String memberCardNum) {
+        this.memberCardNum = memberCardNum;
+    }
+
+    public String getDeliveryChannel() {
+        return deliveryChannel;
+    }
+
+    public void setDeliveryChannel(String deliveryChannel) {
+        this.deliveryChannel = deliveryChannel;
+    }
+
+    public String getOrderStep() {
+        return orderStep;
+    }
+
+    public void setOrderStep(String orderStep) {
+        this.orderStep = orderStep;
+    }
+
+    public Double getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(Double payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public Double getActualFreight() {
+        return actualFreight;
+    }
+
+    public void setActualFreight(Double actualFreight) {
+        this.actualFreight = actualFreight;
+    }
+
+    public List<OrderListItemVO> getOrderItemList() {
+        return orderItemList;
+    }
+
+    public void setOrderItemList(List<OrderListItemVO> orderItemList) {
+        this.orderItemList = orderItemList;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order;
+
+import java.io.Serializable;
+
+public class OrderPayInfoVO implements Serializable{
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -4486463485561923799L;
+
+    /**
+     * 订单实付金额
+     */
+    private double payAmount;
+
+    /**
+     * 订单运费
+     */
+    private double freightAmount;
+
+    /**
+     * 订单优惠总金额
+     */
+    private double allDiscountAmount;
+
+    public double getPayAmount() {
+        return payAmount;
+    }
+
+    public double getFreightAmount() {
+        return freightAmount;
+    }
+
+    public double getAllDiscountAmount() {
+        return allDiscountAmount;
+    }
+
+    public void setPayAmount(double payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public void setFreightAmount(double freightAmount) {
+        this.freightAmount = freightAmount;
+    }
+
+    public void setAllDiscountAmount(double allDiscountAmount) {
+        this.allDiscountAmount = allDiscountAmount;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.integral;
+
+/**
+ * @description:
+ * @author:Yaorw
+ * @createTime:2020/4/13 10:26
+ * @version:1.0
+ */
+public class CheckVO {
+
+    /**
+     * 核销校验信息
+     */
+    private String message;
+    /**
+     * 核销校验code
+     */
+    private Integer code;
+    /**
+     * 核销记录id
+     */
+    private String id;
+    /**
+     * 是否核销成功
+     */
+    private Boolean success;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.integral;
+
+import java.io.Serializable;
+
+public class OrderCountVO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -4599873362174653386L;
+    private int integralDoneCount;
+    private int integralUndoneCount;
+
+    private int mallDoneCount;
+    private int mallUndoneCount;
+
+    private int totalDoneCount;
+    private int totalUndownCount;
+
+    public int getIntegralDoneCount() {
+        return integralDoneCount;
+    }
+
+    public int getIntegralUndoneCount() {
+        return integralUndoneCount;
+    }
+
+    public int getMallDoneCount() {
+        return mallDoneCount;
+    }
+
+    public int getMallUndoneCount() {
+        return mallUndoneCount;
+    }
+
+    public int getTotalDoneCount() {
+        return totalDoneCount;
+    }
+
+    public int getTotalUndownCount() {
+        return totalUndownCount;
+    }
+
+    public void setIntegralDoneCount(int integralDoneCount) {
+        this.integralDoneCount = integralDoneCount;
+    }
+
+    public void setIntegralUndoneCount(int integralUndoneCount) {
+        this.integralUndoneCount = integralUndoneCount;
+    }
+
+    public void setMallDoneCount(int mallDoneCount) {
+        this.mallDoneCount = mallDoneCount;
+    }
+
+    public void setMallUndoneCount(int mallUndoneCount) {
+        this.mallUndoneCount = mallUndoneCount;
+    }
+
+    public void setTotalDoneCount(int totalDoneCount) {
+        this.totalDoneCount = totalDoneCount;
+    }
+
+    public void setTotalUndownCount(int totalUndownCount) {
+        this.totalUndownCount = totalUndownCount;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.integral;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * @author 蘑小菇
+ * @Description:
+ * @date 2019/6/27 14:31
+ */
+public class ProductSku{
+
+    @JsonIgnore
+    private String valueId;
+    private String valueName;
+
+    @JsonIgnore
+    private String proId;
+
+    private String proName;
+
+    public String getValueId(){
+        return valueId;
+    }
+
+    public void setValueId(String valueId){
+        this.valueId = valueId;
+    }
+
+    public String getValueName(){
+        return valueName;
+    }
+
+    public void setValueName(String valueName){
+        this.valueName = valueName;
+    }
+
+    public String getProId(){
+        return proId;
+    }
+
+    public void setProId(String proId){
+        this.proId = proId;
+    }
+
+    public String getProName(){
+        return proName;
+    }
+
+    public void setProName(String proName){
+        this.proName = proName;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.integral;
+
+import java.util.List;
+
+/**
+ * @author 蘑小菇
+ * @Description:
+ * @date 2019/6/26 16:59
+ */
+public class ProductVO{
+
+
+    private String proName;
+
+    private String proCode;
+
+    private String proImage;
+
+    private List<ProductSku> proSku;
+
+    private Integer proNumber;
+
+    private Double proPrice;
+
+    private Integer proIntegral;
+
+    public Double getProPrice(){
+        return proPrice;
+    }
+
+    public void setProPrice(Double proPrice){
+        this.proPrice = proPrice;
+    }
+
+    public Integer getProIntegral(){
+        return proIntegral;
+    }
+
+    public void setProIntegral(Integer proIntegral){
+        this.proIntegral = proIntegral;
+    }
+
+    public String getProName(){
+        return proName;
+    }
+
+    public void setProName(String proName){
+        this.proName = proName;
+    }
+
+    public String getProCode(){
+        return proCode;
+    }
+
+    public void setProCode(String proCode){
+        this.proCode = proCode;
+    }
+
+    public String getProImage(){
+        return proImage;
+    }
+
+    public void setProImage(String proImage){
+        this.proImage = proImage;
+    }
+
+    public List<ProductSku> getProSku(){
+        return proSku;
+    }
+
+    public void setProSku(List<ProductSku> proSku){
+        this.proSku = proSku;
+    }
+
+    public Integer getProNumber(){
+        return proNumber;
+    }
+
+    public void setProNumber(Integer proNumber){
+        this.proNumber = proNumber;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.integral;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ScanVO implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    private String recordId;
+
+    private Integer hasOrder;
+
+    private String enterpriseId;
+
+    private Date finishTime;
+
+    /**
+     * 核销时间 诺手说，这认这个名字
+     */
+    private Date createTime;
+
+    private Date payTime;
+
+    private String payNumber;
+
+    private String orderNo;
+
+    private String exchangeId;
+
+    private Integer allCostIntegral;
+
+    private Double payCost;
+
+    private Integer status;
+
+    private String consignee;
+
+    private String consigneePhone;
+
+    private String address;
+
+    private String point;
+
+    private String takeTime;
+
+    private String writeOffCode;
+
+    private String fetchCode;
+
+
+    private List<ProductVO> products;
+
+    /**
+     * 1 核销，0 未核销
+     */
+    private Integer checked;
+
+    public Integer getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Integer checked) {
+        this.checked = checked;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public void  pushProduct(ProductVO productVO){
+        if(this.products ==null){
+            products = new ArrayList<>(  );
+        }
+
+        products.add( productVO );
+    }
+
+    public Integer getHasOrder(){
+        return hasOrder;
+    }
+
+    public void setHasOrder(Integer hasOrder){
+        this.hasOrder = hasOrder;
+    }
+
+    public List<ProductVO> getProducts(){
+        return products;
+    }
+
+    public void setProducts(List<ProductVO> products){
+        this.products = products;
+    }
+
+    public String getRecordId(){
+        return recordId;
+    }
+
+    public void setRecordId(String recordId){
+        this.recordId = recordId;
+    }
+
+    public String getEnterpriseId(){
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId){
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Date getFinishTime(){
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime){
+        this.finishTime = finishTime;
+    }
+
+    public Date getPayTime(){
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime){
+        this.payTime = payTime;
+    }
+
+    public String getPayNumber(){
+        return payNumber;
+    }
+
+    public void setPayNumber(String payNumber){
+        this.payNumber = payNumber;
+    }
+
+    public String getOrderNo(){
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo){
+        this.orderNo = orderNo;
+    }
+
+    public String getExchangeId(){
+        return exchangeId;
+    }
+
+    public void setExchangeId(String exchangeId){
+        this.exchangeId = exchangeId;
+    }
+
+
+    public Integer getAllCostIntegral(){
+        return allCostIntegral;
+    }
+
+    public void setAllCostIntegral(Integer allCostIntegral){
+        this.allCostIntegral = null == allCostIntegral?0:allCostIntegral;
+    }
+
+    public Double getPayCost(){
+        return payCost;
+    }
+
+    public void setPayCost(Double payCost){
+        this.payCost = payCost;
+    }
+
+    public Integer getStatus(){
+        return status;
+    }
+
+    public void setStatus(Integer status){
+        this.status = status;
+    }
+
+
+
+    public String getConsignee(){
+        return consignee;
+    }
+
+    public void setConsignee(String consignee){
+        this.consignee = consignee;
+    }
+
+    public String getConsigneePhone(){
+        return consigneePhone;
+    }
+
+    public void setConsigneePhone(String consigneePhone){
+        this.consigneePhone = consigneePhone;
+    }
+
+    public String getAddress(){
+        return address;
+    }
+
+    public void setAddress(String address){
+        this.address = address;
+    }
+
+    public String getPoint(){
+        return point;
+    }
+
+    public void setPoint(String point){
+        this.point = point;
+    }
+
+    public String getTakeTime(){
+        return takeTime;
+    }
+
+    public void setTakeTime(String takeTime){
+        this.takeTime = takeTime;
+    }
+
+    public String getWriteOffCode(){
+        return writeOffCode;
+    }
+
+    public void setWriteOffCode(String writeOffCode){
+        this.writeOffCode = writeOffCode;
+    }
+
+    public String getFetchCode(){
+        return fetchCode;
+    }
+
+    public void setFetchCode(String fetchCode){
+        this.fetchCode = fetchCode;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商城订单协商记录表
+ * @TableName tab_gic_mall_order_exchange_consult
+ */
+public class OrderExchangeConsultVO implements Serializable {
+    /**
+     * 协商记录id
+     */
+    private String orderExchangeConsultId;
+
+    /**
+     * 退款记录id
+     */
+    private String orderExchangeId;
+
+    /**
+     * 消息类型:1 系统信息,2 协商信息 3物流信息，4商品信息
+     */
+    private Integer msgType;
+
+    /**
+     * 买家还是卖家：1买家，2卖家
+     */
+    private Integer role;
+    
+    private String reason ;
+
+    /**
+     * 卖家与买家操作记录信息
+     */
+    private String msg;
+
+    /**
+     * 扩展信息json
+     */
+    private String extJson;
+
+    /**
+     * 协商信息(买家换货说明/商家拒绝说明)
+     */
+    private String remark;
+
+    /**
+     * 协商信息图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    /**
+     * 协商记录id
+     */
+    public String getOrderExchangeConsultId() {
+        return orderExchangeConsultId;
+    }
+
+    /**
+     * 协商记录id
+     */
+    public void setOrderExchangeConsultId(String orderExchangeConsultId) {
+        this.orderExchangeConsultId = orderExchangeConsultId;
+    }
+
+    /**
+     * 退款记录id
+     */
+    public String getOrderExchangeId() {
+        return orderExchangeId;
+    }
+
+    /**
+     * 退款记录id
+     */
+    public void setOrderExchangeId(String orderExchangeId) {
+        this.orderExchangeId = orderExchangeId;
+    }
+
+    /**
+     * 消息类型:1 系统信息,2 协商信息 3物流信息，4商品信息
+     */
+    public Integer getMsgType() {
+        return msgType;
+    }
+
+    /**
+     * 消息类型:1 系统信息,2 协商信息 3物流信息，4商品信息
+     */
+    public void setMsgType(Integer msgType) {
+        this.msgType = msgType;
+    }
+
+    /**
+     * 买家还是卖家：1买家，2卖家
+     */
+    public Integer getRole() {
+        return role;
+    }
+
+    /**
+     * 买家还是卖家：1买家，2卖家
+     */
+    public void setRole(Integer role) {
+        this.role = role;
+    }
+
+    /**
+     * 卖家与买家操作记录信息
+     */
+    public String getMsg() {
+        return msg;
+    }
+
+    /**
+     * 卖家与买家操作记录信息
+     */
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    /**
+     * 扩展信息json
+     */
+    public String getExtJson() {
+        return extJson;
+    }
+
+    /**
+     * 扩展信息json
+     */
+    public void setExtJson(String extJson) {
+        this.extJson = extJson;
+    }
+
+    /**
+     * 协商信息(买家换货说明/商家拒绝说明)
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 协商信息(买家换货说明/商家拒绝说明)
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 协商信息图片地址
+     */
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    /**
+     * 协商信息图片地址
+     */
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    /**
+     * 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * tab_gic_mall_order_exchange
+ */
+public class OrderExchangeExcelVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String orderExchangeId;
+
+    /**
+     * 订单换货流水号
+     */
+    private String orderExchangeNumber;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 订单项ID
+     */
+    private String orderItemId;
+
+    /**
+     * 订单流程ID
+     */
+    private String orderNumber;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    private String memberName;
+    private String memberCardNo;
+    /**
+     * 商家备注
+     */
+    private String sellerRemark;
+
+    /**
+     * 换货商品件数（或单位 贵金属-重量等）
+     */
+    private Double exchangeNumber;
+
+    /**
+     * 换货状态 1待换货待处理 2商家拒绝申请 3待买家退货 4待商家收货并发货 5待买家确认收货 6拒绝换货 7换货成功 8换货失败
+     */
+    private Integer exchangeStatus;
+
+    /**
+     * 买家物流号（退货物流）
+     */
+    private String buyerLogisticsCode;
+
+    /**
+     * 买家物流公司（退货物流）
+     */
+    private String buyerLogisticsCompanyName;
+
+    private String sellerLogisticsCompanyName;
+
+    private String sellerLogisticsCode;
+    
+    private String mallProId ;
+    /**
+     * 商城商品名称
+     */
+    private String mallProName;
+
+    /**
+     * 商品编号
+     */
+    private String mallProCode;
+
+    /**
+     * 商城商品图片url
+     */
+    private String mallProImageUrl;
+
+    /**
+     * 商城商品零售价
+     */
+    private Double mallProPrice;
+
+    private String mallProSkuAttr;
+
+    private Date createTime;
+    
+    /**
+     * 目标商品SKU_ID
+     */
+    private String targetProSkuId;
+
+    /**
+     * 目标商品SKU_CODE
+     */
+    private String targetProSkuCode;
+
+    /**
+     * 目标商品SKU属性
+     */
+    private String targetProSkuAttr;
+
+    /**
+     * 目标商品图片
+     */
+    private String targetProImageUrl;
+    
+    public String getTargetProSkuId() {
+        return targetProSkuId;
+    }
+
+    public String getTargetProSkuCode() {
+        return targetProSkuCode;
+    }
+
+    public String getTargetProSkuAttr() {
+        return targetProSkuAttr;
+    }
+
+    public String getTargetProImageUrl() {
+        return targetProImageUrl;
+    }
+
+    public void setTargetProSkuId(String targetProSkuId) {
+        this.targetProSkuId = targetProSkuId;
+    }
+
+    public void setTargetProSkuCode(String targetProSkuCode) {
+        this.targetProSkuCode = targetProSkuCode;
+    }
+
+    public void setTargetProSkuAttr(String targetProSkuAttr) {
+        this.targetProSkuAttr = targetProSkuAttr;
+    }
+
+    public void setTargetProImageUrl(String targetProImageUrl) {
+        this.targetProImageUrl = targetProImageUrl;
+    }
+
+    public String getMallProId() {
+        return mallProId;
+    }
+
+    public void setMallProId(String mallProId) {
+        this.mallProId = mallProId;
+    }
+
+    public String getOrderExchangeId() {
+        return orderExchangeId;
+    }
+
+    public String getOrderExchangeNumber() {
+        return orderExchangeNumber;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public String getMemberCardNo() {
+        return memberCardNo;
+    }
+
+    public String getSellerRemark() {
+        return sellerRemark;
+    }
+
+    public Double getExchangeNumber() {
+        return exchangeNumber;
+    }
+
+    public Integer getExchangeStatus() {
+        return exchangeStatus;
+    }
+
+    public String getBuyerLogisticsCode() {
+        return buyerLogisticsCode;
+    }
+
+    public String getBuyerLogisticsCompanyName() {
+        return buyerLogisticsCompanyName;
+    }
+
+    public String getSellerLogisticsCompanyName() {
+        return sellerLogisticsCompanyName;
+    }
+
+    public String getSellerLogisticsCode() {
+        return sellerLogisticsCode;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public String getMallProCode() {
+        return mallProCode;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public Double getMallProPrice() {
+        return mallProPrice;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setOrderExchangeId(String orderExchangeId) {
+        this.orderExchangeId = orderExchangeId;
+    }
+
+    public void setOrderExchangeNumber(String orderExchangeNumber) {
+        this.orderExchangeNumber = orderExchangeNumber;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setMemberCardNo(String memberCardNo) {
+        this.memberCardNo = memberCardNo;
+    }
+
+    public void setSellerRemark(String sellerRemark) {
+        this.sellerRemark = sellerRemark;
+    }
+
+    public void setExchangeNumber(Double exchangeNumber) {
+        this.exchangeNumber = exchangeNumber;
+    }
+
+    public void setExchangeStatus(Integer exchangeStatus) {
+        this.exchangeStatus = exchangeStatus;
+    }
+
+    public void setBuyerLogisticsCode(String buyerLogisticsCode) {
+        this.buyerLogisticsCode = buyerLogisticsCode;
+    }
+
+    public void setBuyerLogisticsCompanyName(String buyerLogisticsCompanyName) {
+        this.buyerLogisticsCompanyName = buyerLogisticsCompanyName;
+    }
+
+    public void setSellerLogisticsCompanyName(String sellerLogisticsCompanyName) {
+        this.sellerLogisticsCompanyName = sellerLogisticsCompanyName;
+    }
+
+    public void setSellerLogisticsCode(String sellerLogisticsCode) {
+        this.sellerLogisticsCode = sellerLogisticsCode;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProCode(String mallProCode) {
+        this.mallProCode = mallProCode;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProPrice(Double mallProPrice) {
+        this.mallProPrice = mallProPrice;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * tab_gic_mall_order_exchange
+ */
+public class OrderExchangeListVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String orderExchangeId;
+
+    /**
+     * 订单换货流水号
+     */
+    private String orderExchangeNumber;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 订单项ID
+     */
+    private String orderItemId;
+
+    /**
+     * 订单流程ID
+     */
+    private String orderNumber;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    private String memberName;
+    private String memberCardNo;
+    /**
+     * 商家备注
+     */
+    private String sellerRemark;
+
+    /**
+     * 换货商品件数（或单位 贵金属-重量等）
+     */
+    private Double exchangeNumber;
+
+    /**
+     * 换货状态 1待换货待处理 2商家拒绝申请 3待买家退货 4待商家收货并发货 5待买家确认收货 6拒绝换货 7换货成功 8换货失败
+     */
+    private Integer exchangeStatus;
+
+    /**
+     * 买家物流号（退货物流）
+     */
+    private String buyerLogisticsCode;
+
+    /**
+     * 买家物流公司（退货物流）
+     */
+    private String buyerLogisticsCompanyName;
+
+    private String sellerLogisticsCompanyName;
+
+    private String sellerLogisticsCode;
+    
+    private String mallProId ;
+    /**
+     * 商城商品名称
+     */
+    private String mallProName;
+
+    /**
+     * 商品编号
+     */
+    private String mallProCode;
+
+    /**
+     * 商城商品图片url
+     */
+    private String mallProImageUrl;
+
+    /**
+     * 商城商品零售价
+     */
+    private Double mallProPrice;
+
+    private String mallProSkuAttr;
+
+    private Date createTime;
+    
+    /**
+     * 目标商品SKU_ID
+     */
+    private String targetProSkuId;
+
+    /**
+     * 目标商品SKU_CODE
+     */
+    private String targetProSkuCode;
+
+    /**
+     * 目标商品SKU属性
+     */
+    private String targetProSkuAttr;
+
+    /**
+     * 目标商品图片
+     */
+    private String targetProImageUrl;
+    
+    public String getTargetProSkuId() {
+        return targetProSkuId;
+    }
+
+    public String getTargetProSkuCode() {
+        return targetProSkuCode;
+    }
+
+    public String getTargetProSkuAttr() {
+        return targetProSkuAttr;
+    }
+
+    public String getTargetProImageUrl() {
+        return targetProImageUrl;
+    }
+
+    public void setTargetProSkuId(String targetProSkuId) {
+        this.targetProSkuId = targetProSkuId;
+    }
+
+    public void setTargetProSkuCode(String targetProSkuCode) {
+        this.targetProSkuCode = targetProSkuCode;
+    }
+
+    public void setTargetProSkuAttr(String targetProSkuAttr) {
+        this.targetProSkuAttr = targetProSkuAttr;
+    }
+
+    public void setTargetProImageUrl(String targetProImageUrl) {
+        this.targetProImageUrl = targetProImageUrl;
+    }
+
+    public String getMallProId() {
+        return mallProId;
+    }
+
+    public void setMallProId(String mallProId) {
+        this.mallProId = mallProId;
+    }
+
+    public String getOrderExchangeId() {
+        return orderExchangeId;
+    }
+
+    public String getOrderExchangeNumber() {
+        return orderExchangeNumber;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public String getMemberCardNo() {
+        return memberCardNo;
+    }
+
+    public String getSellerRemark() {
+        return sellerRemark;
+    }
+
+    public Double getExchangeNumber() {
+        return exchangeNumber;
+    }
+
+    public Integer getExchangeStatus() {
+        return exchangeStatus;
+    }
+
+    public String getBuyerLogisticsCode() {
+        return buyerLogisticsCode;
+    }
+
+    public String getBuyerLogisticsCompanyName() {
+        return buyerLogisticsCompanyName;
+    }
+
+    public String getSellerLogisticsCompanyName() {
+        return sellerLogisticsCompanyName;
+    }
+
+    public String getSellerLogisticsCode() {
+        return sellerLogisticsCode;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public String getMallProCode() {
+        return mallProCode;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public Double getMallProPrice() {
+        return mallProPrice;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setOrderExchangeId(String orderExchangeId) {
+        this.orderExchangeId = orderExchangeId;
+    }
+
+    public void setOrderExchangeNumber(String orderExchangeNumber) {
+        this.orderExchangeNumber = orderExchangeNumber;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setMemberCardNo(String memberCardNo) {
+        this.memberCardNo = memberCardNo;
+    }
+
+    public void setSellerRemark(String sellerRemark) {
+        this.sellerRemark = sellerRemark;
+    }
+
+    public void setExchangeNumber(Double exchangeNumber) {
+        this.exchangeNumber = exchangeNumber;
+    }
+
+    public void setExchangeStatus(Integer exchangeStatus) {
+        this.exchangeStatus = exchangeStatus;
+    }
+
+    public void setBuyerLogisticsCode(String buyerLogisticsCode) {
+        this.buyerLogisticsCode = buyerLogisticsCode;
+    }
+
+    public void setBuyerLogisticsCompanyName(String buyerLogisticsCompanyName) {
+        this.buyerLogisticsCompanyName = buyerLogisticsCompanyName;
+    }
+
+    public void setSellerLogisticsCompanyName(String sellerLogisticsCompanyName) {
+        this.sellerLogisticsCompanyName = sellerLogisticsCompanyName;
+    }
+
+    public void setSellerLogisticsCode(String sellerLogisticsCode) {
+        this.sellerLogisticsCode = sellerLogisticsCode;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProCode(String mallProCode) {
+        this.mallProCode = mallProCode;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProPrice(Double mallProPrice) {
+        this.mallProPrice = mallProPrice;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description: 这里是描述文字
+ * @author: 巴弗
+ * @createDate: 2023/2/20 15:42
+ */
+public class OrderListVO implements Serializable {
+
+    private static final long serialVersionUID = 5215230055823016992L;
+
+    // 退款单id
+    private String orderRefundId;
+    // 退款单号
+    private String orderRefundNumber;
+    // 1仅退款 2退货退款 3 换货
+    private Integer refundType;
+    /**
+     * 申请时间
+     */
+    private Date refundTime;
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNumber;
+
+    /**
+     * 商城商品Name
+     */
+    private String mallProName;
+
+    /**
+     * 商城商品图片url
+     */
+    private String mallProImageUrl;
+
+    /**
+     * 商城商品件数（或单位 贵金属-重量等）
+     */
+    private Double mallProNumber;
+
+    /**
+     * 商城商品SKU属性信息展现用 JSON [{propID:xxx,propName:xxx,valueID:xxx,valueName:xxx},...]
+     */
+    private String mallProSkuAttr;
+
+    /**
+     * 订单项实付金额
+     */
+    private Double itemPayAmount;
+
+    public String getOrderRefundId() {
+        return orderRefundId;
+    }
+
+    public String getOrderRefundNumber() {
+        return orderRefundNumber;
+    }
+
+    public Integer getRefundType() {
+        return refundType;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public Double getMallProNumber() {
+        return mallProNumber;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public Double getItemPayAmount() {
+        return itemPayAmount;
+    }
+
+    public void setOrderRefundId(String orderRefundId) {
+        this.orderRefundId = orderRefundId;
+    }
+
+    public void setOrderRefundNumber(String orderRefundNumber) {
+        this.orderRefundNumber = orderRefundNumber;
+    }
+
+    public void setRefundType(Integer refundType) {
+        this.refundType = refundType;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProNumber(Double mallProNumber) {
+        this.mallProNumber = mallProNumber;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setItemPayAmount(Double itemPayAmount) {
+        this.itemPayAmount = itemPayAmount;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商城订单协商记录表
+ * @TableName tab_gic_mall_order_refund_consult
+ */
+public class OrderRefundConsultVO implements Serializable {
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 4924928859885431070L;
+
+    /**
+     * 协商记录id
+     */
+    private String orderRefundConsultId;
+
+    /**
+     * 退款记录id
+     */
+    private String orderRefundId;
+
+    /**
+     * 买家还是卖家：1买家，2卖家
+     */
+    private Integer role;
+
+    /**
+     * 卖家与买家操作记录信息
+     */
+    private String msg;
+
+    /**
+     * 退款原因
+     */
+    private String refundReason;
+
+    /**
+     * 退款类型：1，仅退款，2退货退款
+     */
+    private Integer refundType;
+
+    /**
+     * 退款金额(申请退款金额)
+     */
+    private Double refundPrice;
+
+    /**
+     * 退款说明
+     */
+    private String description;
+
+    /**
+     * 退款图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 退还积分
+     */
+    private Double refundPoint;
+
+    /**
+     * 消息类型:REFUND_TYPE退款类型,MSG_TYPE沟通信息类型
+     */
+    private String msgType;
+
+    /**
+     * 退款时发货类型：1：未发货类型，2：已发货类型
+     */
+    private Integer refundDeliverType;
+
+    private String extJson ;
+
+    public String getExtJson() {
+        return extJson;
+    }
+
+    public void setExtJson(String extJson) {
+        this.extJson = extJson;
+    }
+
+    /**
+     * 协商记录id
+     */
+    public String getOrderRefundConsultId() {
+        return orderRefundConsultId;
+    }
+
+    /**
+     * 协商记录id
+     */
+    public void setOrderRefundConsultId(String orderRefundConsultId) {
+        this.orderRefundConsultId = orderRefundConsultId;
+    }
+
+    /**
+     * 退款记录id
+     */
+    public String getOrderRefundId() {
+        return orderRefundId;
+    }
+
+    /**
+     * 退款记录id
+     */
+    public void setOrderRefundId(String orderRefundId) {
+        this.orderRefundId = orderRefundId;
+    }
+
+    /**
+     * 买家还是卖家：1买家，2卖家
+     */
+    public Integer getRole() {
+        return role;
+    }
+
+    /**
+     * 买家还是卖家：1买家，2卖家
+     */
+    public void setRole(Integer role) {
+        this.role = role;
+    }
+
+    /**
+     * 卖家与买家操作记录信息
+     */
+    public String getMsg() {
+        return msg;
+    }
+
+    /**
+     * 卖家与买家操作记录信息
+     */
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    /**
+     * 退款原因
+     */
+    public String getRefundReason() {
+        return refundReason;
+    }
+
+    /**
+     * 退款原因
+     */
+    public void setRefundReason(String refundReason) {
+        this.refundReason = refundReason;
+    }
+
+    /**
+     * 退款类型：1，仅退款，2退货退款
+     */
+    public Integer getRefundType() {
+        return refundType;
+    }
+
+    /**
+     * 退款类型：1，仅退款，2退货退款
+     */
+    public void setRefundType(Integer refundType) {
+        this.refundType = refundType;
+    }
+
+    /**
+     * 退款金额(申请退款金额)
+     */
+    public Double getRefundPrice() {
+        return refundPrice;
+    }
+
+    /**
+     * 退款金额(申请退款金额)
+     */
+    public void setRefundPrice(Double refundPrice) {
+        this.refundPrice = refundPrice;
+    }
+
+    /**
+     * 退款说明
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 退款说明
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * 退款图片地址
+     */
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    /**
+     * 退款图片地址
+     */
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    /**
+     * 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 退还积分
+     */
+    public Double getRefundPoint() {
+        return refundPoint;
+    }
+
+    /**
+     * 退还积分
+     */
+    public void setRefundPoint(Double refundPoint) {
+        this.refundPoint = refundPoint;
+    }
+
+    /**
+     * 消息类型:REFUND_TYPE退款类型,MSG_TYPE沟通信息类型
+     */
+    public String getMsgType() {
+        return msgType;
+    }
+
+    /**
+     * 消息类型:REFUND_TYPE退款类型,MSG_TYPE沟通信息类型
+     */
+    public void setMsgType(String msgType) {
+        this.msgType = msgType;
+    }
+
+    /**
+     * 退款时发货类型：1：未发货类型，2：已发货类型
+     */
+    public Integer getRefundDeliverType() {
+        return refundDeliverType;
+    }
+
+    /**
+     * 退款时发货类型：1：未发货类型，2：已发货类型
+     */
+    public void setRefundDeliverType(Integer refundDeliverType) {
+        this.refundDeliverType = refundDeliverType;
+    }
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商城退款记录
+ *
+ * @author zxy
+ */
+public class OrderRefundDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String orderRefundId;
+    private String orderId;// 订单ID
+    private String orderItemId;// 订单项ID
+    private String orderNumber;
+    private String orderRefundNumber; // 退款编号
+    private Integer refundType;// 退款类型：0，仅退款，1退货退款
+    private double refundNumber = 0.00d;// 退款商品件数（或单位 贵金属-重量等）
+    private double payAmount; // 实付金额
+    private double applyRefundPrice = 0.00d;// 申请退款金额
+    private double refundPrice = 0.00d;// 退款金额 实付部分
+    private int refundPoints = 0;// 退款 积分部分
+
+    private String refundLogisticsId; // 物流退款id
+    private String logisticsName;// 物流名称
+    private String logisticsNumber;// 物流单号
+
+    // 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
+    private int refundStatus = 1;
+    // 下单时间
+    private Date orderTime;
+    private Date createTime;// 创建记录时间
+
+    private String mallProId;
+    private Double mallProPrice;
+    private Double mallProNumber;
+    private String mallProName;// 商城商品Name
+    private String mallProImageUrl;// 商城商品图片url
+    private String mallProSkuAttr;
+    private String mallProSkuCode;
+    private String sellerRemark; // 商家备注
+
+    private String memberId;
+    private String memberName;
+    private String memberCardNo;
+    // 赠品1是0否
+    private int giftFlag;
+
+    /**
+     * 退款处理时间
+     */
+    private Date refundProcessTime;
+
+    /**
+     * 买家退货时间
+     */
+    private Date refundGoodsTime;
+
+    // 1：未发货类型，2：已发货类型
+    private int refundDeliverType = 1;
+
+    /**
+     * 同意买家发货申请
+     */
+    private Date sellerConfirmTime;
+
+    // 优惠信息
+    private String discountAmountInfo;
+
+    public String getMallProId() {
+        return mallProId;
+    }
+
+    public void setMallProId(String mallProId) {
+        this.mallProId = mallProId;
+    }
+
+    public String getDiscountAmountInfo() {
+        return discountAmountInfo;
+    }
+
+    public void setDiscountAmountInfo(String discountAmountInfo) {
+        this.discountAmountInfo = discountAmountInfo;
+    }
+
+    public int getRefundDeliverType() {
+        return refundDeliverType;
+    }
+
+    public Date getSellerConfirmTime() {
+        return sellerConfirmTime;
+    }
+
+    public void setRefundDeliverType(int refundDeliverType) {
+        this.refundDeliverType = refundDeliverType;
+    }
+
+    public void setSellerConfirmTime(Date sellerConfirmTime) {
+        this.sellerConfirmTime = sellerConfirmTime;
+    }
+
+    public Double getMallProPrice() {
+        return mallProPrice;
+    }
+
+    public Double getMallProNumber() {
+        return mallProNumber;
+    }
+
+    public void setMallProPrice(Double mallProPrice) {
+        this.mallProPrice = mallProPrice;
+    }
+
+    public void setMallProNumber(Double mallProNumber) {
+        this.mallProNumber = mallProNumber;
+    }
+
+    public String getOrderRefundId() {
+        return orderRefundId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public String getOrderRefundNumber() {
+        return orderRefundNumber;
+    }
+
+    public Integer getRefundType() {
+        return refundType;
+    }
+
+    public double getRefundNumber() {
+        return refundNumber;
+    }
+
+    public double getPayAmount() {
+        return payAmount;
+    }
+
+    public double getApplyRefundPrice() {
+        return applyRefundPrice;
+    }
+
+    public double getRefundPrice() {
+        return refundPrice;
+    }
+
+    public int getRefundPoints() {
+        return refundPoints;
+    }
+
+    public String getRefundLogisticsId() {
+        return refundLogisticsId;
+    }
+
+    public String getLogisticsName() {
+        return logisticsName;
+    }
+
+    public String getLogisticsNumber() {
+        return logisticsNumber;
+    }
+
+    public int getRefundStatus() {
+        return refundStatus;
+    }
+
+    public Date getOrderTime() {
+        return orderTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public String getMallProSkuCode() {
+        return mallProSkuCode;
+    }
+
+    public String getSellerRemark() {
+        return sellerRemark;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public String getMemberCardNo() {
+        return memberCardNo;
+    }
+
+    public int getGiftFlag() {
+        return giftFlag;
+    }
+
+    public Date getRefundProcessTime() {
+        return refundProcessTime;
+    }
+
+    public Date getRefundGoodsTime() {
+        return refundGoodsTime;
+    }
+
+    public void setOrderRefundId(String orderRefundId) {
+        this.orderRefundId = orderRefundId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setOrderRefundNumber(String orderRefundNumber) {
+        this.orderRefundNumber = orderRefundNumber;
+    }
+
+    public void setRefundType(Integer refundType) {
+        this.refundType = refundType;
+    }
+
+    public void setRefundNumber(double refundNumber) {
+        this.refundNumber = refundNumber;
+    }
+
+    public void setPayAmount(double payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public void setApplyRefundPrice(double applyRefundPrice) {
+        this.applyRefundPrice = applyRefundPrice;
+    }
+
+    public void setRefundPrice(double refundPrice) {
+        this.refundPrice = refundPrice;
+    }
+
+    public void setRefundPoints(int refundPoints) {
+        this.refundPoints = refundPoints;
+    }
+
+    public void setRefundLogisticsId(String refundLogisticsId) {
+        this.refundLogisticsId = refundLogisticsId;
+    }
+
+    public void setLogisticsName(String logisticsName) {
+        this.logisticsName = logisticsName;
+    }
+
+    public void setLogisticsNumber(String logisticsNumber) {
+        this.logisticsNumber = logisticsNumber;
+    }
+
+    public void setRefundStatus(int refundStatus) {
+        this.refundStatus = refundStatus;
+    }
+
+    public void setOrderTime(Date orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setMallProSkuCode(String mallProSkuCode) {
+        this.mallProSkuCode = mallProSkuCode;
+    }
+
+    public void setSellerRemark(String sellerRemark) {
+        this.sellerRemark = sellerRemark;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setMemberCardNo(String memberCardNo) {
+        this.memberCardNo = memberCardNo;
+    }
+
+    public void setGiftFlag(int giftFlag) {
+        this.giftFlag = giftFlag;
+    }
+
+    public void setRefundProcessTime(Date refundProcessTime) {
+        this.refundProcessTime = refundProcessTime;
+    }
+
+    public void setRefundGoodsTime(Date refundGoodsTime) {
+        this.refundGoodsTime = refundGoodsTime;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商城退款记录
+ *
+ * @author zxy
+ */
+public class OrderRefundExcelVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String orderRefundId;
+    private String orderId;// 订单ID
+    private String orderItemId;// 订单项ID
+    private String orderNumber;
+    private String orderRefundNumber; // 退款编号
+    private Integer refundType;// 退款类型：0，仅退款，1退货退款
+    private double refundNumber = 0.00d;// 退款商品件数（或单位 贵金属-重量等）
+    private double payAmount; // 实付金额
+    private double applyRefundPrice = 0.00d;// 申请退款金额
+    private double refundPrice = 0.00d;// 退款金额 实付部分
+    private int refundPoints = 0;// 退款 积分部分
+
+    private String refundLogisticsId; // 物流退款id
+    private String logisticsName;// 物流名称
+    private String logisticsNumber;// 物流单号
+
+    // 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
+    private int refundStatus = 1;
+
+    private Date createTime;// 创建记录时间
+
+    private String mallProName;// 商城商品Name
+    private String mallProImageUrl;// 商城商品图片url
+    private String mallProSkuAttr;
+    private String mallProSkuCode;
+    private String sellerRemark; // 商家备注
+    private String memberId ;
+    private String memberName;
+    private String memberCardNo;
+    // 赠品1是0否
+    private int giftFlag;
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public int getGiftFlag() {
+        return giftFlag;
+    }
+
+    public void setGiftFlag(int giftFlag) {
+        this.giftFlag = giftFlag;
+    }
+
+    public String getOrderRefundId() {
+        return orderRefundId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public String getOrderRefundNumber() {
+        return orderRefundNumber;
+    }
+
+    public Integer getRefundType() {
+        return refundType;
+    }
+
+    public double getRefundNumber() {
+        return refundNumber;
+    }
+
+    public String getRefundLogisticsId() {
+        return refundLogisticsId;
+    }
+
+    public String getLogisticsName() {
+        return logisticsName;
+    }
+
+    public String getLogisticsNumber() {
+        return logisticsNumber;
+    }
+
+    public double getApplyRefundPrice() {
+        return applyRefundPrice;
+    }
+
+    public double getRefundPrice() {
+        return refundPrice;
+    }
+
+    public int getRefundStatus() {
+        return refundStatus;
+    }
+
+    public int getRefundPoints() {
+        return refundPoints;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public double getPayAmount() {
+        return payAmount;
+    }
+
+    public String getMallProSkuCode() {
+        return mallProSkuCode;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public String getMemberCardNo() {
+        return memberCardNo;
+    }
+
+    public void setOrderRefundId(String orderRefundId) {
+        this.orderRefundId = orderRefundId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setOrderRefundNumber(String orderRefundNumber) {
+        this.orderRefundNumber = orderRefundNumber;
+    }
+
+    public void setRefundType(Integer refundType) {
+        this.refundType = refundType;
+    }
+
+    public void setRefundNumber(double refundNumber) {
+        this.refundNumber = refundNumber;
+    }
+
+    public void setRefundLogisticsId(String refundLogisticsId) {
+        this.refundLogisticsId = refundLogisticsId;
+    }
+
+    public void setLogisticsName(String logisticsName) {
+        this.logisticsName = logisticsName;
+    }
+
+    public void setLogisticsNumber(String logisticsNumber) {
+        this.logisticsNumber = logisticsNumber;
+    }
+
+    public void setApplyRefundPrice(double applyRefundPrice) {
+        this.applyRefundPrice = applyRefundPrice;
+    }
+
+    public void setRefundPrice(double refundPrice) {
+        this.refundPrice = refundPrice;
+    }
+
+    public void setRefundStatus(int refundStatus) {
+        this.refundStatus = refundStatus;
+    }
+
+    public void setRefundPoints(int refundPoints) {
+        this.refundPoints = refundPoints;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setPayAmount(double payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public void setMallProSkuCode(String mallProSkuCode) {
+        this.mallProSkuCode = mallProSkuCode;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setMemberCardNo(String memberCardNo) {
+        this.memberCardNo = memberCardNo;
+    }
+
+    public String getSellerRemark() {
+        return sellerRemark;
+    }
+
+    public void setSellerRemark(String sellerRemark) {
+        this.sellerRemark = sellerRemark;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商城退款记录
+ *
+ * @author zxy
+ */
+public class OrderRefundListVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String orderRefundId;
+    private String orderId;// 订单ID
+    private String orderItemId;// 订单项ID
+    private String orderNumber;
+    private String orderRefundNumber; // 退款编号
+    private Integer refundType;// 退款类型：0，仅退款，1退货退款
+    private double refundNumber = 0.00d;// 退款商品件数（或单位 贵金属-重量等）
+    private double payAmount; // 实付金额
+    private double applyRefundPrice = 0.00d;// 申请退款金额
+    private double refundPrice = 0.00d;// 退款金额 实付部分
+    private int refundPoints = 0;// 退款 积分部分
+
+    private String refundLogisticsId; // 物流退款id
+    private String logisticsName;// 物流名称
+    private String logisticsNumber;// 物流单号
+
+    // 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
+    private int refundStatus = 1;
+
+    private Date createTime;// 创建记录时间
+    
+    private String mallProId ;
+    private String mallProCode ;
+    private String mallProName;// 商城商品Name
+    private String mallProImageUrl;// 商城商品图片url
+    private String mallProSkuAttr;
+    private String mallProSkuCode;
+    private String sellerRemark; // 商家备注
+    private String memberId ;
+    private String memberName;
+    private String memberCardNo;
+    // 赠品1是0否
+    private int giftFlag;
+    
+    public String getMallProId() {
+        return mallProId;
+    }
+
+    public String getMallProCode() {
+        return mallProCode;
+    }
+
+    public void setMallProId(String mallProId) {
+        this.mallProId = mallProId;
+    }
+
+    public void setMallProCode(String mallProCode) {
+        this.mallProCode = mallProCode;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public int getGiftFlag() {
+        return giftFlag;
+    }
+
+    public void setGiftFlag(int giftFlag) {
+        this.giftFlag = giftFlag;
+    }
+
+    public String getOrderRefundId() {
+        return orderRefundId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public String getOrderRefundNumber() {
+        return orderRefundNumber;
+    }
+
+    public Integer getRefundType() {
+        return refundType;
+    }
+
+    public double getRefundNumber() {
+        return refundNumber;
+    }
+
+    public String getRefundLogisticsId() {
+        return refundLogisticsId;
+    }
+
+    public String getLogisticsName() {
+        return logisticsName;
+    }
+
+    public String getLogisticsNumber() {
+        return logisticsNumber;
+    }
+
+    public double getApplyRefundPrice() {
+        return applyRefundPrice;
+    }
+
+    public double getRefundPrice() {
+        return refundPrice;
+    }
+
+    public int getRefundStatus() {
+        return refundStatus;
+    }
+
+    public int getRefundPoints() {
+        return refundPoints;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public String getMallProName() {
+        return mallProName;
+    }
+
+    public String getMallProImageUrl() {
+        return mallProImageUrl;
+    }
+
+    public String getMallProSkuAttr() {
+        return mallProSkuAttr;
+    }
+
+    public double getPayAmount() {
+        return payAmount;
+    }
+
+    public String getMallProSkuCode() {
+        return mallProSkuCode;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public String getMemberCardNo() {
+        return memberCardNo;
+    }
+
+    public void setOrderRefundId(String orderRefundId) {
+        this.orderRefundId = orderRefundId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setOrderRefundNumber(String orderRefundNumber) {
+        this.orderRefundNumber = orderRefundNumber;
+    }
+
+    public void setRefundType(Integer refundType) {
+        this.refundType = refundType;
+    }
+
+    public void setRefundNumber(double refundNumber) {
+        this.refundNumber = refundNumber;
+    }
+
+    public void setRefundLogisticsId(String refundLogisticsId) {
+        this.refundLogisticsId = refundLogisticsId;
+    }
+
+    public void setLogisticsName(String logisticsName) {
+        this.logisticsName = logisticsName;
+    }
+
+    public void setLogisticsNumber(String logisticsNumber) {
+        this.logisticsNumber = logisticsNumber;
+    }
+
+    public void setApplyRefundPrice(double applyRefundPrice) {
+        this.applyRefundPrice = applyRefundPrice;
+    }
+
+    public void setRefundPrice(double refundPrice) {
+        this.refundPrice = refundPrice;
+    }
+
+    public void setRefundStatus(int refundStatus) {
+        this.refundStatus = refundStatus;
+    }
+
+    public void setRefundPoints(int refundPoints) {
+        this.refundPoints = refundPoints;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setMallProName(String mallProName) {
+        this.mallProName = mallProName;
+    }
+
+    public void setMallProImageUrl(String mallProImageUrl) {
+        this.mallProImageUrl = mallProImageUrl;
+    }
+
+    public void setMallProSkuAttr(String mallProSkuAttr) {
+        this.mallProSkuAttr = mallProSkuAttr;
+    }
+
+    public void setPayAmount(double payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public void setMallProSkuCode(String mallProSkuCode) {
+        this.mallProSkuCode = mallProSkuCode;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setMemberCardNo(String memberCardNo) {
+        this.memberCardNo = memberCardNo;
+    }
+
+    public String getSellerRemark() {
+        return sellerRemark;
+    }
+
+    public void setSellerRemark(String sellerRemark) {
+        this.sellerRemark = sellerRemark;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+
+/**
+ * 
+* @ClassName: RefundAddressVO
+* @Description: 退款地址
+* @author xugh
+* @date 2023年2月27日 下午6:57:43
+*
+ */
+public class RefundAddressVO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -9031869412982343516L;
+    
+    private String id ;
+    // 0归属门店 1发货门店 2平台地址
+    private int addressType ;
+    private String phone;
+    private String name;
+    private String address;
+    
+    public int getAddressType() {
+        return addressType;
+    }
+
+    public void setAddressType(int addressType) {
+        this.addressType = addressType;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.order.refund;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+* @ClassName: RefundAddressVO
+* @Description: 退款地址
+* @author xugh
+* @date 2023年2月27日 下午6:57:43
+*
+ */
+public class SellerAddressVO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -3262328396877481444L;
+    
+    // 归属门店
+    private RefundAddressVO ownerStoreAddress;
+    // 发货门店
+    private RefundAddressVO deliverStoreAddress;
+    // 平台退货地址
+    private List<RefundAddressVO> sellerAddressList;
+
+    public RefundAddressVO getOwnerStoreAddress() {
+        return ownerStoreAddress;
+    }
+
+    public RefundAddressVO getDeliverStoreAddress() {
+        return deliverStoreAddress;
+    }
+
+    public List<RefundAddressVO> getSellerAddressList() {
+        return sellerAddressList;
+    }
+
+    public void setOwnerStoreAddress(RefundAddressVO ownerStoreAddress) {
+        this.ownerStoreAddress = ownerStoreAddress;
+    }
+
+    public void setDeliverStoreAddress(RefundAddressVO deliverStoreAddress) {
+        this.deliverStoreAddress = deliverStoreAddress;
+    }
+
+    public void setSellerAddressList(List<RefundAddressVO> sellerAddressList) {
+        this.sellerAddressList = sellerAddressList;
+    }
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -122,8 +122,13 @@
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialApiService" id="contentMaterialApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialShareApiService" id="contentMaterialShareApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference id="settingApiService" interface="com.gic.haoban.app.aggregation.api.service.SettingApiService" timeout="10000" retries="0" check="false"/>
-
-
     <dubbo:reference id="newDataTargetConfigApiService" interface="com.gic.enterprise.api.service.target.NewDataTargetConfigApiService" timeout="100000" retries="0" check="false" />
-
+	<dubbo:reference id="logisticsApiService" interface="com.gic.business.order.service.logistics.LogisticsApiService" timeout="100000" retries="0" check="false" />
+
+	<dubbo:reference id="orderVerificationRecordApiService" interface="com.gic.haoban.app.aggregation.api.service.evaluation.OrderVerificationRecordApiService" timeout="100000" retries="0" check="false" />
+	<dubbo:reference id="orderRefundApiService" interface="com.gic.business.order.service.ordermanage.OrderRefundApiService" timeout="100000" retries="0" check="false" />
+	<dubbo:reference id="mallSellerAddressApiService" interface="com.gic.business.order.service.ordermanage.MallSellerAddressApiService" timeout="100000" retries="0" check="false" />
+	<dubbo:reference id="webOrderManageApiService" interface="com.gic.business.order.service.ordermanage.WebOrderManageApiService" timeout="100000" retries="0" check="false" />
+	<dubbo:reference id="afterSalesManageApiService" interface="com.gic.business.order.api.service.order.AfterSalesManageApiService" timeout="100000" retries="0" check="false" />
+	
 </beans>