Merge remote-tracking branch 'origin/feature-积分商城迁移'

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -70,9 +70,10 @@ public enum NoticeMessageTypeEnum {
     REFUND_AUDIT(5010, "新增售后提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_audit", "/pages/route/index?pageType=", "hbapp_order_center", "afterSalesReviewReminder", "haobanNotice"),
     REFUND_MEMBER_CANCEL(5011, "买家取消售后提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_member_cancel", "/pages/route/index?pageType=", "hbapp_order_center", "afterSalesCancelReminder", "haobanNotice"),
     REFUND_DELIVER(5013, "买家寄出退换货提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_deliver", "/pages/route/index?pageType=", "hbapp_order_center", "buyerSendsBackRemind", "haobanNotice"),
+    ORDER_PICK_UP_AGREE(5014, "取消门店自提订单", NoticeMessageCategoryTypeEnum.REFUND.getType(), "order_pick_up_cancel", "/pages/route/index?pageType=", "hbapp_order_verfication", "canelPickUpOrderRemaind", "haobanNotice"),
 
 
-//
+    //
     MATERIAL_NEW_NOTIFY(6001, "素材上新通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_new_notify", "/pages/route/index?pageType=", "hbapp_material_center", "materialsNotice", "clerkMaterialsNotice"),
     MATERIAL_REPORT_NOTIFY_WEEK(6002, "素材周报通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_week_notify", "/pages/route/index?pageType=", "hbapp_mate_report", "materialWeek", "clerkMaterialsReport"),
     POTENTIAL_CUSTOMER_NOTIFY(6003, "销售线索通知", NoticeMessageCategoryTypeEnum.POTENTIAL_CUSTOMER.getType(), "potential_customer_notify", "/pages/route/index?pageType=", "hbapp_sales_clue_center", "salesLeadNotice", "haobanNotice"),

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -397,6 +397,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
+            logger.info("放入mq={}",JSON.toJSONString(listRet));
             clientInstance.sendBatchMessages("departmentSyncDealMq", listRet, 10);
         } catch (Exception e) {
             logger.info("发送失败:{},{}", taskId, JSONObject.toJSONString(listRet));

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -1102,6 +1102,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("查询TabHaobanWxEnterprise为空：{}", corpId);
             return;
         }
+        this.deleteToEvent(wxEnterprise.getWxEnterpriseId(),dto.getExternalUserid()) ;
         String wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
         dto.setWxEnterpriseId(wxEnterpriseId);
         TabHaobanStaff staff = this.staffMapper.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
@@ -1114,6 +1115,28 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
     }
 
