Merge branch 'master' into dev

src/main/java/com/uas/ps/inquiry/entity/MessageModel.java

@@ -39,7 +39,7 @@ public class MessageModel {
     /**
      * 消费类型(所有应用共享："PUBLIC",单个应用独享："SINGLE",多个应用共享："MULTI")
      */
-    private String consumeType;
+    private String consumerType;
     /**
      * 推送方式类型
      * 邮件、短信、IM："MAIL_AND_SM_AND_IM"
@@ -129,12 +129,12 @@ public class MessageModel {
         this.producerApp = producerApp;
     }
 
-    public String getConsumeType() {
-        return consumeType;
+    public String getConsumerType() {
+        return consumerType;
     }
 
-    public void setConsumeType(String consumeType) {
-        this.consumeType = consumeType;
+    public void setConsumerType(String consumerType) {
+        this.consumerType = consumerType;
     }
 
     public String getSmsType() {

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -167,8 +167,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      *
      * @param inquiryItems 询价明细
      */
-    private void notify(List<PurcInquiryItem> inquiryItems) {
+    private void notify(List<PurcInquiryItem> inquiryItems) throws Exception {
         for (PurcInquiryItem item : inquiryItems) {
+            Product product = productDao.findOne(item.getProductId());
+            if (null == product) {
+                throw new NotFoundException("询价单" + item.getInquiry().getCode() + "，明细第" + item.getNumber() + "行未找到对应物料");
+            }
             String url = PS_PRODUCT_URL + "/productuser/getProductUsersByEnUUAndCmpCode";
             JSONObject formData = new JSONObject();
             formData.put("enUU", item.getInquiry().getEnUU());
@@ -182,7 +186,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         for (ProductUsers user : users) {
                             User u = userDao.findOne(user.getUseruu());
                             Enterprise e = enterpriseDao.findOne(user.getEnuu());
-                            String content = "发布关于“" + item.getProduct().getTitle() + "”的公共询价信息，邀请您参与报价";
+                            String content = "发布关于“" + product.getTitle() + "”的公共询价信息，邀请您参与报价";
                             if (null != e) {
                                 u.setEnterprise(e);
                                 content = e.getEnName() + content;
@@ -191,14 +195,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             }
                             MessageModel model = new MessageModel();
                             model.setProducerApp(PRODUCERAPP);
-                            model.setConsumeType(CUST_TYPE);
+                            model.setConsumerType(CUST_TYPE);
                             model.setConsumerApp(CONSUMERAPP);
                             model.setContent(content);
-                            model.setRemark("公共询价消息精准推送");
+                            model.setRemark(String.valueOf(item.getId()));
                             model.setReceiverEnuu(user.getEnuu());
-                            model.setReceiverUu(u.getUserUU());
+                            model.setReceiverUu(user.getUseruu());
                             model.setSenderEnuu(item.getInquiry().getEnUU());
-                            model.setSenderUu(item.getUserUU());
+                            model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
                             model.setSmsType(SMS_TYPE);
                             model.setMailTemplate(MAIL_TEMP_ID);
                             model.setSmTemplate(SMS_TEMP_ID);
@@ -225,7 +229,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             @Override
             public void run() {
                 try {
-                    HttpUtil.doPost(PS_MESSAGE_URL, FlexJsonUtils.toJsonDeep(models));
+                    HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }