Browse Source

代码调整

liusw 7 years ago
parent
commit
d5bcd2f08f

+ 8 - 7
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -257,7 +257,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
                                 String content = "发布关于“型号:" + cmp + "”的公共询价信息,邀请您参与报价。";
                                 MessageModel model = new MessageModel();
-                                // 询价方信息
+
                                 if (null != buyerEnterprise) {
                                     content = buyerEnterprise.getEnName() + content;
                                     model.setBuyerName(buyerEnterprise.getEnName());
@@ -265,6 +265,13 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                     content = buyerUser.getUserName() + content;
                                     model.setBuyerName(buyerUser.getUserName());
                                 }
+                                // 询价方信息
+                                if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
+                                    model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
+                                } else {
+                                    Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
+                                    model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
+                                }
                                 model.setSenderEnuu(item.getInquiry().getEnUU());
                                 model.setCmpCode(cmpCode);
                                 model.setType(INQUIRY_TYPE);
@@ -282,12 +289,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 }
                                 model.setReceiverEnuu(user.getEnuu());
                                 model.setReceiverUu(user.getUseruu());
-                                if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
-                                    model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
-                                } else {
-                                    Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
-                                    model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
-                                }
                                 model.setSmsType("DONT_SEND");
                                 model.setMailTemplate(MAIL_TEMP_ID);
                                 model.setSmTemplate(SMS_TEMP_ID);