+
+    private void deleteToEvent(String wxEnterpriseId, String externalUserId) {
+        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+        try {
+            JSONObject msgBody = new JSONObject();
+            msgBody.put("wxEnterpriseId", wxEnterpriseId);
+            msgBody.put("externalUserId", externalUserId);
+            String event = "deleteQwExternalUserEvent";
+            String topic = "member";
+            SubscribeMessageDTO subscribeMessageDTO = new SubscribeMessageDTO();
+            subscribeMessageDTO.setEvent(event);
+            subscribeMessageDTO.setTopic(topic);
+            subscribeMessageDTO.setMsgBody(msgBody.toJSONString());
+            String msg =  JSONObject.toJSONString(subscribeMessageDTO) ;
+            log.info("删除外部联系人事件={}",msg);
+            clientInstance.sendMessage("dealQywxExternalUserEvent",msg);
+        } catch (Exception e) {
+            log.info("删除外部联系：{}", e.getMessage(), e);
+        }
+    }
+
+
     private void editMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto, String wxUserId) {
         log.info("修改标签/会员信息回调：{}", JSONObject.toJSONString(dto));
         TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(dto.getCorpid());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -12,6 +12,8 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
+import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -81,6 +83,8 @@ import com.google.common.collect.Sets;
 
 import cn.hutool.core.convert.Convert;
 
+import javax.persistence.criteria.Order;
+
 /**
  * 接收企业微信或者gic推送消息进行处理
  * Created by tgs on 2020/2/20.
@@ -128,6 +132,9 @@ public class MessageApiServiceImpl implements MessageApiService {
     private GroupChatService groupChatService;
     @Autowired
     private MemberQueryService memberQueryService ;
+    @Autowired
+    private WebOrderManageApiService webOrderManageApiService ;
+
 
     @Override
     public void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO) {
@@ -651,6 +658,22 @@ public class MessageApiServiceImpl implements MessageApiService {
         } else {
             extendContent.put("currentTab", 1);
         }
+        // 如果是自提
+        if (messageTypeEnum.equals(NoticeMessageTypeEnum.ORDER_TAKE)) {
+            com.gic.api.base.commons.ServiceResponse<OrderInfoDTO> orderResp = this.webOrderManageApiService.getBaseOrderInfo(enterpriseId,relationId) ;
+            OrderInfoDTO order = orderResp.getResult() ;
+            if(null != order) {
+                if(order.getBusinessType()==1) {
+                    extendContent.put("currentTab", 1);
+                }else if(order.getBusinessType()==2) {
+                    extendContent.put("currentTab", 0);
+                }else if(order.getBusinessType()==3) {
+                    extendContent.put("currentTab", 2);
+                }
+            }else {
+                log.info("订单未查到={}",relationId);
+            }
+        }
         Map<String, String> map = this.toMapValue(enterpriseId,memberId, valueList);
         NoticeMessageQDTO qdto = this.getDTO(enterpriseId, clerkId, relationId, noticeType, map, extendContent);
         list.add(qdto);

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -225,6 +225,8 @@
     <dubbo:reference interface="com.gic.orderecommerce.api.service.EcommerceOrderOutputApiService" id="ecommerceOrderOutputApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.order.api.service.sharding.OrderApiService" id="orderApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.member.api.service.MemberOutApiService" id="memberOutApiService" timeout="10000" retries="0" check="false"/>
+    <dubbo:reference interface="com.gic.business.order.service.ordermanage.WebOrderManageApiService" id="webOrderManageApiService" timeout="10000" retries="0" check="false"/>
+
     <dubbo:reference interface="com.gic.operating.api.service.HaobanWxEnterpriseApiService" id="haobanWxEnterpriseApiService" timeout="10000" retries="0" check="false"/>
 
     <dubbo:service interface="com.gic.haoban.manage.api.service.content.task.CommissionTaskApiService"

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

@@ -3,10 +3,8 @@ package com.gic.haoban.manage.web.controller.order;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
@@ -34,6 +31,7 @@ import com.gic.business.order.dto.setting.MallOrderSettingDTO;
 import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.enums.OrderEnum.DeliveryOptTypeEnum;
 import com.gic.business.order.enums.OrderEnum.SearchOrderTypeEnum;
+import com.gic.business.order.qdto.OperationUserQDTO;
 import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
@@ -53,13 +51,8 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.evaluate.manage.api.dto.EvaluateRuleScoreDTO;
 import com.gic.evaluate.manage.api.dto.StoreEvaluateInfoDTO;
 import com.gic.evaluate.manage.api.service.EvaluateDataApiService;
-import com.gic.haoban.app.aggregation.api.dto.evaluation.CreateRecordRequest;
-import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderProductRequest;
-import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderVerificationRecordDTO;
 import com.gic.haoban.app.aggregation.api.service.evaluation.OrderVerificationRecordApiService;
-import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.qo.order.integral.ClerkQo;
 import com.gic.haoban.manage.web.vo.order.EvaluateVO;
 import com.gic.haoban.manage.web.vo.order.MemberInfoVO;
 import com.gic.haoban.manage.web.vo.order.OrderCountVO;
@@ -67,17 +60,9 @@ import com.gic.haoban.manage.web.vo.order.OrderDetailItemVO;
 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;
-import com.gic.haoban.manage.web.vo.order.integral.CheckVO;
 import com.gic.haoban.manage.web.vo.order.integral.HxOrderCountVO;
-import com.gic.haoban.manage.web.vo.order.integral.ProductSku;
-import com.gic.haoban.manage.web.vo.order.integral.ProductVO;
-import com.gic.haoban.manage.web.vo.order.integral.ScanVO;
-import com.gic.integralmall.api.dto.IntegralMallExchangeLogDTO;
-import com.gic.integralmall.api.enums.IntegralMallExchangeLogStatusEnums;
 import com.gic.integralmall.api.service.IntegralmallService;
-import com.gic.integralmall.api.service.result.DubboResult;
 import com.gic.store.goods.dto.stock.GoodsStockBaseQDTO;
-import com.gic.store.goods.enums.ProductStockChannelType;
 import com.gic.store.goods.service.ProductStockApiService;
 
 @RestController
@@ -247,41 +232,32 @@ public class GicOrderController {
         if (StringUtils.isEmpty(writeOffCode)) {
             return RestResponse.failure("9999", "核销码为空");
         }
-        // 微商城
-        if (writeOffCode.startsWith("M")) {
-            // 通过核销码查询
-            QueryOrderDetailQDTO qdto = new QueryOrderDetailQDTO();
-            qdto.setEnterpriseId(enterpriseId);
-            qdto.setWriteOffCode(writeOffCode);
-            ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(qdto);
-            OrderDetailDTO detail = ret.getResult();
-            logger.info("订单信息={}", JSON.toJSONString(ret, true));
-            if (ret.isSuccess()) {
-                // 已核销,且不是好办核销的
-                if (null != detail.getOrderInfo().getDeliveryOptType()
-                        && detail.getOrderInfo().getDeliveryOptType() != 1) {
-                    logger.info("已核销,且不是好办核销的={}", writeOffCode);
-                    return RestResponse.failure("9999", "此自提点无法核销");
-                }
-                if (!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
-                    return RestResponse.failure("9999", "此自提点无法核销");
-                }
-                OrderDetailVO orderDetailVO = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
-                        ret.getResult().getOrderItemList(), storeId);
-                return RestResponse.successResult(orderDetailVO);
-            } else {
-                return RestResponse.failure("9999", ret.getMessage());
+        // 通过核销码查询
+        QueryOrderDetailQDTO qdto = new QueryOrderDetailQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setWriteOffCode(writeOffCode);
+        ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(qdto);
+        OrderDetailDTO detail = ret.getResult();
+        logger.info("订单信息={}", JSON.toJSONString(ret, true));
+        if (ret.isSuccess()) {
+            // 已核销,且不是好办核销的
+            if (null != detail.getOrderInfo().getDeliveryOptType()
+                    && detail.getOrderInfo().getDeliveryOptType() != 1) {
+                logger.info("已核销,且不是好办核销的={}", writeOffCode);
+                return RestResponse.failure("9999", "此自提点无法核销");
             }
-        } else {
-            // 积分商城
-            DubboResult<IntegralMallExchangeLogDTO> integralResult = integralmallService
-                    .getIntegralMallExchangeLogByWriteOffCode(enterpriseId, writeOffCode);
-            if (null != integralResult && null != integralResult.getData()) {
-                ScanVO vo = integralMallScan(integralResult.getData());
-                return RestResponse.successResult(vo);
+            if (!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
+                return RestResponse.failure("9999", "此自提点无法核销");
+            }
+            OrderDetailVO orderDetailVO = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
+                    ret.getResult().getOrderItemList(), storeId);
+            if(!(orderDetailVO.getOrderStep().equals("2") || orderDetailVO.getOrderStep().equals("4"))) {
+                return RestResponse.failure("9999", "核销订单不存在");
             }
+            return RestResponse.successResult(orderDetailVO);
+        } else {
+            return RestResponse.failure("9999", ret.getMessage());
         }
-        return RestResponse.failure("9999", "订单查询不到");
     }
 
     // 单笔订单发货商品列表
@@ -308,6 +284,8 @@ public class GicOrderController {
                         JSON.toJSONString(stockResp));
                 if (stockResp.isSuccess() && null != stockResp.getResult()) {
                     vo.setStoreStock(stockResp.getResult());
+                }else {
+                    vo.setErrorMsg(stockResp.getMessage());
                 }
                 voList.add(vo);
             }
@@ -318,7 +296,7 @@ public class GicOrderController {
     // 订单-发货
     @RequestMapping("order-logistics-deliver")
     public RestResponse<Object> orderDeliver(String enterpriseId, String orderId, String storeId, String orderItemIds,
-            String companyCode, String logisticsNo, String companyId, String companyName) {
+            String companyCode, String logisticsNo, String companyId, String companyName , String clerkId) {
         OrderShipmentQDTO qdto = new OrderShipmentQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setLogisticsCompanyCode(companyCode);
@@ -339,6 +317,7 @@ public class GicOrderController {
             list.add(item);
         });
         qdto.setOrderItemShipment(list);
+        qdto.setOperationUserQDTO(this.getOper(clerkId));
         ServiceResponse<Boolean> resp = webOrderManageApiService.orderShipment(qdto);
         if (!resp.isSuccess()) {
             /*
@@ -401,7 +380,7 @@ public class GicOrderController {
     // type : 1: 下单 2：换货
     @RequestMapping("modify-order-logistics")
     public RestResponse<Object> modifyOrderDeliver(String memberId, String enterpriseId, String orderId, String storeId,
-            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,
+            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,String clerkId ,
             @RequestParam(defaultValue = "1") int type) {
         logger.info("修改物流={},{}", orderId, type);
         UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO();
@@ -413,10 +392,20 @@ public class GicOrderController {
         qdto.setOrderId(orderId);
         qdto.setLogisticsId(logisticsId);
         qdto.setType(type);
-        this.webOrderManageApiService.updateOrderLogistics(qdto);
+        this.webOrderManageApiService.updateOrderLogistics(qdto,this.getOper(clerkId));
         return RestResponse.successResult();
     }
-
+    
+    private OperationUserQDTO getOper(String clerkId) {
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        OperationUserQDTO dto = new OperationUserQDTO() ;
+        dto.setOperatorId(clerk.getClerkId()) ;
+        dto.setOperatorType(clerk.getClerkType());
+        dto.setOperatorName(clerk.getClerkName());
+        dto.setOperatorCode(clerk.getClerkCode());
+        return dto ;
+    }
+    
     /**
      * 核销订单
      */
@@ -430,95 +419,31 @@ public class GicOrderController {
             return RestResponse.failure("9999", "核销人不存在");
         }
         // 微商城核销
-        if (writeOffCode.startsWith("M")) {
-            if (StringUtils.isEmpty(orderId)) {
-                return RestResponse.failure("9999", "订单ID为空");
-            }
-            SelfPickOffQDTO qdto = new SelfPickOffQDTO();
-            qdto.setEnterpriseId(enterpriseId);
-            qdto.setWriteOffClerkId(clerkId);
-            qdto.setWriteOffCode(writeOffCode);
-            qdto.setSource(1);
-            qdto.setWriteOffClerkCode(clerkDTO.getClerkCode());
-            qdto.setOrderId(orderId);
-            ServiceResponse<Boolean> response = webOrderManageApiService.selfPickOff(qdto);
-            if (!response.isSuccess()) {
-                return RestResponse.failure(response.getCode(), response.getMessage());
-            }
-            return RestResponse.successResult(response.getResult());
-        } else {
-            ClerkQo clerkQo = new ClerkQo();
-            clerkQo.setClerkCode(clerkDTO.getClerkCode());
-            clerkQo.setClerkId(clerkDTO.getClerkId());
-            clerkQo.setStoreId(clerkDTO.getStoreId());
-            clerkQo.setClerkName(clerkDTO.getClerkName());
-            clerkQo.setEnterpriseId(enterpriseId);
-            logger.info("积分商城订单核销开始，核销码：{} ,核销人：{} ", writeOffCode, clerkQo.getClerkId());
-            enterpriseId = clerkDTO.getEnterpriseId();
-            DubboResult<Boolean> check = integralmallService.haobanVerificationExchangeLog(enterpriseId, writeOffCode,
-                    clerkQo.getClerkCode(), clerkQo.getClerkName(), clerkQo.getStoreId());
-            logger.info("核销结果：{} ", JSON.toJSONString(check));
-            CheckVO checkVO = new CheckVO();
-            if (check.getSuccess()) {
-                // 积分商城核销成功-添加核销记录
-                String recordId = createIntegralRecord(enterpriseId, 1, clerkQo, writeOffCode);
-                checkVO.setId(recordId);
-                checkVO.setSuccess(Boolean.TRUE);
-                checkVO.setCode(HaoBanErrCode.ERR_1.getCode());
-                return RestResponse.successResult(checkVO);
-            }
-            /*
-             * 核销失败情况 10001 兑换记录不存在 10002 当前订单状态无法核销 10003 该订单已经核销 10004 订单已经取消
-             * 10005 10006 超期核销
-             */
-            checkVO.setCode(check.getErrorCode());
-            checkVO.setMessage(check.getErrMessage());
-            checkVO.setSuccess(Boolean.FALSE);
-            if (check.getErrorCode() == HaoBanErrCode.ERR_100010.getCode()) {
-                // 订单已核销
-                OrderVerificationRecordDTO record = orderVerificationRecordApiService
-                        .getRecordByClerkIdAndWriteOffCode(clerkQo.getClerkId(), writeOffCode);
-                if (Objects.nonNull(record)) {
-                    checkVO.setSuccess(Boolean.TRUE);
-                    checkVO.setId(record.getRecordId());
-                    return RestResponse.successResult(checkVO);
-                }
-                // 超期核销
-                checkVO.setCode(HaoBanErrCode.ERR_100014.getCode());
-                checkVO.setMessage(HaoBanErrCode.ERR_100014.getMsg());
-            }
-            if (!checkVO.getSuccess()) {
-                HaobanResponse response = new HaobanResponse();
-                response.setMessage(checkVO.getMessage());
-                response.setErrorCode(checkVO.getCode());
-                response.setResult(checkVO.getId());
-                response.setDetailError("");
-                return RestResponse.failure("9999", checkVO.getMessage());
-            }
-            return RestResponse.successResult(checkVO) ;
+        if (StringUtils.isEmpty(orderId)) {
+            return RestResponse.failure("9999", "订单ID为空");
         }
+        SelfPickOffQDTO qdto = new SelfPickOffQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setWriteOffClerkId(clerkId);
+        qdto.setWriteOffCode(writeOffCode);
+        qdto.setSource(1);
+        qdto.setWriteOffClerkCode(clerkDTO.getClerkCode());
+        qdto.setOrderId(orderId);
+        ServiceResponse<Boolean> response = webOrderManageApiService.selfPickOff(qdto);
+        if (!response.isSuccess()) {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
+        return RestResponse.successResult(response.getResult());
     }
 
     // 核销数量
     @RequestMapping("/verification-count")
     public RestResponse<Object> verificationCountNew(String enterpriseId, String storeId, String clerkId) {
-        Page<IntegralMallExchangeLogDTO> page = new Page<IntegralMallExchangeLogDTO>();
-        page.setPageSize(1);
-        page.setCurrentPage(1);
-        Map<String, Object> params = new HashMap<>();
-        params.put("enterpriseId", enterpriseId);
-        params.put("proType", 2);
-        params.put("changeType", 4);
-        // 订单状态
-        params.put("orderStatus", 1);
-        params.put("goodsPointStoreId", storeId);
-        page.setParams(params);
-        page = integralmallService.listOnlineByPage(page);
-        int integralUndoneCount = page.getTotalCount();
-        int integralDoneCount = this.orderVerificationRecordApiService.countByGicClerkId(clerkId);
+        int integralDoneCount =  0 ; // this.count(enterpriseId, storeId, clerkId, 4 , 2);
+        int integralUndoneCount = 0 ; // this.count(enterpriseId, storeId, clerkId, 2,2);
         // 查询微商城
-        int mallDoneCount = this.count(enterpriseId, storeId, clerkId, 4);
-        int mallUndoneCount = this.count(enterpriseId, storeId, clerkId, 2);
+        int mallDoneCount = this.count(enterpriseId, storeId, clerkId, 4 , 1);
+        int mallUndoneCount = this.count(enterpriseId, storeId, clerkId, 2,1);
         HxOrderCountVO vo = new HxOrderCountVO();
         vo.setIntegralDoneCount(integralDoneCount);
         vo.setIntegralUndoneCount(integralUndoneCount);
@@ -529,7 +454,7 @@ public class GicOrderController {
         return RestResponse.successResult(vo);
     }
 
-    private int count(String enterpriseId, String storeId, String clerkId, int step) {
+    private int count(String enterpriseId, String storeId, String clerkId, int step , int businessType) {
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
@@ -543,6 +468,7 @@ public class GicOrderController {
         qdto.setOrderStep("" + step);
         qdto.setPageNum(1);
         qdto.setPageSize(1);
+        // qdto.setBusinessType(businessType);
         ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);
         logger.info("核销订单数={}");
         return ret.getResult().getTotalCount();
@@ -552,6 +478,7 @@ public class GicOrderController {
     private OrderDetailVO getOrderDetail(String enterpriseId, OrderInfoDTO orderInfo,
             List<ListOrderItemDTO> orderItemDTOList, String storeId) {
         OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class, orderInfo);
+        orderDetailVO.setUsePoint(orderInfo.getUsePoints());
         orderDetailVO.setBuyerRemark(orderInfo.getRemarks());
         List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,
                 orderItemDTOList);
@@ -571,6 +498,14 @@ public class GicOrderController {
         member.setAddressName(orderInfo.getBuyerName());
         member.setAddressDetail(orderInfo.getFullName() + orderInfo.getAddressInfo());
         orderDetailVO.setAddressInfo(orderInfo.getFullName() + orderInfo.getAddressInfo());
+        if(orderInfo.getBusinessType()==1) {
+            member.setBelongClerkId(orderInfo.getBelongClerkId());
+            member.setBelongClerkCode(orderInfo.getBelongClerkCode());
+            member.setBelongClerkName(orderInfo.getBelongClerkName());
+            member.setBelongStoreId(orderInfo.getBelongStoreId());
+            member.setBelongStoreCode(orderInfo.getBelongStoreCode());
+            member.setBelongStoreName(orderInfo.getBelongStoreName());
+        }
         orderDetailVO.setMember(member);
         // 判断能否发货
         // 导购发货，一笔订单仅允许单门店发货
@@ -609,6 +544,7 @@ public class GicOrderController {
                     List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
                     vo.setOrderItemList(voItemList);
                     vo.setPickUpTime(order.getWriteOffTime());
+                    vo.setUsePoint(order.getUsePoints());
                     // 核销导购
                     String verificationClerkName = order.getWriteOffClerkName();
                     vo.setVerificationClerkName(verificationClerkName);
@@ -657,109 +593,4 @@ public class GicOrderController {
         }
         return RestResponse.failure(ret.getCode(), ret.getMessage());
     }
-
-    private String createIntegralRecord(String enterpriseId, int status, ClerkQo clerkDTO, String writeOffCode) {
-        DubboResult<IntegralMallExchangeLogDTO> integralResult = integralmallService
-                .getIntegralMallExchangeLogByWriteOffCode(enterpriseId, writeOffCode);
-        IntegralMallExchangeLogDTO data = integralResult.getData();
-        CreateRecordRequest record = new CreateRecordRequest();
-        record.setRecordId(data.getIntegralMallProExchangeId());
-        record.setStatus(status);
-        record.setEnterpriseId(data.getEnterpriseId());
-        record.setExchangeId(data.getIntegralMallProExchangeId());
-        record.setFinishTime(data.getFinishTime());
-        record.setWriteOffCode(data.getWriteOffCode());
-        // 提货人
-        record.setConsignee(data.getGoodsPerson());
-        record.setConsigneePhone(data.getGoodsPhone());
-        record.setPoint(data.getGoodsPoint());
-        record.setAddress(data.getGoodsAddress());
-        record.setTakeTime(data.getGoodsTime());
-        record.setFetchCode(writeOffCode);
-        // 核销人
-        record.setClerkId(clerkDTO.getClerkId());
-        record.setClerkCode(clerkDTO.getClerkCode());
-        record.setClerkName(clerkDTO.getClerkName());
-        record.setHaobanClerkId(clerkDTO.getHaobanClerkId());
-        record.setHaobanEnterpriseId(clerkDTO.getHaobanEnterpriseId());
-        // 商品信息
-
-        OrderProductRequest productDTO = new OrderProductRequest();
-        productDTO.setProName(data.getProName());
-        productDTO.setProImage(data.getPhotoUrl());
-        productDTO.setProCode(data.getProCode());
-        productDTO.setProNumber(data.getGoodsNum());
-
-        productDTO.setProSku(
-                StringUtils.isBlank(data.getSku()) ? "[]" : JSONArray.parseArray(data.getSku()).toJSONString());
-        productDTO.setProPrice((data.getCashShouldPay() / data.getGoodsNum()));
-        productDTO.setProIntegral((data.getIntegralShouldPay() / data.getGoodsNum()));
-
-        List<OrderProductRequest> productDTOS = new ArrayList<>(2);
-        productDTOS.add(productDTO);
-        record.setProducts(productDTOS);
-        record.setCreateTime(data.getCreateTime());
-        record.setUpdateTime(new Date());
-        // 订单信息
-        record.setAllCostIntegral(data.getAllCostIntegral());
-        record.setPayCost(data.getPayCost());
-        record.setOrderNo(data.getDefinedCode());
-        record.setPayNumber(data.getPayNumber());
-        record.setPayTime(data.getPayTime());
-        record.setOrigin(2);
-        return orderVerificationRecordApiService.createRecord(record);
-    }
-
-    private ScanVO integralMallScan(IntegralMallExchangeLogDTO exchangeLogDTO) {
-        ScanVO scanVO = new ScanVO();
-        scanVO.setHasOrder(1);
-        scanVO.setOrderNo(exchangeLogDTO.getDefinedCode());
-        scanVO.setEnterpriseId(exchangeLogDTO.getEnterpriseId());
-        scanVO.setExchangeId(exchangeLogDTO.getIntegralMallProExchangeId());
-        scanVO.setAllCostIntegral(exchangeLogDTO.getAllCostIntegral());
-        scanVO.setPayCost(exchangeLogDTO.getPayCost());
-        scanVO.setPayNumber(exchangeLogDTO.getPayNumber());
-        scanVO.setPayTime(exchangeLogDTO.getPayTime());
-
-        ProductVO productVO = new ProductVO();
-        productVO.setProName(exchangeLogDTO.getProName());
-        productVO.setProCode(exchangeLogDTO.getProCode());
-        productVO.setProSku(StringUtils.isBlank(exchangeLogDTO.getSku()) ? new ArrayList<>()
-                : JSONArray.parseArray(exchangeLogDTO.getSku(), ProductSku.class));
-        productVO.setProNumber(exchangeLogDTO.getGoodsNum());
-        productVO.setProImage(exchangeLogDTO.getPhotoUrl());
-        productVO.setProPrice((exchangeLogDTO.getCashShouldPay() / exchangeLogDTO.getGoodsNum()));
-        productVO.setProIntegral((exchangeLogDTO.getIntegralShouldPay() / exchangeLogDTO.getGoodsNum()));
-
-        scanVO.pushProduct(productVO);
-
-        scanVO.setWriteOffCode(exchangeLogDTO.getWriteOffCode());
-        scanVO.setFetchCode(exchangeLogDTO.getWriteOffCode());
-
-        scanVO.setConsignee(exchangeLogDTO.getGoodsPerson());
-        scanVO.setConsigneePhone(exchangeLogDTO.getGoodsPhone());
-        scanVO.setPoint(exchangeLogDTO.getGoodsPoint());
-        scanVO.setAddress(exchangeLogDTO.getGoodsAddress());
-        scanVO.setTakeTime(exchangeLogDTO.getGoodsTime());
-        scanVO.setCreateTime(exchangeLogDTO.getCreateTime());
-        // 兑换状态 -2兑换取消(退货) -1兑换无效 0兑换取消(礼品未付款) 11兑换中(加钱购待支付) 3已发货(礼品) 1兑换功成
-        // 2领取(卡券) 4成功
-        // 其实只需要 1 2 4
-        scanVO.setStatus(exchangeLogDTO.getStatus() == 4 ? 1 : 0);
-        scanVO.setChecked(0);
-        if (scanVO.getStatus() == 1) {
-            scanVO.setRecordId(exchangeLogDTO.getIntegralMallProExchangeId());
-            OrderVerificationRecordDTO info = orderVerificationRecordApiService.recordInfo(scanVO.getRecordId());
-            if (null != info) {
-                // 说明已经核销了
-                scanVO.setFinishTime(info.getFinishTime());
-                scanVO.setChecked(1);
-            }
-            if (exchangeLogDTO.getStatus() == IntegralMallExchangeLogStatusEnums.CONFIRM.getStatus()) {
-                scanVO.setFinishTime(exchangeLogDTO.getFinishTime());
-                scanVO.setChecked(1);
-            }
-        }
-        return scanVO;
-    }
 }

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.Arrays;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSON;
-import com.gic.api.base.commons.Page;
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.business.order.api.service.order.AfterSalesManageApiService;
-import com.gic.business.order.dto.member.MemberStoreInfoDTO;
-import com.gic.business.order.dto.ordermanage.OrderExchangeConsultDTO;
-import com.gic.business.order.dto.ordermanage.OrderExchangeDetailDTO;
-import com.gic.business.order.dto.ordermanage.OrderRefundConsultDTO;
-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.aftersales.ExchangeAddressQDTO;
-import com.gic.business.order.qdto.aftersales.ExchangeBaseQDTO;
-import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
-import com.gic.business.order.qdto.aftersales.ExchangeRefusedQDTO;
-import com.gic.business.order.qdto.aftersales.ExchangeSellerAgreeApplyQDTO;
-import com.gic.business.order.qdto.aftersales.RefundBaseQDTO;
-import com.gic.business.order.qdto.aftersales.RefundRefusedQDTO;
-import com.gic.business.order.qdto.aftersales.RefundSellerAgreeQDTO;
-import com.gic.business.order.qdto.aftersales.RefundSellerConfirmGoodsQDTO;
-import com.gic.business.order.qdto.ordermanage.RefundExchangeQDTO;
-import com.gic.business.order.service.activity.MemberReferClerkApiService;
-import com.gic.business.order.service.ordermanage.MallSellerAddressApiService;
-import com.gic.business.order.service.ordermanage.OrderRefundApiService;
-import com.gic.clerk.api.dto.ClerkDTO;
-import com.gic.clerk.api.service.ClerkService;
-import com.gic.commons.util.EntityUtil;
-import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-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;
-import com.gic.store.goods.dto.stock.GoodsStockBaseQDTO;
-import com.gic.store.goods.enums.ProductStockChannelType;
-import com.gic.store.goods.service.ProductStockApiService;
-
-@RestController
-@RequestMapping("/refund")
-public class GicOrderRefundController {
-
-    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(GicOrderRefundController.class);
-
-    @Autowired
-    private OrderRefundApiService orderRefundApiService;
-    @Autowired
-    private MallSellerAddressApiService mallSellerAddressApiService;
-    @Autowired
-    private AfterSalesManageApiService afterSalesManageApiService;
-    @Autowired
-    private ProductStockApiService productStockApiService;
-    @Autowired
-    private MemberReferClerkApiService memberReferClerkApiService;
-    @Autowired
-    private ClerkService clerkService;
-
-    /**
-     * 
-    * @Title: exchangeConsult
-    * @Description: 售后列表
-    * @author xugh
-    * @param orderExchangeId
-    * @return
-    * @throws
-     */
-    @RequestMapping(value = "order-exchange-refund-list")
-    @ResponseBody
-    public RestResponse<Object> exchangeRefundList(RefundExchangeQDTO qdto) {
-        String clerkId = qdto.getClerkId();
-        if (StringUtils.isEmpty(clerkId)) {
-            return RestResponse.failure("9999", "导购ID为空");
-        }
-        ClerkDTO clerk = this.clerkService.getClerkByClerkId(clerkId);
-        if (clerk.getClerkType() == 1) {
-            qdto.setClerkId(null);
-        }
-        qdto.setHbSearch(qdto.getSearch());
-        qdto.setSearch(null);
-        qdto.setHbFlag(1);
-        ServiceResponse<Page<OrderRefundExchangeListDTO>> resp = orderRefundApiService.refundExchangePage(qdto);
-        return RestResponse.successResult(resp.getResult());
-    }
-
-    // 退款-详情
-    @RequestMapping(value = "order-refund-detail")
-    @ResponseBody
-    public RestResponse<Object> refundDetail(String enterpriseId, String storeId, String orderRefundId) {
-        ServiceResponse<OrderRefundDetailDTO> resp = this.orderRefundApiService.refundDetail(orderRefundId);
-        OrderRefundDetailDTO dto = resp.getResult();
-        OrderRefundDetailVO vo = EntityUtil.changeEntityByJSON(OrderRefundDetailVO.class, dto);
-        this.fillMemberInfo(enterpriseId, vo.getMemberId(), vo, null);
-        // 判断好办端能否审批(确认收货) 只有收货门店能确认
-        // 退货地址类型 0归属门店 1发货门店 2平台地址
-        int sellerAddressType = dto.getSellerAddressType();
-        boolean canAduitFlag = false;
-        if (vo.getRefundStatus() == 1) {
-            canAduitFlag = true;
-        } else {
-            String refundStoreId = dto.getRefundStoreId();
-            logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType);
-            if (sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
-                canAduitFlag = true;
-            }
-        }
-        vo.setCanAduitFlag(canAduitFlag);
-        return RestResponse.successResult(vo);
-    }
-
-    // 换货-详情
-    @RequestMapping(value = "order-exchange-detail")
-    @ResponseBody
-    public RestResponse<Object> exchangeDetail(String enterpriseId, String storeId, String orderExchangeId) {
-        ServiceResponse<OrderExchangeDetailDTO> resp = this.orderRefundApiService.exchangeDetail(orderExchangeId);
-        OrderExchangeDetailDTO dto = resp.getResult();
-        OrderExchangeDetailVO vo = EntityUtil.changeEntityByJSON(OrderExchangeDetailVO.class, dto);
-        String targetProSkuId = resp.getResult().getTargetProSkuId();
-        // 查询库存
-        vo.setTargetProStock(1);
-        GoodsStockBaseQDTO qdto = new GoodsStockBaseQDTO();
-        qdto.setEnterpriseId(enterpriseId);
-        qdto.setGoodsId(vo.getMallProId());
-        qdto.setSkuId(targetProSkuId);
-        qdto.setStoreId(storeId);
-        qdto.setChannelType(ProductStockChannelType.MALL.getCode());
-        ServiceResponse<Integer> stockResp = this.productStockApiService.queryGoodsStock(qdto);
-        if (stockResp.isSuccess() && null != stockResp.getResult()) {
-            vo.setTargetProStock(stockResp.getResult());
-        }
-        this.fillMemberInfo(enterpriseId, vo.getMemberId(), null, vo);
-        // 判断好办端能否审批售后canAduitFlag
-        int sellerAddressType = dto.getSellerAddressType();
-        boolean canAduitFlag = false;
-        if (vo.getExchangeStatus() == 1) {
-            canAduitFlag = true;
-        } else {
-            String exchangeStoreId = dto.getExchangeStoreId();
-            logger.info("换货收货门店={},{}", storeId, exchangeStoreId, sellerAddressType);
-            if (sellerAddressType != 2 && StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
-                canAduitFlag = true;
-            }
-        }
-        vo.setCanAduitFlag(canAduitFlag);
-        return RestResponse.successResult(vo);
-    }
-
-    // 审批退款单
-    // auditStatus 拒绝 1 , 同意2
-    // 拒绝收货 1 同意收货2
-    // step 1 申请 2收货
-    @RequestMapping(value = "audit-refund-order")
-    @ResponseBody
-    public RestResponse<Object> auditRefund(String enterpriseId, String memberId,
-            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark,
-            @RequestParam(defaultValue = "1") int step, RefundBaseQDTO baseQDTO, ExchangeAddressQDTO address,
-            @RequestParam(defaultValue = "0") Double applyRefundPrice) {
-        ServiceResponse<Void> resp = null;
-        // 拒绝
-        if (auditStatus == 1) {
-            RefundRefusedQDTO qdto = EntityUtil.changeEntityByJSON(RefundRefusedQDTO.class, baseQDTO);
-            qdto.setReason(remark);
-            if (step == 1) {
-                resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
-            }
-            if (step == 2) {
-                resp = this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto);
-            }
-        }
-        // 同意
-        if (auditStatus == 2) {
-            if (step == 1) {
-                RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerAgreeQDTO.class, baseQDTO);
-                qdto.setApplyRefundPrice(applyRefundPrice);
-                qdto.setExchangeAddress(address);
-                resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto);
-            }
-            if (step == 2) {
-                RefundSellerConfirmGoodsQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerConfirmGoodsQDTO.class,
-                        baseQDTO);
-                qdto.setApplyRefundPrice(applyRefundPrice);
-                resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto);
-            }
-        }
-        if (!resp.isSuccess()) {
-            String code = resp.getCode();
-            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
-                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
-            }
-            return RestResponse.failure(resp.getCode(), resp.getMessage());
-        }
-        return RestResponse.successResult();
-    }
-
-    // 审批换货单
-    // 拒绝 1 , 同意2
-    // 拒绝收货 1 同意收货2
-    // step 1 申请 2收货
-    @RequestMapping(value = "audit-exchange-order")
-    @ResponseBody
-    public RestResponse<Object> auditExchange(String enterpriseId, String memberId,
-            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark, RefundBaseQDTO baseQDTO,
-            ExchangeAddressQDTO address, @RequestParam(defaultValue = "1") int step) {
-        ServiceResponse<Void> resp = null;
-        // 拒绝
-        if (auditStatus == 1) {
-            ExchangeRefusedQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeRefusedQDTO.class, baseQDTO);
-            qdto.setRemark(remark);
-            if (step == 1) {
-                resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
-            }
-            if (step == 2) {
-                resp = this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto);
-            }
-        }
-        // 同意
-        if (auditStatus == 2) {
-            ExchangeSellerAgreeApplyQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeSellerAgreeApplyQDTO.class,
-                    baseQDTO);
-            if (step == 1) {
-                qdto.setExchangeAddress(address);
-                resp = this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto);
-            }
-            if (step == 2) {
-                resp = this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto);
-            }
-        }
-        if (!resp.isSuccess()) {
-            String code = resp.getCode();
-            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
-                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
-            }
-            return RestResponse.failure(resp.getCode(), resp.getMessage());
-        }
-        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.changeEntityByJSON(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);
-    }
-
-    // 换货单发货
-    @RequestMapping(value = "exchange-order-deliver")
-    @ResponseBody
-    public RestResponse<Object> exchangeDeliver(String enterpriseId, String memberId, String companyCode,
-            String logisticsNo, String companyId, String companyName, String storeId, ExchangeBaseQDTO baseQDTO) {
-        ExchangeDeliveryBackQDTO qdto = new ExchangeDeliveryBackQDTO();
-        qdto.setCourierNumber(logisticsNo);
-        qdto.setOrderId(baseQDTO.getOrderId());
-        qdto.setOrderItemId(baseQDTO.getOrderItemId());
-        qdto.setOrderExchangeId(baseQDTO.getOrderExchangeId());
-        qdto.setLogisticsCompanyCode(companyCode);
-        qdto.setLogisticsCompanyId(companyId);
-        qdto.setLogisticsCompanyName(companyName);
-        qdto.setDeliveryStoreId(storeId);
-        ServiceResponse<Void> resp = this.afterSalesManageApiService.exchangeSellerDeliveryGoods(enterpriseId, memberId,
-                qdto);
-        logger.info("换货单发货={}", JSON.toJSONString(resp));
-        if (resp.isSuccess()) {
-            return RestResponse.successResult();
-        }
-        return RestResponse.failure("9999", resp.getMessage());
-    }
-
-    private void fillMemberInfo(String enterpriseId, String memberId, OrderRefundDetailVO refund,
-            OrderExchangeDetailVO exchange) {
-        ServiceResponse<MemberStoreInfoDTO> memberResp = this.memberReferClerkApiService.getMemberInfo(enterpriseId,
-                memberId);
-        MemberStoreInfoDTO memberInfo = memberResp.getResult();
-        if (null != memberInfo) {
-            if (null != refund) {
-                refund.setMemberId(memberId);
-                refund.setMemberName(memberInfo.getMemberName());
-                refund.setMemberImage(memberInfo.getMemberImage());
-                refund.setMemberCardNo(memberInfo.getMemberCardNo());
-                refund.setMainClerkName(memberInfo.getMainClerkName());
-                refund.setMainStoreName(memberInfo.getMainStoreName());
-                refund.setOpenClerkName(memberInfo.getOpenClerkName());
-                refund.setOpenStoreName(memberInfo.getOpenStoreName());
-            }
-            if (null != exchange) {
-                exchange.setMemberId(memberId);
-                exchange.setMemberName(memberInfo.getMemberName());
-                exchange.setMemberImage(memberInfo.getMemberImage());
-                exchange.setMemberCardNo(memberInfo.getMemberCardNo());
-                exchange.setMainClerkName(memberInfo.getMainClerkName());
-                exchange.setMainStoreName(memberInfo.getMainStoreName());
-                exchange.setOpenClerkName(memberInfo.getOpenClerkName());
-                exchange.setOpenStoreName(memberInfo.getOpenStoreName());
-            }
-        }
-    }
-
-}
+package com.gic.haoban.manage.web.controller.order;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.business.order.api.service.order.AfterSalesManageApiService;
+import com.gic.business.order.dto.member.MemberStoreInfoDTO;
+import com.gic.business.order.dto.ordermanage.OrderExchangeConsultDTO;
+import com.gic.business.order.dto.ordermanage.OrderExchangeDetailDTO;
+import com.gic.business.order.dto.ordermanage.OrderRefundConsultDTO;
+import com.gic.business.order.dto.ordermanage.OrderRefundDetailDTO;
+import com.gic.business.order.dto.ordermanage.OrderRefundExchangeListDTO;
+import com.gic.business.order.dto.ordermanage.RefundAddressDTO;
+import com.gic.business.order.qdto.OperationUserQDTO;
+import com.gic.business.order.qdto.aftersales.ExchangeAddressQDTO;
+import com.gic.business.order.qdto.aftersales.ExchangeBaseQDTO;
+import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
+import com.gic.business.order.qdto.aftersales.ExchangeRefusedQDTO;
+import com.gic.business.order.qdto.aftersales.ExchangeSellerAgreeApplyQDTO;
+import com.gic.business.order.qdto.aftersales.RefundBaseQDTO;
+import com.gic.business.order.qdto.aftersales.RefundRefusedQDTO;
+import com.gic.business.order.qdto.aftersales.RefundSellerAgreeQDTO;
+import com.gic.business.order.qdto.aftersales.RefundSellerConfirmGoodsQDTO;
+import com.gic.business.order.qdto.ordermanage.RefundExchangeQDTO;
+import com.gic.business.order.service.activity.MemberReferClerkApiService;
+import com.gic.business.order.service.ordermanage.MallSellerAddressApiService;
+import com.gic.business.order.service.ordermanage.OrderRefundApiService;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.order.refund.ConsultOperVO;
+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;
+import com.gic.store.goods.dto.stock.GoodsStockBaseQDTO;
+import com.gic.store.goods.enums.ProductStockChannelType;
+import com.gic.store.goods.service.ProductStockApiService;
+
+@RestController
+@RequestMapping("/refund")
+public class GicOrderRefundController {
+
+    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(GicOrderRefundController.class);
+
+    @Autowired
+    private OrderRefundApiService orderRefundApiService;
+    @Autowired
+    private MallSellerAddressApiService mallSellerAddressApiService;
+    @Autowired
+    private AfterSalesManageApiService afterSalesManageApiService;
+    @Autowired
+    private ProductStockApiService productStockApiService;
+    @Autowired
+    private MemberReferClerkApiService memberReferClerkApiService;
+    @Autowired
+    private ClerkService clerkService;
+
+    /**
+     * 
+    * @Title: exchangeConsult
+    * @Description: 售后列表
+    * @author xugh
+    * @param orderExchangeId
+    * @return
+    * @throws
+     */
+    @RequestMapping(value = "order-exchange-refund-list")
+    @ResponseBody
+    public RestResponse<Object> exchangeRefundList(RefundExchangeQDTO qdto) {
+        String clerkId = qdto.getClerkId();
+        if (StringUtils.isEmpty(clerkId)) {
+            return RestResponse.failure("9999", "导购ID为空");
+        }
+        ClerkDTO clerk = this.clerkService.getClerkByClerkId(clerkId);
+        if (clerk.getClerkType() == 1) {
+            qdto.setClerkId(null);
+        }
+        qdto.setHbSearch(qdto.getSearch());
+        qdto.setSearch(null);
+        qdto.setHbFlag(1);
+        ServiceResponse<Page<OrderRefundExchangeListDTO>> resp = orderRefundApiService.refundExchangePage(qdto);
+        return RestResponse.successResult(resp.getResult());
+    }
+
+    // 退款-详情
+    @RequestMapping(value = "order-refund-detail")
+    @ResponseBody
+    public RestResponse<Object> refundDetail(String enterpriseId, String storeId, String orderRefundId) {
+        ServiceResponse<OrderRefundDetailDTO> resp = this.orderRefundApiService.refundDetail(orderRefundId);
+        OrderRefundDetailDTO dto = resp.getResult();
+        OrderRefundDetailVO vo = EntityUtil.changeEntityByJSON(OrderRefundDetailVO.class, dto);
+        this.fillMemberInfo(enterpriseId, vo.getMemberId(), vo, null);
+        // 判断好办端能否审批(确认收货) 只有收货门店能确认
+        boolean canAduitFlag = false;
+        if (vo.getRefundStatus() == 1) {
+            canAduitFlag = true;
+        } else {
+            // 退货地址类型 0归属门店 1发货门店 2平台地址
+            Integer sellerAddressType = dto.getSellerAddressType();
+            String refundStoreId = dto.getRefundStoreId();
+            logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType);
+            if (null != sellerAddressType && sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
+                canAduitFlag = true;
+            }
+        }
+        vo.setCanAduitFlag(canAduitFlag);
+        vo.setUsePoint(dto.getUsePoints());
+        return RestResponse.successResult(vo);
+    }
+
+    // 换货-详情
+    @RequestMapping(value = "order-exchange-detail")
+    @ResponseBody
+    public RestResponse<Object> exchangeDetail(String enterpriseId, String storeId, String orderExchangeId) {
+        ServiceResponse<OrderExchangeDetailDTO> resp = this.orderRefundApiService.exchangeDetail(orderExchangeId);
+        OrderExchangeDetailDTO dto = resp.getResult();
+        OrderExchangeDetailVO vo = EntityUtil.changeEntityByJSON(OrderExchangeDetailVO.class, dto);
+        String targetProSkuId = resp.getResult().getTargetProSkuId();
+        // 查询库存
+        vo.setTargetProStock(1);
+        GoodsStockBaseQDTO qdto = new GoodsStockBaseQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setGoodsId(vo.getMallProId());
+        qdto.setSkuId(targetProSkuId);
+        qdto.setStoreId(storeId);
+        qdto.setChannelType(ProductStockChannelType.MALL.getCode());
+        ServiceResponse<Integer> stockResp = this.productStockApiService.queryGoodsStock(qdto);
+        if (stockResp.isSuccess() && null != stockResp.getResult()) {
+            vo.setTargetProStock(stockResp.getResult());
+        }
+        this.fillMemberInfo(enterpriseId, vo.getMemberId(), null, vo);
+        // 判断好办端能否审批售后canAduitFlag
+        int sellerAddressType = dto.getSellerAddressType();
+        boolean canAduitFlag = false;
+        if (vo.getExchangeStatus() == 1) {
+            canAduitFlag = true;
+        } else {
+            String exchangeStoreId = dto.getExchangeStoreId();
+            logger.info("换货收货门店={},{}", storeId, exchangeStoreId, sellerAddressType);
+            if (sellerAddressType != 2 && StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
+                canAduitFlag = true;
+            }
+        }
+        vo.setCanAduitFlag(canAduitFlag);
+        return RestResponse.successResult(vo);
+    }
+
+    // 审批退款单
+    // auditStatus 拒绝 1 , 同意2
+    // 拒绝收货 1 同意收货2
+    // step 1 申请 2收货
+    @RequestMapping(value = "audit-refund-order")
+    @ResponseBody
+    public RestResponse<Object> auditRefund(String enterpriseId, String memberId,
+            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark,
+            @RequestParam(defaultValue = "1") int step, RefundBaseQDTO baseQDTO, ExchangeAddressQDTO address,
+            @RequestParam(defaultValue = "0") Double applyRefundPrice) {
+        ServiceResponse<Void> resp = null;
+        // 拒绝
+        if (auditStatus == 1) {
+            RefundRefusedQDTO qdto = EntityUtil.changeEntityByJSON(RefundRefusedQDTO.class, baseQDTO);
+            qdto.setReason(remark);
+            if (step == 1) {
+                resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+            if (step == 2) {
+                resp = this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+        }
+        // 同意
+        if (auditStatus == 2) {
+            if (step == 1) {
+                RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerAgreeQDTO.class, baseQDTO);
+                qdto.setApplyRefundPrice(applyRefundPrice);
+                qdto.setExchangeAddress(address);
+                resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+            if (step == 2) {
+                RefundSellerConfirmGoodsQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerConfirmGoodsQDTO.class,
+                        baseQDTO);
+                qdto.setApplyRefundPrice(applyRefundPrice);
+                resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+        }
+        if (!resp.isSuccess()) {
+            String code = resp.getCode();
+            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
+                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
+            }
+            return RestResponse.failure(resp.getCode(), resp.getMessage());
+        }
+        return RestResponse.successResult();
+    }
+
+    // 审批换货单
+    // 拒绝 1 , 同意2
+    // 拒绝收货 1 同意收货2
+    // step 1 申请 2收货
+    @RequestMapping(value = "audit-exchange-order")
+    @ResponseBody
+    public RestResponse<Object> auditExchange(String enterpriseId, String memberId,
+            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark, RefundBaseQDTO baseQDTO,
+            ExchangeAddressQDTO address, @RequestParam(defaultValue = "1") int step) {
+        ServiceResponse<Void> resp = null;
+        // 拒绝
+        if (auditStatus == 1) {
+            ExchangeRefusedQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeRefusedQDTO.class, baseQDTO);
+            qdto.setRemark(remark);
+            if (step == 1) {
+                resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+            if (step == 2) {
+                resp = this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+        }
+        // 同意
+        if (auditStatus == 2) {
+            ExchangeSellerAgreeApplyQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeSellerAgreeApplyQDTO.class,
+                    baseQDTO);
+            if (step == 1) {
+                qdto.setExchangeAddress(address);
+                resp = this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+            if (step == 2) {
+                resp = this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
+            }
+        }
+        if (!resp.isSuccess()) {
+            String code = resp.getCode();
+            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
+                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
+            }
+            return RestResponse.failure(resp.getCode(), resp.getMessage());
+        }
+        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 = new ArrayList<>() ;
+        for(OrderRefundConsultDTO dto : resp.getResult()) {
+            String operInfo = dto.getOperInfo() ;
+            dto.setOperInfo(null);
+            OrderRefundConsultVO vo = EntityUtil.changeEntityByJSON(OrderRefundConsultVO.class, dto) ;
+            if(StringUtils.isNotEmpty(operInfo)) {
+                ConsultOperVO oper = JSONObject.parseObject(operInfo, ConsultOperVO.class) ;
+                vo.setOperInfo(oper);
+            }
+            list.add(vo) ;
+        }
+        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 = new ArrayList<>() ;
+        for(OrderExchangeConsultDTO dto : resp.getResult()) {
+            String operInfo = dto.getOperInfo() ;
+            dto.setOperInfo(null);
+            OrderExchangeConsultVO vo = EntityUtil.changeEntityByJSON(OrderExchangeConsultVO.class, dto) ;
+            if(StringUtils.isNotEmpty(operInfo)) {
+                ConsultOperVO oper = JSONObject.parseObject(operInfo, ConsultOperVO.class) ;
+                vo.setOperInfo(oper);
+            }
+            list.add(vo) ;
+        }
+        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.changeEntityByJSON(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);
+    }
+
+    // 换货单发货
+    @RequestMapping(value = "exchange-order-deliver")
+    @ResponseBody
+    public RestResponse<Object> exchangeDeliver(String enterpriseId, String memberId, String companyCode,
+            String logisticsNo, String companyId, String companyName, String storeId, ExchangeBaseQDTO baseQDTO,String clerkId) {
+        ExchangeDeliveryBackQDTO qdto = new ExchangeDeliveryBackQDTO();
+        qdto.setCourierNumber(logisticsNo);
+        qdto.setOrderId(baseQDTO.getOrderId());
+        qdto.setOrderItemId(baseQDTO.getOrderItemId());
+        qdto.setOrderExchangeId(baseQDTO.getOrderExchangeId());
+        qdto.setLogisticsCompanyCode(companyCode);
+        qdto.setLogisticsCompanyId(companyId);
+        qdto.setLogisticsCompanyName(companyName);
+        qdto.setDeliveryStoreId(storeId);
+        ServiceResponse<Void> resp = this.afterSalesManageApiService.exchangeSellerDeliveryGoods(enterpriseId, memberId,
+                qdto,this.getOper(clerkId));
+        logger.info("换货单发货={}", JSON.toJSONString(resp));
+        if (resp.isSuccess()) {
+            return RestResponse.successResult();
+        }
+        return RestResponse.failure("9999", resp.getMessage());
+    }
+
+    private void fillMemberInfo(String enterpriseId, String memberId, OrderRefundDetailVO refund,
+            OrderExchangeDetailVO exchange) {
+        ServiceResponse<MemberStoreInfoDTO> memberResp = this.memberReferClerkApiService.getMemberInfo(enterpriseId,
+                memberId);
+        MemberStoreInfoDTO memberInfo = memberResp.getResult();
+        if (null != memberInfo) {
+            if (null != refund) {
+                refund.setMemberId(memberId);
+                refund.setMemberName(memberInfo.getMemberName());
+                refund.setMemberImage(memberInfo.getMemberImage());
+                refund.setMemberCardNo(memberInfo.getMemberCardNo());
+                refund.setMainClerkName(memberInfo.getMainClerkName());
+                refund.setMainStoreName(memberInfo.getMainStoreName());
+                refund.setOpenClerkName(memberInfo.getOpenClerkName());
+                refund.setOpenStoreName(memberInfo.getOpenStoreName());
+            }
+            if (null != exchange) {
+                exchange.setMemberId(memberId);
+                exchange.setMemberName(memberInfo.getMemberName());
+                exchange.setMemberImage(memberInfo.getMemberImage());
+                exchange.setMemberCardNo(memberInfo.getMemberCardNo());
+                exchange.setMainClerkName(memberInfo.getMainClerkName());
+                exchange.setMainStoreName(memberInfo.getMainStoreName());
+                exchange.setOpenClerkName(memberInfo.getOpenClerkName());
+                exchange.setOpenStoreName(memberInfo.getOpenStoreName());
+            }
+        }
+    }
+    
+    private OperationUserQDTO getOper(String clerkId) {
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        OperationUserQDTO dto = new OperationUserQDTO() ;
+        if(null == clerk) {
+            return dto ;
+        }
+        dto.setOperatorId(clerk.getClerkId()) ;
+        dto.setOperatorType(clerk.getClerkType());
+        dto.setOperatorName(clerk.getClerkName());
+        dto.setOperatorCode(clerk.getClerkCode());
+        return dto ;
+    }
+
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/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 memberId;
-    // 会员信息
-    private String memberName;
-    private String memberImage;
-    private String mainClerkId;
-    private String mainClerkName;
-    private String mainClerkCode;
-    private String mainStoreId;
-    private String mainStoreName;
-    private String mainStoreCode;
-
-    private String openClerkId;
-    private String openClerkName;
-    private String openClerkCode;
-    private String openStoreId;
-    private String openStoreName;
-    private String openStoreCode;
-
-    // 收货地址
-    private String addressName;
-    private String addressPhone;
-    private String addressDetail;
-
-    public String getMainClerkCode() {
-        return mainClerkCode;
-    }
-
-    public String getMainStoreCode() {
-        return mainStoreCode;
-    }
-
-    public String getOpenClerkCode() {
-        return openClerkCode;
-    }
-
-    public String getOpenStoreCode() {
-        return openStoreCode;
-    }
-
-    public void setMainClerkCode(String mainClerkCode) {
-        this.mainClerkCode = mainClerkCode;
-    }
-
-    public void setMainStoreCode(String mainStoreCode) {
-        this.mainStoreCode = mainStoreCode;
-    }
-
-    public void setOpenClerkCode(String openClerkCode) {
-        this.openClerkCode = openClerkCode;
-    }
-
-    public void setOpenStoreCode(String openStoreCode) {
-        this.openStoreCode = openStoreCode;
-    }
-
-    public String getOpenClerkId() {
-        return openClerkId;
-    }
-
-    public String getOpenClerkName() {
-        return openClerkName;
-    }
-
-    public String getOpenStoreId() {
-        return openStoreId;
-    }
-
-    public String getOpenStoreName() {
-        return openStoreName;
-    }
-
-    public void setOpenClerkId(String openClerkId) {
-        this.openClerkId = openClerkId;
-    }
-
-    public void setOpenClerkName(String openClerkName) {
-        this.openClerkName = openClerkName;
-    }
-
-    public void setOpenStoreId(String openStoreId) {
-        this.openStoreId = openStoreId;
-    }
-
-    public void setOpenStoreName(String openStoreName) {
-        this.openStoreName = openStoreName;
-    }
-
-    public String getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(String memberId) {
-        this.memberId = memberId;
-    }
-
-    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;
-    }
-}
+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 memberId;
+    // 会员信息
+    private String memberName;
+    private String memberImage;
+    private String mainClerkId;
+    private String mainClerkName;
+    private String mainClerkCode;
+    private String mainStoreId;
+    private String mainStoreName;
+    private String mainStoreCode;
+
+    private String openClerkId;
+    private String openClerkName;
+    private String openClerkCode;
+    private String openStoreId;
+    private String openStoreName;
+    private String openStoreCode;
+    
+    private String belongClerkId;
+    private String belongClerkCode;
+    private String belongClerkName;
+    private String belongStoreId;
+    private String belongStoreCode;
+    private String belongStoreName;
+    
+    // 收货地址
+    private String addressName;
+    private String addressPhone;
+    private String addressDetail;
+
+    public String getMainClerkCode() {
+        return mainClerkCode;
+    }
+
+    public String getMainStoreCode() {
+        return mainStoreCode;
+    }
+
+    public String getOpenClerkCode() {
+        return openClerkCode;
+    }
+
+    public String getOpenStoreCode() {
+        return openStoreCode;
+    }
+
+    public void setMainClerkCode(String mainClerkCode) {
+        this.mainClerkCode = mainClerkCode;
+    }
+
+    public void setMainStoreCode(String mainStoreCode) {
+        this.mainStoreCode = mainStoreCode;
+    }
+
+    public void setOpenClerkCode(String openClerkCode) {
+        this.openClerkCode = openClerkCode;
+    }
+
+    public void setOpenStoreCode(String openStoreCode) {
+        this.openStoreCode = openStoreCode;
+    }
+
+    public String getOpenClerkId() {
+        return openClerkId;
+    }
+
+    public String getOpenClerkName() {
+        return openClerkName;
+    }
+
+    public String getOpenStoreId() {
+        return openStoreId;
+    }
+
+    public String getOpenStoreName() {
+        return openStoreName;
+    }
+
+    public void setOpenClerkId(String openClerkId) {
+        this.openClerkId = openClerkId;
+    }
+
+    public void setOpenClerkName(String openClerkName) {
+        this.openClerkName = openClerkName;
+    }
+
+    public void setOpenStoreId(String openStoreId) {
+        this.openStoreId = openStoreId;
+    }
+
+    public void setOpenStoreName(String openStoreName) {
+        this.openStoreName = openStoreName;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    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;
+    }
+
+    public String getBelongClerkId() {
+        return belongClerkId;
+    }
+
+    public String getBelongClerkCode() {
+        return belongClerkCode;
+    }
+
+    public String getBelongClerkName() {
+        return belongClerkName;
+    }
+
+    public String getBelongStoreId() {
+        return belongStoreId;
+    }
+
+    public String getBelongStoreCode() {
+        return belongStoreCode;
+    }
+
+    public String getBelongStoreName() {
+        return belongStoreName;
+    }
+
+    public void setBelongClerkId(String belongClerkId) {
+        this.belongClerkId = belongClerkId;
+    }
+
+    public void setBelongClerkCode(String belongClerkCode) {
+        this.belongClerkCode = belongClerkCode;
+    }
+
+    public void setBelongClerkName(String belongClerkName) {
+        this.belongClerkName = belongClerkName;
+    }
+
+    public void setBelongStoreId(String belongStoreId) {
+        this.belongStoreId = belongStoreId;
+    }
+
+    public void setBelongStoreCode(String belongStoreCode) {
+        this.belongStoreCode = belongStoreCode;
+    }
+
+    public void setBelongStoreName(String belongStoreName) {
+        this.belongStoreName = belongStoreName;
+    }
+    
+}

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

