Browse Source

站内消息

Duan_xu 2 years ago
parent
commit
a50b6395d4

+ 2 - 0
src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -326,4 +326,6 @@ public interface OrderClubMapper {
     Integer findUserId(Integer orderId);
 
     void insertCouponRecord(CouponRecordPo couponRecordPo);
+
+    void addMessageCenter(MessageCenter messageCenter);
 }

+ 53 - 0
src/main/java/com/caimei365/order/model/vo/MessageCenter.java

@@ -0,0 +1,53 @@
+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;
+    /**
+     * 操作完成时间
+     */
+    private String time;
+
+    /**
+     * 订单ID
+     */
+    private Integer orderID;
+    /**
+     *交易物流1.下单成功通知  2.订单支付完成 3.退款/货成功通知 4.订单取消通知 5.订单发货通知 6.自动收货通知
+     */
+    private Integer orderMessageType;
+}

+ 25 - 0
src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -404,6 +404,17 @@ public class OrderClubServiceImpl implements OrderClubService {
         } 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);
         }
         order.setUpdateDate(curDateStr);
         order.setConfirmTime(curDateStr);
@@ -412,6 +423,7 @@ public class OrderClubServiceImpl implements OrderClubService {
         // 更新订单状态
         orderClubMapper.updateOrderStatus(order);
 
+
         return ResponseJson.success("确认订单成功!", null);
     }
 
@@ -473,6 +485,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();

+ 26 - 0
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 {

+ 15 - 0
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);
                         }
                     }
                 }

+ 12 - 0
src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -573,6 +573,7 @@ public class SubmitServiceImpl implements SubmitService {
                             discountPrice = promotions.getTouchPrice();
                         }
                     }
+
                     //有阶梯价
                     else if (1 == product.getLadderPriceFlag()) {
                         // 启用了阶梯价格
@@ -1085,6 +1086,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

+ 7 - 0
src/main/resources/mapper/OrderClubMapper.xml

@@ -599,4 +599,11 @@
     <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)
+        VALUES (#{shopID}, #{clubID}, #{userType}, #{messageType}, #{content},#{time},#{orderMessageType},#{orderID})
+    </insert>
+
 </mapper>