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,8 +232,6 @@ public class GicOrderController {
         if (StringUtils.isEmpty(writeOffCode)) {
             return RestResponse.failure("9999", "核销码为空");
         }
-        // 微商城
-        if (writeOffCode.startsWith("M")) {
         // 通过核销码查询
         QueryOrderDetailQDTO qdto = new QueryOrderDetailQDTO();
         qdto.setEnterpriseId(enterpriseId);
@@ -268,20 +251,13 @@ public class GicOrderController {
             }
             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());
         }
-        } else {
-            // 积分商城
-            DubboResult<IntegralMallExchangeLogDTO> integralResult = integralmallService
-                    .getIntegralMallExchangeLogByWriteOffCode(enterpriseId, writeOffCode);
-            if (null != integralResult && null != integralResult.getData()) {
-                ScanVO vo = integralMallScan(integralResult.getData());
-                return RestResponse.successResult(vo);
-            }
-        }
-        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,7 +419,6 @@ public class GicOrderController {
             return RestResponse.failure("9999", "核销人不存在");
         }
         // 微商城核销
-        if (writeOffCode.startsWith("M")) {
         if (StringUtils.isEmpty(orderId)) {
             return RestResponse.failure("9999", "订单ID为空");
         }
@@ -446,79 +434,16 @@ public class GicOrderController {
             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) ;
-        }
     }
 
     // 核销数量
     @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

@@ -13,6 +13,7 @@ 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;
@@ -23,6 +24,7 @@ import com.gic.business.order.dto.ordermanage.OrderRefundConsultDTO;
 import com.gic.business.order.dto.ordermanage.OrderRefundDetailDTO;
 import com.gic.business.order.dto.ordermanage.OrderRefundExchangeListDTO;
 import com.gic.business.order.dto.ordermanage.RefundAddressDTO;
+import com.gic.business.order.qdto.OperationUserQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeAddressQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeBaseQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
@@ -41,6 +43,7 @@ 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;
@@ -106,19 +109,20 @@ public class GicOrderRefundController {
         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 {
+            // 退货地址类型 0归属门店 1发货门店 2平台地址
+            Integer sellerAddressType = dto.getSellerAddressType();
             String refundStoreId = dto.getRefundStoreId();
             logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType);
-            if (sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
+            if (null != sellerAddressType && sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
                 canAduitFlag = true;
             }
         }
         vo.setCanAduitFlag(canAduitFlag);
+        vo.setUsePoint(dto.getUsePoints());
         return RestResponse.successResult(vo);
     }
 
@@ -175,10 +179,10 @@ public class GicOrderRefundController {
             RefundRefusedQDTO qdto = EntityUtil.changeEntityByJSON(RefundRefusedQDTO.class, baseQDTO);
             qdto.setReason(remark);
             if (step == 1) {
-                resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
-                resp = this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerRefusedGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         // 同意
@@ -187,13 +191,13 @@ public class GicOrderRefundController {
                 RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerAgreeQDTO.class, baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
                 qdto.setExchangeAddress(address);
-                resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
                 RefundSellerConfirmGoodsQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerConfirmGoodsQDTO.class,
                         baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
-                resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         if (!resp.isSuccess()) {
@@ -221,10 +225,10 @@ public class GicOrderRefundController {
             ExchangeRefusedQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeRefusedQDTO.class, baseQDTO);
             qdto.setRemark(remark);
             if (step == 1) {
-                resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
-                resp = this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerRefusedGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         // 同意
@@ -233,10 +237,10 @@ public class GicOrderRefundController {
                     baseQDTO);
             if (step == 1) {
                 qdto.setExchangeAddress(address);
-                resp = this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerConfirm(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
             if (step == 2) {
-                resp = this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto);
+                resp = this.afterSalesManageApiService.exchangeSellerConfirmGoods(enterpriseId, memberId, qdto,this.getOper(clerkId));
             }
         }
         if (!resp.isSuccess()) {
@@ -254,7 +258,17 @@ public class GicOrderRefundController {
     @ResponseBody
     public RestResponse<Object> refundConsult(String orderRefundId) {
         ServiceResponse<List<OrderRefundConsultDTO>> resp = orderRefundApiService.listRefundConsult(orderRefundId);
-        List<OrderRefundConsultVO> list = EntityUtil.changeEntityListNew(OrderRefundConsultVO.class, resp.getResult());
+        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);
     }
 
@@ -264,8 +278,17 @@ public class GicOrderRefundController {
     public RestResponse<Object> exchangeConsult(String orderExchangeId) {
         ServiceResponse<List<OrderExchangeConsultDTO>> resp = orderRefundApiService
                 .listExchangeConsult(orderExchangeId);
-        List<OrderExchangeConsultVO> list = EntityUtil.changeEntityListNew(OrderExchangeConsultVO.class,
-                resp.getResult());
+        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);
     }
 
@@ -298,7 +321,7 @@ public class GicOrderRefundController {
     @RequestMapping(value = "exchange-order-deliver")
     @ResponseBody
     public RestResponse<Object> exchangeDeliver(String enterpriseId, String memberId, String companyCode,
-            String logisticsNo, String companyId, String companyName, String storeId, ExchangeBaseQDTO baseQDTO) {
+            String logisticsNo, String companyId, String companyName, String storeId, ExchangeBaseQDTO baseQDTO,String clerkId) {
         ExchangeDeliveryBackQDTO qdto = new ExchangeDeliveryBackQDTO();
         qdto.setCourierNumber(logisticsNo);
         qdto.setOrderId(baseQDTO.getOrderId());
@@ -309,7 +332,7 @@ public class GicOrderRefundController {
         qdto.setLogisticsCompanyName(companyName);
         qdto.setDeliveryStoreId(storeId);
         ServiceResponse<Void> resp = this.afterSalesManageApiService.exchangeSellerDeliveryGoods(enterpriseId, memberId,
-                qdto);
+                qdto,this.getOper(clerkId));
         logger.info("换货单发货={}", JSON.toJSONString(resp));
         if (resp.isSuccess()) {
             return RestResponse.successResult();
@@ -346,4 +369,17 @@ public class GicOrderRefundController {
         }
     }
     
+    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

@@ -27,6 +27,13 @@ public class MemberInfoVO implements Serializable {
     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;
@@ -175,4 +182,53 @@ public class MemberInfoVO implements Serializable {
     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

@@ -59,6 +59,10 @@ public class OrderDetailVO implements Serializable {
      */
     private Double payAmount;
     
+    
+    // 使用积分
+    private Integer usePoint ;
+
     /**
      * 最终实际运费（可手动修改）
      */
@@ -136,6 +140,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

@@ -64,6 +64,9 @@ public class OrderListVO implements Serializable {
      */
     private Double payAmount;
     
+    // 使用积分
+    private Integer usePoint ;
+
     /**
      * 最终实际运费（可手动修改）
      */
@@ -105,6 +108,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

@@ -60,6 +60,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

@@ -52,6 +52,36 @@ public class OrderExchangeDetailVO implements Serializable {
     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;
+
+    /**
      * 换货商品件数（或单位 贵金属-重量等）
      */
     private Double exchangeNumber;
@@ -245,6 +275,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

@@ -85,6 +85,16 @@ public class OrderRefundConsultVO implements Serializable {
 
     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 com.gic.business.order.dto.ordermanage.OrderCouponDetailDTO;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -57,6 +59,37 @@ public class OrderRefundDetailVO implements Serializable {
     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;
@@ -112,6 +145,106 @@ public class OrderRefundDetailVO implements Serializable {
     
     // 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;