@@ -58,6 +58,10 @@ public class OrderDetailVO implements Serializable {
      * 实付金额 不含运费
      */
     private Double payAmount;
+    
+    
+    // 使用积分
+    private Integer usePoint ;
 
     /**
      * 最终实际运费（可手动修改）
@@ -135,6 +139,14 @@ public class OrderDetailVO implements Serializable {
     
     // 物流包裹列表
     private List<String> orderLogisticsIdList ;
+    
+    public Integer getUsePoint() {
+        return usePoint;
+    }
+
+    public void setUsePoint(Integer usePoint) {
+        this.usePoint = usePoint;
+    }
 
     public Integer getBusinessType() {
         return businessType;

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

@@ -85,6 +85,17 @@ public class OrderListItemVO implements Serializable {
     4、换货成功 */
     private int afterSalesStatus ;
     
+    // 商品错误信息
+    private String errorMsg ;
+    
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
     public String getMallProSkuId() {
         return mallProSkuId;
     }

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

@@ -63,6 +63,9 @@ public class OrderListVO implements Serializable {
      * 实付金额 不含运费
      */
     private Double payAmount;
+    
+    // 使用积分
+    private Integer usePoint ;
 
     /**
      * 最终实际运费（可手动修改）
@@ -104,6 +107,14 @@ public class OrderListVO implements Serializable {
      * 评价
      */
     private EvaluateVO evaluateVO;
+    
+    public Integer getUsePoint() {
+        return usePoint;
+    }
+
+    public void setUsePoint(Integer usePoint) {
+        this.usePoint = usePoint;
+    }
 
     public Integer getBusinessType() {
         return businessType;

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

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

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

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

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

@@ -50,6 +50,36 @@ public class OrderExchangeDetailVO implements Serializable {
     private String mainStoreName;
     private String openClerkName;
     private String openStoreName;
+    
+    /**
+     * 订单归属导购id
+     */
+    private String belongClerkId;
+
+    /**
+     * 订单归属导购code
+     */
+    private String belongClerkCode;
+
+    /**
+     * 订单归属导购名称
+     */
+    private String belongClerkName;
+
+    /**
+     * 订单归属门店id
+     */
+    private String belongStoreId;
+
+    /**
+     * 订单归属门店code
+     */
+    private String belongStoreCode;
+
+    /**
+     * 订单归属门店名称
+     */
+    private String belongStoreName;
 
     /**
      * 换货商品件数（或单位 贵金属-重量等）
@@ -244,6 +274,54 @@ public class OrderExchangeDetailVO implements Serializable {
     
     // 2：门店自提 1：快递发货   
     private Integer deliveryChannel ;
+    
+    public String getBelongClerkId() {
+        return belongClerkId;
+    }
+
+    public String getBelongClerkCode() {
+        return belongClerkCode;
+    }
+
+    public String getBelongClerkName() {
+        return belongClerkName;
+    }
+
+    public String getBelongStoreId() {
+        return belongStoreId;
+    }
+
+    public String getBelongStoreCode() {
+        return belongStoreCode;
+    }
+
+    public String getBelongStoreName() {
+        return belongStoreName;
+    }
+
+    public void setBelongClerkId(String belongClerkId) {
+        this.belongClerkId = belongClerkId;
+    }
+
+    public void setBelongClerkCode(String belongClerkCode) {
+        this.belongClerkCode = belongClerkCode;
+    }
+
+    public void setBelongClerkName(String belongClerkName) {
+        this.belongClerkName = belongClerkName;
+    }
+
+    public void setBelongStoreId(String belongStoreId) {
+        this.belongStoreId = belongStoreId;
+    }
+
+    public void setBelongStoreCode(String belongStoreCode) {
+        this.belongStoreCode = belongStoreCode;
+    }
+
+    public void setBelongStoreName(String belongStoreName) {
+        this.belongStoreName = belongStoreName;
+    }
 
     public Integer getBusinessType() {
         return businessType;

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

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

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;
-
-    /**
-     *订单来源类型
-     * @see com.gic.business.order.enums.OrderEnum.BusinessTypeEnum
-     */
-    private Integer businessType;
-    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 mallProCode;
-    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 memberCardNo;
-    private String memberName;
-    private String memberImage;
-    private String mainClerkName;
-    private String mainStoreName;
-    private String openClerkName ;
-    private String openStoreName ;
-    
-    
-    // 赠品1是0否
-    private int giftFlag;
-
-    /**
-     * 退款处理时间
-     */
-    private Date refundProcessTime;
-
-    /**
-     * 买家退货时间
-     */
-    private Date refundGoodsTime;
-
-    // 1：未发货类型，2：已发货类型
-    private int refundDeliverType = 1;
-
-    /**
-     * 同意买家发货申请
-     */
-    private Date sellerConfirmTime;
-
-    // 优惠信息
-    private String discountAmountInfo;
-
-    // 退款凭证图片,号隔开
-    private String refundImgUrl;
-
-    private String sellerAddressInfo;
-    private String sellerName;
-    private String sellerPhone;
-    private String refundFailReason;
-
-    // 退款理由
-    private String refundReason;
-    // 退款说明
-    private String refundDescribe;
-    private Double maxRefundPrice;
-
-    // 1 电商发货 2门店发货
-    private Integer deliveryMode = 1;
-    // 发货门店
-    private String deliverStoreId ;
-    private String deliverStoreName ;
-    private String deliverStoreCode ;
-    private String amountPayableInfo;
-    private Double orderItemFreight;
-    //  好办端能否审批售后
-    private boolean canAduitFlag = true ;
-    
-    // 退款的门店id
-    private String refundStoreId ;
-    
-    // 2：门店自提 1：快递发货   
-    private Integer deliveryChannel ;
-
-    public Integer getBusinessType() {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType) {
-        this.businessType = businessType;
-    }
-
-    public Integer getDeliveryChannel() {
-        return deliveryChannel;
-    }
-
-    public void setDeliveryChannel(Integer deliveryChannel) {
-        this.deliveryChannel = deliveryChannel;
-    }
-    
-    public String getRefundStoreId() {
-        return refundStoreId;
-    }
-
-    public void setRefundStoreId(String refundStoreId) {
-        this.refundStoreId = refundStoreId;
-    }
-
-    public boolean isCanAduitFlag() {
-        return canAduitFlag;
-    }
-
-    public void setCanAduitFlag(boolean canAduitFlag) {
-        this.canAduitFlag = canAduitFlag;
-    }
-
-    public String getMallProCode() {
-        return mallProCode;
-    }
-
-    public void setMallProCode(String mallProCode) {
-        this.mallProCode = mallProCode;
-    }
-
-    public String getMemberImage() {
-        return memberImage;
-    }
-
-    public String getMainClerkName() {
-        return mainClerkName;
-    }
-
-    public String getMainStoreName() {
-        return mainStoreName;
-    }
-
-    public String getOpenClerkName() {
-        return openClerkName;
-    }
-
-    public String getOpenStoreName() {
-        return openStoreName;
-    }
-
-    public void setMemberImage(String memberImage) {
-        this.memberImage = memberImage;
-    }
-
-    public void setMainClerkName(String mainClerkName) {
-        this.mainClerkName = mainClerkName;
-    }
-
-    public void setMainStoreName(String mainStoreName) {
-        this.mainStoreName = mainStoreName;
-    }
-
-    public void setOpenClerkName(String openClerkName) {
-        this.openClerkName = openClerkName;
-    }
-
-    public void setOpenStoreName(String openStoreName) {
-        this.openStoreName = openStoreName;
-    }
-
-    public String getDeliverStoreId() {
-        return deliverStoreId;
-    }
-
-    public String getDeliverStoreName() {
-        return deliverStoreName;
-    }
-
-    public String getDeliverStoreCode() {
-        return deliverStoreCode;
-    }
-
-    public void setDeliverStoreId(String deliverStoreId) {
-        this.deliverStoreId = deliverStoreId;
-    }
-
-    public void setDeliverStoreName(String deliverStoreName) {
-        this.deliverStoreName = deliverStoreName;
-    }
-
-    public void setDeliverStoreCode(String deliverStoreCode) {
-        this.deliverStoreCode = deliverStoreCode;
-    }
-
-    public Double getOrderItemFreight() {
-        return orderItemFreight;
-    }
-
-    public void setOrderItemFreight(Double orderItemFreight) {
-        this.orderItemFreight = orderItemFreight;
-    }
-
-    public String getAmountPayableInfo() {
-        return amountPayableInfo;
-    }
-
-    public void setAmountPayableInfo(String amountPayableInfo) {
-        this.amountPayableInfo = amountPayableInfo;
-    }
-
-    public Integer getDeliveryMode() {
-        return deliveryMode;
-    }
-
-    public void setDeliveryMode(Integer deliveryMode) {
-        this.deliveryMode = deliveryMode;
-    }
-
-    public Double getMaxRefundPrice() {
-        return maxRefundPrice;
-    }
-
-    public void setMaxRefundPrice(Double maxRefundPrice) {
-        this.maxRefundPrice = maxRefundPrice;
-    }
-
-    public String getRefundReason() {
-        return refundReason;
-    }
-
-    public String getRefundDescribe() {
-        return refundDescribe;
-    }
-
-    public void setRefundReason(String refundReason) {
-        this.refundReason = refundReason;
-    }
-
-    public void setRefundDescribe(String refundDescribe) {
-        this.refundDescribe = refundDescribe;
-    }
-
-    public String getSellerAddressInfo() {
-        return sellerAddressInfo;
-    }
-
-    public String getSellerName() {
-        return sellerName;
-    }
-
-    public String getSellerPhone() {
-        return sellerPhone;
-    }
-
-    public String getRefundFailReason() {
-        return refundFailReason;
-    }
-
-    public void setSellerAddressInfo(String sellerAddressInfo) {
-        this.sellerAddressInfo = sellerAddressInfo;
-    }
-
-    public void setSellerName(String sellerName) {
-        this.sellerName = sellerName;
-    }
-
-    public void setSellerPhone(String sellerPhone) {
-        this.sellerPhone = sellerPhone;
-    }
-
-    public void setRefundFailReason(String refundFailReason) {
-        this.refundFailReason = refundFailReason;
-    }
-
-    public String getRefundImgUrl() {
-        return refundImgUrl;
-    }
-
-    public void setRefundImgUrl(String refundImgUrl) {
-        this.refundImgUrl = refundImgUrl;
-    }
-
-    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;
-    }
-}
+package com.gic.haoban.manage.web.vo.order.refund;
+
+import com.gic.business.order.dto.ordermanage.OrderCouponDetailDTO;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商城退款记录
+ *
+ * @author zxy
+ */
+public class OrderRefundDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *订单来源类型
+     * @see com.gic.business.order.enums.OrderEnum.BusinessTypeEnum
+     */
+    private Integer businessType;
+    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 mallProCode;
+    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 memberCardNo;
+    private String memberName;
+    private String memberImage;
+    private String mainClerkName;
+    private String mainStoreName;
+    private String openClerkName ;
+    private String openStoreName ;
+    
+    /**
+     * 订单归属导购id
+     */
+    private String belongClerkId;
+
+    /**
+     * 订单归属导购code
+     */
+    private String belongClerkCode;
+
+    /**
+     * 订单归属导购名称
+     */
+    private String belongClerkName;
+
+    /**
+     * 订单归属门店id
+     */
+    private String belongStoreId;
+
+    /**
+     * 订单归属门店code
+     */
+    private String belongStoreCode;
+
+    /**
+     * 订单归属门店名称
+     */
+    private String belongStoreName;
+    
+    
+    
+    // 赠品1是0否
+    private int giftFlag;
+
+    /**
+     * 退款处理时间
+     */
+    private Date refundProcessTime;
+
+    /**
+     * 买家退货时间
+     */
+    private Date refundGoodsTime;
+
+    // 1：未发货类型，2：已发货类型
+    private int refundDeliverType = 1;
+
+    /**
+     * 同意买家发货申请
+     */
+    private Date sellerConfirmTime;
+
+    // 优惠信息
+    private String discountAmountInfo;
+
+    // 退款凭证图片,号隔开
+    private String refundImgUrl;
+
+    private String sellerAddressInfo;
+    private String sellerName;
+    private String sellerPhone;
+    private String refundFailReason;
+
+    // 退款理由
+    private String refundReason;
+    // 退款说明
+    private String refundDescribe;
+    private Double maxRefundPrice;
+
+    // 1 电商发货 2门店发货
+    private Integer deliveryMode = 1;
+    // 发货门店
+    private String deliverStoreId ;
+    private String deliverStoreName ;
+    private String deliverStoreCode ;
+    private String amountPayableInfo;
+    private Double orderItemFreight;
+    //  好办端能否审批售后
+    private boolean canAduitFlag = true ;
+    
+    // 退款的门店id
+    private String refundStoreId ;
+    
+    // 2：门店自提 1：快递发货   
+    private Integer deliveryChannel ;
+    // 申请积分
+    private Integer applyRefundPoints ;
+
+    private Integer usePoint ;
+    private Integer goodsType;
+    private String goodsReferId ;
+
+    /**
+     * 订单卡券状态（新增）
+     */
+    private OrderCouponDetailDTO orderCouponDetail;
+
+
+    public Integer getUsePoint() {
+        return usePoint;
+    }
+
+    public void setUsePoint(Integer usePoint) {
+        this.usePoint = usePoint;
+    }
+
+    public Integer getGoodsType() {
+        return goodsType;
+    }
+
+    public void setGoodsType(Integer goodsType) {
+        this.goodsType = goodsType;
+    }
+
+    public String getGoodsReferId() {
+        return goodsReferId;
+    }
+
+    public void setGoodsReferId(String goodsReferId) {
+        this.goodsReferId = goodsReferId;
+    }
+
+    public OrderCouponDetailDTO getOrderCouponDetail() {
+        return orderCouponDetail;
+    }
+
+    public void setOrderCouponDetail(OrderCouponDetailDTO orderCouponDetail) {
+        this.orderCouponDetail = orderCouponDetail;
+    }
+
+    public String getBelongClerkId() {
+        return belongClerkId;
+    }
+
+    public String getBelongClerkCode() {
+        return belongClerkCode;
+    }
+
+    public String getBelongClerkName() {
+        return belongClerkName;
+    }
+
+    public String getBelongStoreId() {
+        return belongStoreId;
+    }
+
+    public String getBelongStoreCode() {
+        return belongStoreCode;
+    }
+
+    public String getBelongStoreName() {
+        return belongStoreName;
+    }
+
+    public void setBelongClerkId(String belongClerkId) {
+        this.belongClerkId = belongClerkId;
+    }
+
+    public void setBelongClerkCode(String belongClerkCode) {
+        this.belongClerkCode = belongClerkCode;
+    }
+
+    public void setBelongClerkName(String belongClerkName) {
+        this.belongClerkName = belongClerkName;
+    }
+
+    public void setBelongStoreId(String belongStoreId) {
+        this.belongStoreId = belongStoreId;
+    }
+
+    public void setBelongStoreCode(String belongStoreCode) {
+        this.belongStoreCode = belongStoreCode;
+    }
+
+    public void setBelongStoreName(String belongStoreName) {
+        this.belongStoreName = belongStoreName;
+    }
+
+    public Integer getApplyRefundPoints() {
+        return applyRefundPoints;
+    }
+
+    public void setApplyRefundPoints(Integer applyRefundPoints) {
+        this.applyRefundPoints = applyRefundPoints;
+    }
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
+    public Integer getDeliveryChannel() {
+        return deliveryChannel;
+    }
+
+    public void setDeliveryChannel(Integer deliveryChannel) {
+        this.deliveryChannel = deliveryChannel;
+    }
+    
+    public String getRefundStoreId() {
+        return refundStoreId;
+    }
+
+    public void setRefundStoreId(String refundStoreId) {
+        this.refundStoreId = refundStoreId;
+    }
+
+    public boolean isCanAduitFlag() {
+        return canAduitFlag;
+    }
+
+    public void setCanAduitFlag(boolean canAduitFlag) {
+        this.canAduitFlag = canAduitFlag;
+    }
+
+    public String getMallProCode() {
+        return mallProCode;
+    }
+
+    public void setMallProCode(String mallProCode) {
+        this.mallProCode = mallProCode;
+    }
+
+    public String getMemberImage() {
+        return memberImage;
+    }
+
+    public String getMainClerkName() {
+        return mainClerkName;
+    }
+
+    public String getMainStoreName() {
+        return mainStoreName;
+    }
+
+    public String getOpenClerkName() {
+        return openClerkName;
+    }
+
+    public String getOpenStoreName() {
+        return openStoreName;
+    }
+
+    public void setMemberImage(String memberImage) {
+        this.memberImage = memberImage;
+    }
+
+    public void setMainClerkName(String mainClerkName) {
+        this.mainClerkName = mainClerkName;
+    }
+
+    public void setMainStoreName(String mainStoreName) {
+        this.mainStoreName = mainStoreName;
+    }
+
+    public void setOpenClerkName(String openClerkName) {
+        this.openClerkName = openClerkName;
+    }
+
+    public void setOpenStoreName(String openStoreName) {
+        this.openStoreName = openStoreName;
+    }
+
+    public String getDeliverStoreId() {
+        return deliverStoreId;
+    }
+
+    public String getDeliverStoreName() {
+        return deliverStoreName;
+    }
+
+    public String getDeliverStoreCode() {
+        return deliverStoreCode;
+    }
+
+    public void setDeliverStoreId(String deliverStoreId) {
+        this.deliverStoreId = deliverStoreId;
+    }
+
+    public void setDeliverStoreName(String deliverStoreName) {
+        this.deliverStoreName = deliverStoreName;
+    }
+
+    public void setDeliverStoreCode(String deliverStoreCode) {
+        this.deliverStoreCode = deliverStoreCode;
+    }
+
+    public Double getOrderItemFreight() {
+        return orderItemFreight;
+    }
+
+    public void setOrderItemFreight(Double orderItemFreight) {
+        this.orderItemFreight = orderItemFreight;
+    }
+
+    public String getAmountPayableInfo() {
+        return amountPayableInfo;
+    }
+
+    public void setAmountPayableInfo(String amountPayableInfo) {
+        this.amountPayableInfo = amountPayableInfo;
+    }
+
+    public Integer getDeliveryMode() {
+        return deliveryMode;
+    }
+
+    public void setDeliveryMode(Integer deliveryMode) {
+        this.deliveryMode = deliveryMode;
+    }
+
+    public Double getMaxRefundPrice() {
+        return maxRefundPrice;
+    }
+
+    public void setMaxRefundPrice(Double maxRefundPrice) {
+        this.maxRefundPrice = maxRefundPrice;
+    }
+
+    public String getRefundReason() {
+        return refundReason;
+    }
+
+    public String getRefundDescribe() {
+        return refundDescribe;
+    }
+
+    public void setRefundReason(String refundReason) {
+        this.refundReason = refundReason;
+    }
+
+    public void setRefundDescribe(String refundDescribe) {
+        this.refundDescribe = refundDescribe;
+    }
+
+    public String getSellerAddressInfo() {
+        return sellerAddressInfo;
+    }
+
+    public String getSellerName() {
+        return sellerName;
+    }
+
+    public String getSellerPhone() {
+        return sellerPhone;
+    }
+
+    public String getRefundFailReason() {
+        return refundFailReason;
+    }
+
+    public void setSellerAddressInfo(String sellerAddressInfo) {
+        this.sellerAddressInfo = sellerAddressInfo;
+    }
+
+    public void setSellerName(String sellerName) {
+        this.sellerName = sellerName;
+    }
+
+    public void setSellerPhone(String sellerPhone) {
+        this.sellerPhone = sellerPhone;
+    }
+
+    public void setRefundFailReason(String refundFailReason) {
+        this.refundFailReason = refundFailReason;
+    }
+
+    public String getRefundImgUrl() {
+        return refundImgUrl;
+    }
+
+    public void setRefundImgUrl(String refundImgUrl) {
+        this.refundImgUrl = refundImgUrl;
+    }
+
+    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;
+    }
+}