Browse Source

主动报价消息内容修改。

dongbw 8 years ago
parent
commit
b3ccfd75af

+ 4 - 4
src/main/java/com/uas/platform/b2b/event/SaleQuotationDecideReleaseEvent.java

@@ -37,8 +37,8 @@ public class SaleQuotationDecideReleaseEvent extends SaveReleaseEvent<PagingRele
             emUU = 1L;
             emUU = 1L;
         }
         }
         String emName = "操作员";
         String emName = "操作员";
-        if (item.getQuotation().getUser() != null) {
-            emName = quotation.getUser().getUserName();
+        if (item.getQuotation().getCustUser() != null) {
+            emName = quotation.getCustUser().getUserName();
         }
         }
         Long enUU = quotation.getCustUU();
         Long enUU = quotation.getCustUU();
         Date date = new Date();
         Date date = new Date();
@@ -58,9 +58,9 @@ public class SaleQuotationDecideReleaseEvent extends SaveReleaseEvent<PagingRele
         Short orderStatus = quotation.getStatus();
         Short orderStatus = quotation.getStatus();
         String context;
         String context;
         if (item.getAgreed() == Constant.YES) {
         if (item.getAgreed() == Constant.YES) {
-            context = quotation.getEnterprise().getEnName() + "的" + emName + "采纳了您的报价(" + codeValue + ")!";
+            context = quotation.getCust().getEnName() + "的" + emName + "采纳了您的报价(" + codeValue + ")!";
         } else {
         } else {
-            context = quotation.getEnterprise().getEnName() + "的" + emName + "未采纳您的报价(" + codeValue + ")!";
+            context = quotation.getCust().getEnName() + "的" + emName + "未采纳您的报价(" + codeValue + ")!";
         }
         }
 
 
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type,
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type,

+ 3 - 3
src/main/java/com/uas/platform/b2b/event/SaleQuotationInvalidReleaseEvent.java

@@ -37,8 +37,8 @@ public class SaleQuotationInvalidReleaseEvent extends SaveReleaseEvent<PagingRel
             emUU = 1L;
             emUU = 1L;
         }
         }
         String emName = "操作员";
         String emName = "操作员";
-        if (quotation.getUser() != null) {
-            emName = quotation.getUser().getUserName();
+        if (quotation.getCustUser() != null) {
+            emName = quotation.getCustUser().getUserName();
         }
         }
         Long enUU = quotation.getCustUU();
         Long enUU = quotation.getCustUU();
         Date date = new Date();
         Date date = new Date();
@@ -56,7 +56,7 @@ public class SaleQuotationInvalidReleaseEvent extends SaveReleaseEvent<PagingRel
         Long sourceId = quotation.getId();
         Long sourceId = quotation.getId();
         String url = "sale/quotation/" + quotation.getId();
         String url = "sale/quotation/" + quotation.getId();
         Short orderStatus = quotation.getStatus();
         Short orderStatus = quotation.getStatus();
-        String context = quotation.getEnterprise().getEnName() + "的" + emName + "作废了您的主动报价单(" + codeValue + ")!";
+        String context = quotation.getCust().getEnName() + "的" + emName + "作废了您的主动报价单(" + codeValue + ")!";
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type,
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type,
                 isReply, category, table, sourceId, orderStatus, toVendor, url);
                 isReply, category, table, sourceId, orderStatus, toVendor, url);
         Long vendUU = quotation.getEnUU();
         Long vendUU = quotation.getEnUU();