Browse Source

会员项目列表新增字段

anderx 3 years ago
parent
commit
36b83f7cdf

+ 3 - 2
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1734,8 +1734,9 @@
 
   <select id="findMemberList" resultType="com.goafanti.order.bo.OutMemberList">
     select a.id,b.contract_no contractNo,c.buyer_name userName,a.order_no orderNo,b.approval ,c.dep_name depName,
-           c.salesman_name salesmanName,c.finance_name financeName,a.commodity_name projectName,a.task_comment projectComment,
-           a.process_status status
+    c.salesman_name salesmanName,c.finance_name financeName,a.commodity_name projectName,a.member_type memberType,
+    a.process_status status,a.commodity_id commodityId,a.commodity_name commodityName,
+    a.commodity_quantity commodityQuantity,a.task_comment taskComment
     from t_order_task a left join t_order_new b on a.order_no =b.order_no
     left join t_order_mid c on a.order_no =c.order_no
     <if test="shiroType ==2">

+ 47 - 8
src/main/java/com/goafanti/order/bo/OutMemberList.java

@@ -21,10 +21,56 @@ public class OutMemberList {
     @Excel(name = "会员项目")
     private String projectName;
     @Excel(name = "项目说明")
-    private String projectComment;
+    private String taskComment;
     @Excel(name = "状态",readConverterExp = "0=非审核,1=财务审核,2=特批审核,3=通过,4=驳回")
     private String status;
 
+    private String commodityId;
+    private String commodityName;
+    private Integer memberType;
+    private Integer commodityQuantity;
+
+
+    public String getCommodityId() {
+        return commodityId;
+    }
+
+    public void setCommodityId(String commodityId) {
+        this.commodityId = commodityId;
+    }
+
+    public String getCommodityName() {
+        return commodityName;
+    }
+
+    public void setCommodityName(String commodityName) {
+        this.commodityName = commodityName;
+    }
+
+    public Integer getMemberType() {
+        return memberType;
+    }
+
+    public void setMemberType(Integer memberType) {
+        this.memberType = memberType;
+    }
+
+    public Integer getCommodityQuantity() {
+        return commodityQuantity;
+    }
+
+    public void setCommodityQuantity(Integer commodityQuantity) {
+        this.commodityQuantity = commodityQuantity;
+    }
+
+    public String getTaskComment() {
+        return taskComment;
+    }
+
+    public void setTaskComment(String taskComment) {
+        this.taskComment = taskComment;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -97,13 +143,6 @@ public class OutMemberList {
         this.projectName = projectName;
     }
 
-    public String getProjectComment() {
-        return projectComment;
-    }
-
-    public void setProjectComment(String projectComment) {
-        this.projectComment = projectComment;
-    }
 
     public String getStatus() {
         return status;

+ 18 - 6
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -786,9 +786,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Integer noticType=NoticeStatus.ORDER_DUN.getCode();
 		if (type==1){
 			noticType=NoticeStatus.MENBER_DUN.getCode();
-			sb=sb.append("[").append(b.getUserName()).append("]催款截点将于").append(o.getCustomizeTimes()).append("进行催款,会员项目请提前2个月催款,以免延误会员派单");
+			sb=sb.append("客户名称【").append(b.getUserName()).append("】催款截点将于").append(o.getCustomizeTimes()).append("进行催款,会员项目请提前2个月催款,以免延误会员派单");
 		}else {
-			sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
+			sb=sb.append("客户名称【").append(b.getUserName()).append("】,按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
 		}
 		addNotic(noticType, b,sb.toString());
 		try {
@@ -1193,10 +1193,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void addNotic(Integer type,  TOrderNewBo b,String str) {
 		String aid=null;
 		StringBuffer sb=new StringBuffer();
+		//预设值 默认发给营销员
+		aid=b.getSalesmanId();
 		if (str==null){
-			if (type==NoticeStatus.ORDER_ARREARS_DUN.getCode()||type==NoticeStatus.PAYMENT_DUN.getCode()||type==NoticeStatus.ORDER_DUN.getCode()){
-				sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
-				aid=b.getSalesmanId();
+			if (type==NoticeStatus.ORDER_ARREARS_DUN.getCode()||type==NoticeStatus.PAYMENT_DUN.getCode()||
+					type==NoticeStatus.ORDER_DUN.getCode()||type==NoticeStatus.MENBER_DUN.getCode()){
+				sb=sb.append("客户名称【").append(b.getUserName()).append("】,按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
 			}
 		}else {
 			sb=sb.append(str);
@@ -1234,10 +1236,21 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (admins!=null&&admins.size()>0){
 			for (Admin admin : admins) {
 				addNotic(type,admin.getId(),sb.toString());
+				sendMemberEmail(type,admin.getId(),sb.toString());
 			}
 		}else {
 			addNotic(type,aid,sb.toString());
+			sendMemberEmail(type,aid,sb.toString());
+		}
+	}
+
+	private void sendMemberEmail(Integer type,String aid,String content) {
+		Admin admin = adminMapper.selectByPrimaryKey(aid);
+		EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), admin.getEmail(),content);
+		if(StringUtils.isNotBlank(admin.getEmail())) {
+			asyncUtils.send(bo);
 		}
+		LoggerUtils.debug(logger, "=========================================发送邮件成功");
 	}
 
 
@@ -1248,7 +1261,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * @param str 信息
 	 */
 	public void addNotic(Integer type, String  aid,String str) {
-
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
 		n.setAid(aid);