Merge remote-tracking branch 'origin/developerH' into developer

# Conflicts:
#	src/main/resources/mapper/OrderClubMapper.xml

src/main/java/com/caimei365/order/components/WeChatService.java

@@ -516,4 +516,103 @@ public class WeChatService {
             log.error("推送微信模板消息失败：", e);
         }
     }
+
+    /**
+     * 续费会员消息推送
+     * @param accessToken 微信公众号
+     * @param openid 公众号的openid
+     * @param title 标题
+     * @param name 商品名称
+     * @param remarkText 备注
+     * @param pagePath 跳转链接
+     */
+    public void sendTempl(String accessToken, String openid, String title, String name,String type,String date,String remarkText, String pagePath) {
+        JSONObject first = new JSONObject();
+        first.put("value", title);
+        JSONObject keyword1 = new JSONObject();
+        keyword1.put("value", name);
+        JSONObject keyword2 = new JSONObject();
+        keyword2.put("value", date);
+        JSONObject keyword3 = new JSONObject();
+        keyword2.put("value", "会员剩余天数：30天");
+        JSONObject remark = new JSONObject();
+        remark.put("value", remarkText);
+
+        JSONObject data = new JSONObject();
+        data.put("first", first);
+        data.put("keyword1", keyword1);
+        data.put("keyword2", keyword2);
+        data.put("remark", remark);
+
+        JSONObject miniProgram = new JSONObject();
+        miniProgram.put("appid", miniAppId);
+        miniProgram.put("pagepath", pagePath);
+
+        JSONObject json = new JSONObject(new LinkedHashMap());
+        json.put("touser",openid);
+        json.put("template_id","QHsM0AhlgGaX6kJ6vFm1wAKIkNjnZdWPjFGOKopLbsM");
+        json.put("url","https://www.caimei365.com/");
+        json.put("miniprogram", miniProgram);
+        json.put("data", data);
+        // json 字符串
+        String jsonString = json.toJSONString();
+        log.info(">>>>>>>>推送微信模板消息：" + jsonString);
+        try {
+            // https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN
+//            String requestUrl =  "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token="+accessToken;
+            String requestUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+accessToken;
+            // 发送请求
+            String result = RequestUtil.httpRequest(requestUrl, "POST", jsonString);
+            log.info(">>>>>>>>推送结果：" + result);
+        } catch (Exception e) {
+            log.error("推送微信模板消息失败：", e);
+        }
+    }
+
+
+    /**
+     * 续费会员消息推送
+     */
+    public void sendTemplss(String accessToken, String openid,String Time, String pagePath) {
+        JSONObject first = new JSONObject();
+        first.put("value", "恭喜您成功续费采美超级会员");
+        JSONObject keyword1 = new JSONObject();
+        keyword1.put("value", "超级会员");
+        JSONObject keyword2 = new JSONObject();
+        keyword2.put("value", Time);
+        JSONObject remark = new JSONObject();
+        remark.put("value", "如在使用中有任何疑问，请在小程序内联系在线客服");
+
+        JSONObject data = new JSONObject();
+        data.put("first", first);
+        data.put("keyword1", keyword1);
+        data.put("keyword2", keyword2);
+        data.put("remark", remark);
+
+        JSONObject miniProgram = new JSONObject();
+        miniProgram.put("appid", miniAppId);
+        miniProgram.put("pagepath", pagePath);
+
+        JSONObject json = new JSONObject(new LinkedHashMap());
+        json.put("touser",openid);
+        json.put("template_id","QHsM0AhlgGaX6kJ6vFm1wAKIkNjnZdWPjFGOKopLbsM");
+        json.put("url","https://www.caimei365.com/");
+        json.put("miniprogram", miniProgram);
+        json.put("data", data);
+        // json 字符串
+        String jsonString = json.toJSONString();
+        log.info(">>>>>>>>推送微信模板消息：" + jsonString);
+        try {
+            // https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN
+//            String requestUrl =  "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token="+accessToken;
+            String requestUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+accessToken;
+            // 发送请求
+            String result = RequestUtil.httpRequest(requestUrl, "POST", jsonString);
+            log.info(">>>>>>>>推送结果：" + result);
+        } catch (Exception e) {
+            log.error("推送微信模板消息失败：", e);
+        }
+    }
+
+
 }

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -283,6 +283,12 @@ public interface OrderClubMapper {
      */
     String getOrderNo(Integer orderId);
 
+    OrderVo getOrderMess(Integer orderId);
+
+    OrderVo getcartNess(Integer userId);
+
+    List<Integer> userIds();
+
     /**
      * 保存分享码使用记录
      */
@@ -326,4 +332,10 @@ public interface OrderClubMapper {
     Integer findUserId(Integer orderId);
 
     void insertCouponRecord(CouponRecordPo couponRecordPo);
+
+    void addMessageCenter(MessageCenter messageCenter);
+
+    Integer getVipHistoryCount(Integer userId);
+
+    Integer clubIdCule(Integer userId);
 }

src/main/java/com/caimei365/order/model/vo/MessageCenter.java

@@ -0,0 +1,57 @@
+package com.caimei365.order.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/7/7
+ */
+@Data
+public class MessageCenter implements Serializable {
+
+    /**
+    *消息id
+     */
+    private Integer id;
+    /**
+    供应商id
+     */
+    private Integer shopID;
+    /**
+    机构id
+     */
+    private Integer clubID;
+    /**
+   用户类型1.机构2.供应商
+     */
+    private Integer userType;
+    /**
+     消息类型1.交易物流2.账户通知3.服务通知4.优惠促销
+     */
+    private Integer messageType;
+    /**
+     * 消息内容
+     */
+    private String content;
+    /**
+     * 账户通知类型 1.注册成功通知 2.购买超级会员成功 3.超级会员到期提醒 4.超级会员到期提醒 5.升级资质机构成功 6.升级资质机构失败 7.成为机构运营人员通知
+     */
+    private Integer accountType;
+    /**
+     * 操作完成时间
+     */
+    private String time;
+
+    /**
+     * 订单ID
+     */
+    private Integer orderID;
+    /**
+     *交易物流1.下单成功通知  2.订单支付完成 3.退款/货成功通知 4.订单取消通知 5.订单发货通知 6.自动收货通知
+     */
+    private Integer orderMessageType;
+}

src/main/java/com/caimei365/order/model/vo/OrderVo.java

@@ -324,4 +324,18 @@ public class OrderVo implements Serializable {
      * 收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划
      */
     private Integer newReceiptType;
+    /**
+     * 商品名称
+     */
+    private String proName;
+    /**
+     * 商品数量
+     */
+    private Integer proCount;
+    /**
+     *   下单人电话
+     */
+  private String mobile;
+
+
 }

src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.caimei365.order.components.ProductService;
 import com.caimei365.order.mapper.BaseMapper;
 import com.caimei365.order.mapper.CartClubMapper;
+import com.caimei365.order.mapper.OrderClubMapper;
 import com.caimei365.order.mapper.OrderCommonMapper;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.CartDto;
@@ -12,13 +13,16 @@ import com.caimei365.order.model.dto.InvoiceDto;
 import com.caimei365.order.model.po.CartPo;
 import com.caimei365.order.model.vo.*;
 import com.caimei365.order.service.CartClubService;
+import com.caimei365.order.service.RemoteCallService;
 import com.caimei365.order.utils.MathUtil;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AtomicDouble;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import redis.clients.jedis.Jedis;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -53,7 +57,13 @@ public class CartClubServiceImpl implements CartClubService {
     @Resource
     private OrderCommonMapper orderCommonMapper;
     @Resource
+    private OrderClubMapper orderClubMapper;
+    @Resource
     private ProductService productService;
+    @Resource
+    private RemoteCallService remoteCallService;
+    @Value("${spring.cloud.config.profile}")
+    private String profile;
 
     /**
      * 购物车列表详细数据

src/main/java/com/caimei365/order/service/impl/HeliPayNonOrderServiceImpl.java

@@ -801,6 +801,79 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         //修改分账付款状态
         payOrderMapper.updateSplitAccountByPay(mbOrderId);
         //已支付推送
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String current = dateFormat.format(new Date());
+        //1.日期格式
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        String endTime = sdf.format(dbUserVip.getEndTime());
+        //2.会员有效期(月)
+        Long s = (dbUserVip.getEndTime().getTime() - dbUserVip.getBeginTime().getTime()) / 24 / 60 / 60 / 30 / 1000;
+        //2.会员有效期(日)
+        Long t = (dbUserVip.getEndTime().getTime() - dbUserVip.getBeginTime().getTime()) / 24 / 60 / 60 / 1000;
+        Integer count =orderClubMapper.getVipHistoryCount(userId);
+        //推送信息中心-账户通知
+        Integer clubId = orderClubMapper.clubIdCule(userId);
+        if (clubId != null) {
+            //3.输出间隔天数         getTime获取的是毫秒
+            log.info("输出间隔月份----------->"+ s);
+            MessageCenter messageCenter = new MessageCenter();
+            messageCenter.setShopID(null);
+            messageCenter.setClubID(clubId);
+            messageCenter.setUserType(1);
+            messageCenter.setMessageType(2);
+            messageCenter.setAccountType(2);
+            messageCenter.setContent(s + "个月");
+            messageCenter.setTime(current);
+            orderClubMapper.addMessageCenter(messageCenter);
+        }
+        if(count==0){
+            String name = "0";
+            try {
+                log.info("***********会员办理微信公众号推送************");
+                String accessToken = weChatService.getAccessToken();
+                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.FromUnionId(userId));
+                name = "恭喜成为采美商城超级会员";
+                String time="超级会员（"+s+"个月）";
+                String dates=s+"天";
+                Double money =  amount;
+                String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
+                // 跳转到【小程序付款-选择支付方式页面】
+                String pagePath = "/pages/user/member/member";
+                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
+
+                for (String openid : openidList) {
+                    weChatService.sendTempl(accessToken, openid, name, time, money.toString(), dates, remarkText, pagePath);
+                    log.error("获取openid>>>>>" + openid);
+                }
+
+            } catch (Exception e) {
+                log.error("【订单下单通知】获取微信公众号access_token异常！", e);
+            }
+        }else {
+            String name = "0";
+            SimpleDateFormat dnf=new SimpleDateFormat("yyyy年MM月dd日");
+
+            try {
+                log.info("***********会员续费微信公众号推送************");
+                String accessToken = weChatService.getAccessToken();
+                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.FromUnionId(userId));
+                name = "恭喜您成功续费采美超级会员";
+                String type="超级会员";
+                String dates=dnf.format(dbUserVip.getEndTime());
+                String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
+                // 跳转到【小程序付款-选择支付方式页面】
+                String pagePath = "/pages/user/member/member";
+                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
+
+                for (String openid : openidList) {
+                    weChatService.sendTemplss(accessToken, openid,dates,pagePath);
+                }
+            } catch (Exception e) {
+                log.error("【订单下单通知】获取微信公众号access_token异常！", e);
+            }
+        }
+
+
         boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
         String bindMobile = baseMapper.getBindMobileByUserId(userId);
         if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -34,6 +35,7 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * Description
@@ -371,6 +373,7 @@ public class OrderClubServiceImpl implements OrderClubService {
             order.setStatus(31);
             order.setReceiptStatus(3);
         }
+        Integer count=0;
         log.info("********************下单微信公众号消息推送***************************");
         if (0 == order.getSecondHandOrderFlag() && 0 == order.getRebateFlag() && !orderClubMapper.getProductOrder(order.getOrderId()).contains(6060) && order.getOrderType() != 0) {
             log.info("*******" + order.getSecondHandOrderFlag() + "**********" + order.getRebateFlag());
@@ -397,11 +400,62 @@ public class OrderClubServiceImpl implements OrderClubService {
             for (String openid : openidList) {
                 // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
                 weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name,orderno, money, remarkText, pagePath);
+                count++;
             }
         } catch (Exception e) {
             log.error("【订单发货通知】获取微信公众号access_token异常！", e);
         }
+            //推送信息中心-交易物流
+            MessageCenter messageCenter=new MessageCenter();
+            messageCenter.setShopID(null);
+            messageCenter.setClubID(order.getClubId());
+            messageCenter.setUserType(1);
+            messageCenter.setMessageType(1);
+            messageCenter.setOrderMessageType(1);
+            messageCenter.setOrderID(orderId);
+            messageCenter.setContent(null);
+            messageCenter.setTime(curDateStr);
+            orderClubMapper.addMessageCenter(messageCenter);
+
+
+            log.info(">>>>>>>>>>>>>>>>>>>>>>"+orderId);
+            log.info("********************确认订单短信消息推送***************************");
+            if(count<=0){
+                   ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(2);
+            executorService.schedule(new Runnable() {
+                @Override
+                public void run() {
+//                String orderno = orderClubMapper.getOrderNo(orderId);
+                    OrderVo orderVo=orderClubMapper.getOrderMess(orderId);
+
+                    String bindMobile = baseMapper.getBindMobileByUserId(order.getBuyUserId());
+                    log.info(">>>>>>>>>>>>>>>>>>>>>>"+orderId);
+
+                    log.info(">>>>>>>>>>>>>>>>>>>>>>"+orderVo.getProCount());
+                    String name=orderVo.getProName();
+                    if (name.length() > 10) {
+                        name = StringUtils.strip(name.substring(0, 11));
+                        name += "...";
+                    }
+                    if(orderVo.getPayFlag()==1 && orderVo.getOnlinePayFlag()==0){
+                        String shortLink = remoteCallService.getShortLink(8, 2, "https://www.caimei365.com");
+                        String content = "您已成功下单“"+ name +"”等"+orderVo.getProCount()+"件商品，订单编号："+orderVo.getOrderNo()+"订单等待支付，支付完成后采美将尽快安排发货。您可点击采美网址www.caimei365.com或使用微信小程序“采美采购商城”查看并支付订单。";
+                        boolean sendSms = remoteCallService.getSendSms(2, bindMobile, content);
+                        if (!sendSms) {
+                            log.info("》》》》》》》》》》》》》》》》协销下单短信推送失败");
+                        }else {
+                            log.info("》》》》》》》》》》》》》》》》协销下单短信推送成功");
+                        }
+                    }
+                }
+            }, 300000, TimeUnit.MILLISECONDS);
+            }else {log.info("》》》》》推送了协销下单短信");}
+
+
         }
+
+
+
         order.setUpdateDate(curDateStr);
         order.setConfirmTime(curDateStr);
         //确认订单状态
@@ -470,6 +524,19 @@ public class OrderClubServiceImpl implements OrderClubService {
                 }
             });
         }
+        //推送信息中心-取消订单
+        MessageCenter messageCenter=new MessageCenter();
+        messageCenter.setShopID(null);
+        messageCenter.setClubID(order.getClubId());
+        messageCenter.setUserType(1);
+        messageCenter.setMessageType(1);
+        messageCenter.setOrderMessageType(4);
+        messageCenter.setOrderID(orderId);
+        messageCenter.setContent("您的订单已成功取消！");
+        messageCenter.setTime(curDateStr);
+        orderClubMapper.addMessageCenter(messageCenter);
+
+
         // 退回 采美豆
         if (null != order.getUserBeans() && order.getUserBeans() > 0) {
             UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
@@ -505,8 +572,6 @@ public class OrderClubServiceImpl implements OrderClubService {
                 productService.updateUserBeans(beansHistory, beans, note);
             }
         }
-
-
         //取消订单短信推送（取消推送）
         if(orderClubMapper.getProductOrder(orderId).contains(6060)) {
             String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -250,6 +250,19 @@ public class PayOrderServiceImpl implements PayOrderService {
                 } catch (Exception e) {
                     log.error("【订单发货通知】获取微信公众号access_token异常！", e);
                 }
+
+                //推送信息中心-交易物流
+                MessageCenter messageCenter=new MessageCenter();
+                messageCenter.setShopID(null);
+                messageCenter.setClubID(order.getClubId());
+                messageCenter.setUserType(1);
+                messageCenter.setMessageType(1);
+                messageCenter.setOrderMessageType(2);
+                messageCenter.setOrderID(orderId);
+                messageCenter.setContent(null);
+                messageCenter.setTime(curDateStr);
+                orderClubMapper.addMessageCenter(messageCenter);
+
             }
             log.info("支付成功" + order.getUserId());
         }
@@ -946,6 +959,19 @@ public class PayOrderServiceImpl implements PayOrderService {
                 } catch (Exception e) {
                     log.error("【订单发货通知】获取微信公众号access_token异常！", e);
                 }
+
+                //推送信息中心-交易物流
+                MessageCenter messageCenter=new MessageCenter();
+                messageCenter.setShopID(null);
+                messageCenter.setClubID(order.getClubId());
+                messageCenter.setUserType(1);
+                messageCenter.setMessageType(1);
+                messageCenter.setOrderMessageType(2);
+                messageCenter.setOrderID(orderId);
+                messageCenter.setContent(null);
+                messageCenter.setTime(curDateStr);
+                orderClubMapper.addMessageCenter(messageCenter);
+
             }
             log.info("支付成功2");
         } else {

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -1736,6 +1737,20 @@ public class ReceiptServiceImpl implements ReceiptService {
                             } catch (Exception e) {
                                 log.error("【订单发货通知】获取微信公众号access_token异常！", e);
                             }
+                            Date date = new Date();
+                            String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+
+                            //推送信息中心-交易物流
+                            MessageCenter messageCenter=new MessageCenter();
+                            messageCenter.setShopID(null);
+                            messageCenter.setClubID(order.getClubId());
+                            messageCenter.setUserType(1);
+                            messageCenter.setMessageType(1);
+                            messageCenter.setOrderMessageType(2);
+                            messageCenter.setOrderID(order.getOrderId());
+                            messageCenter.setContent(null);
+                            messageCenter.setTime(curDateStr);
+                            orderClubMapper.addMessageCenter(messageCenter);
                         }
                     }
                 }

src/main/java/com/caimei365/order/service/impl/RemoteCallServiceImpl.java

@@ -75,6 +75,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
             list.add("15814011616");
             list.add("13100721916");
             list.add("15113936829");
+            list.add("18175515644");
             if ("prod".equals(profile) || list.contains(mobile)) {
                 if (StringUtils.isNotBlank(mobile) && mobile.length() == 11) {
                     String regex = "^(1[3-9]\\d{9}$)";

src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -638,6 +638,20 @@ public class ShipServiceImpl implements ShipService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return ResponseJson.error("物流信息参数异常！", null);
             }
+
+            //推送信息中心-交易物流
+            String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+            MessageCenter messageCenter=new MessageCenter();
+            messageCenter.setShopID(logisticsBatch.getShopId());
+            messageCenter.setClubID(null);
+            messageCenter.setUserType(2);
+            messageCenter.setMessageType(1);
+            messageCenter.setOrderMessageType(5);
+            messageCenter.setOrderID(logisticsBatch.getOrderId());
+            messageCenter.setContent(null);
+            messageCenter.setTime(curDateStr);
+            orderClubMapper.addMessageCenter(messageCenter);
+
             LogisticsInformationPo logisticsInformation = new LogisticsInformationPo();
             logisticsInformation.setLogisticsBatchId(logisticsBatch.getId());
             logisticsInformation.setType("1");

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -580,6 +580,7 @@ public class SubmitServiceImpl implements SubmitService {
                             discountPrice = promotions.getTouchPrice();
                         }
                     }
+
                     //有阶梯价
                     else if (1 == product.getLadderPriceFlag()) {
                         // 启用了阶梯价格
@@ -1095,6 +1096,17 @@ public class SubmitServiceImpl implements SubmitService {
         submitMapper.insertMainOrder(mainOrder);
         log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增主订单(insert[cm_order])orderId：" + mainOrder.getOrderId());
 
+        //推送信息中心-交易物流
+        MessageCenter messageCenter=new MessageCenter();
+        messageCenter.setShopID(null);
+        messageCenter.setClubID(orderParamBo.getClubId());
+        messageCenter.setUserType(1);
+        messageCenter.setMessageType(1);
+        messageCenter.setOrderMessageType(1);
+        messageCenter.setOrderID(mainOrder.getOrderId());
+        messageCenter.setContent(null);
+        messageCenter.setTime(curDateStr);
+        orderClubMapper.addMessageCenter(messageCenter);
 
         /**
          * 保存订单促销,返回订单促销Id

src/main/java/com/caimei365/order/task/DelayedSplittingTask.java

@@ -39,4 +39,6 @@ public class DelayedSplittingTask {
     public void couponCheck() {
         payOrderService.couponCheck();
     }
+
+
 }

src/main/resources/mapper/OrderClubMapper.xml

@@ -333,7 +333,7 @@
             clauseID AS clauseId,
             clauseName
         FROM cm_order
-        WHERE delFlag = 0 AND userID = #{userId} and (orderSeen is null or orderSeen != 2)
+        WHERE delFlag = 0 AND userID = #{userId} and (orderseen IS NULL OR orderseen!=2)
         <if test="orderState == 1 ">
             AND status = '0'
         </if>
@@ -544,6 +544,30 @@
         WHERE cmp.orderId=#{orderId}
     </select>
 
+    <select id="getOrderMess" resultType="com.caimei365.order.model.vo.OrderVo">
+        SELECT DISTINCT p.`name` AS proName,cm.payFlag AS payFlag,cm.onlinePayFlag AS onlinePayFlag,COUNT(p.name)AS proCount,u.`mobile`AS mobile,cm.orderNo AS orderNo
+        FROM `cm_order` cm
+         LEFT JOIN cm_order_product cmp ON cm.orderID = cmp.orderID
+         LEFT JOIN  product p ON p.productID=cmp.productID
+         LEFT JOIN `user` u ON u.`userID` = cm.userId
+        WHERE cm.orderId=#{orderId}
+    </select>
+
+    <select id="getcartNess" resultType="com.caimei365.order.model.vo.OrderVo">
+        SELECT DISTINCT p.`name` AS proName,cm.payFlag AS payFlag,cm.onlinePayFlag AS onlinePayFlag,COUNT(p.name)AS proCount,u.`bindMobile`AS mobile,cm.orderNo AS orderNo
+        FROM `cm_order` cm
+        LEFT JOIN cm_order_product cmp ON cm.orderID = cmp.orderID
+        LEFT JOIN  product p ON p.productID=cmp.productID
+        LEFT JOIN `user` u ON u.`userID` = cm.userId
+        WHERE cm.userID=#{userID}
+    </select>
+
+    <select id="userIds" resultType="java.lang.Integer">
+        SELECT  DISTINCT userID FROM cm_cart
+        WHERE
+            YEAR(`addTime`)>YEAR(NOW())-3 AND userID IS NOT NULL
+    </select>
+
     <select id="getClubCouponById" resultType="com.caimei365.order.model.vo.CouponVo">
         SELECT
         a.id AS clubCouponId,
@@ -599,4 +623,21 @@
     <select id="FromUnionId" resultType="java.lang.String">
         SELECT unionID FROM `cm_order` WHERE orderID=#{orderId}
     </select>
+
+
+    <insert id="addMessageCenter">
+        INSERT INTO message_center (shopID, clubID, userType, messageType, content,time,orderMessageType,orderID,accountType)
+        VALUES (#{shopID}, #{clubID}, #{userType}, #{messageType}, #{content},#{time},#{orderMessageType},#{orderID},#{accountType})
+    </insert>
+
+    <select id="getVipHistoryCount" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM cm_svip_history
+        WHERE  userId = #{userId}
+    </select>
+
+    <select id="clubIdCule" resultType="java.lang.Integer">
+        SELECT clubID FROM `user` WHERE userId=#{userId}
+    </select>
+
 </mapper>