增加消息主题

src/main/java/com/uas/platform/b2c/trade/order/model/AdminToDo.java

@@ -1,9 +1,6 @@
 package com.uas.platform.b2c.trade.order.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -60,6 +57,12 @@ public class AdminToDo implements Serializable {
     @Column(name = "type")
     private String type;
 
+    /**
+     * 消息主题
+     */
+    @Transient
+    private String message;
+
     public String getOrderid() {
         return orderid;
     }
@@ -131,4 +134,13 @@ public class AdminToDo implements Serializable {
         this.id = id;
         return this;
     }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public AdminToDo setMessage(String message) {
+        this.message = message;
+        return this;
+    }
 }

src/main/java/com/uas/platform/b2c/trade/order/service/impl/AdminToDoServiceImpl.java

@@ -3,11 +3,13 @@ package com.uas.platform.b2c.trade.order.service.impl;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.trade.order.dao.AdminToDoDao;
 import com.uas.platform.b2c.trade.order.model.AdminToDo;
 import com.uas.platform.b2c.trade.order.model.MessageNotifyPersonalManagement;
 import com.uas.platform.b2c.trade.order.service.AdminToDoService;
 import com.uas.platform.b2c.trade.order.service.MessageNotifyPersonalManagementService;
+import com.uas.platform.b2c.trade.order.type.MessageType;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,11 @@ public class AdminToDoServiceImpl implements AdminToDoService {
 
     private final MessageNotifyPersonalManagementService messageNotifyPersonalManagementService;
 
+    private final String CONFIRM_PAID_MESSAGE = "订单%s 买家已经付款成功，请确认是否收款成功";
+
+    private final String APPLY_PAID_MESSAGE = "订单%s 买家已确认收货，请尽快申请付款";
+
+    private final String FINANCIAL_SETTLEMENT_MESSAGE = "订单%s 已交易成功，请尽快和卖家结清货款";
     @Autowired
     public AdminToDoServiceImpl(AdminToDoDao adminToDoDao, MessageNotifyPersonalManagementService messageNotifyPersonalManagementService) {
         this.adminToDoDao = adminToDoDao;
@@ -75,6 +82,16 @@ public class AdminToDoServiceImpl implements AdminToDoService {
                 return null;
             }
         }, info);
+        List<AdminToDo> content = adminToDos.getContent();
+        for (AdminToDo adminToDo : content) {
+            if (StringUtilB2C.equals(adminToDo.getType(), MessageType.CONFIRM_PAID.getType())) {
+                adminToDo.setMessage(String.format(CONFIRM_PAID_MESSAGE, adminToDo.getOrderid()));
+            } else if (StringUtilB2C.equals(adminToDo.getType(), MessageType.APPLY_PAID.getType())) {
+                adminToDo.setMessage(String.format(APPLY_PAID_MESSAGE, adminToDo.getOrderid()));
+            } else {
+                adminToDo.setMessage(String.format(FINANCIAL_SETTLEMENT_MESSAGE, adminToDo.getOrderid()));
+            }
+        }
         return adminToDos;
     }
 }