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/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;