暂时去掉短信推送改为微信推送

src/main/java/com/uas/ps/inquiry/AccessConfiguration.java

@@ -23,6 +23,20 @@ public class AccessConfiguration {
     @Value("${ps.message.url}")
     private String PsMessageUrl;
 
+    /**
+     * 公共物料访问地址
+     */
+    @Value("${mall.url}")
+    private String mallUrl;
+
+    public String getMallUrl() {
+        return mallUrl;
+    }
+
+    public void setMallUrl(String mallUrl) {
+        this.mallUrl = mallUrl;
+    }
+
     public String getPsProductUrl() {
         return PsProductUrl;
     }

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -491,4 +491,13 @@ public class PublicInquiryController {
         logger.log("公共询价", "获取询价信息", "id: " + itemId, Constant.UU, enuu, InquirySource.B2B.name());
         return publicInquiryService.findItemByItemId(itemId, enuu);
     }
+
+    /**
+     * 公共询价单明细总数
+     * @return
+     */
+    @RequestMapping(value = "/getPurcInquiryItemCount", method = RequestMethod.GET)
+    public ModelMap getPurcInquiryItemCount() {
+        return publicInquiryService.getPurcInquiryItemCount();
+    }
 }

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

@@ -69,6 +69,19 @@ public class MessageModel {
      */
     private String consumerApp;
 
+    /**
+     * 询价方信息
+     */
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getType() {
         return type;
     }

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -247,8 +247,6 @@ public interface PublicInquiryService {
      */
     Page<MessageModel> adoptMessage(PublicInquiryItem item, String sourceApp);
 
-
-
     /**
      * 针对买家，通知买家供应商已报价
      *
@@ -257,5 +255,11 @@ public interface PublicInquiryService {
      * @return
      */
     Page<MessageModel> ReceiveMessage(PublicInquiryItem item, String sourceApp);
+
+    /**
+     * 公共询价单明细总数
+     * @return
+     */
+    ModelMap getPurcInquiryItemCount();
 }
 

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

@@ -161,6 +161,11 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      */
     private final String PS_MESSAGE_URL = ContextUtils.getBean(AccessConfiguration.class).getPsMessageUrl();
 
+    /**
+     * 商城链接
+     */
+    private final String USOFTMALL_URL = ContextUtils.getBean(AccessConfiguration.class).getMallUrl();
+
     /**
      * 日志
      */
@@ -243,13 +248,15 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 User u = userDao.findOne(null != item.getInquiry().getRecorderUU() ? item.getInquiry().getRecorderUU() : 0L);
                                 Enterprise e = enterpriseDao.findOne(item.getInquiry().getEnUU());
                                 String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
-                                String content = "发布关于“型号：" + cmp + "”的公共询价信息，邀请您参与报价。";
+                                String content = "关于“型号：" + cmp + "”的公共询价信息，邀请您参与报价。";
+                                MessageModel model = new MessageModel();
                                 if (null != e) {
-                                    content = e.getEnName() + content;
+//                                    content = e.getEnName() + content;
+                                    model.setName(e.getEnName());
                                 } else if (null != u) {
-                                    content = u.getUserName() + content;
+//                                    content = u.getUserName() + content;
+                                    model.setName(u.getUserName());
                                 }
-                                MessageModel model = new MessageModel();
                                 model.setType(INQUIRY_TYPE);
                                 model.setType(INQUIRY_TYPE_SELLER_MALL);
                                 model.setProducerApp(sourceApp);
@@ -273,8 +280,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 models.add(model);
                                 logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人", "关联询价单明细【" + item.getId() + "】", user.getUseruu(), user.getEnuu(), InquirySource.ERP.name());
                             }
-                            if (!CollectionUtils.isEmpty(models)) {
-                                sendMessage(models);
+                            if (!CollectionUtils.isEmpty(models) && USOFTMALL_URL.equals("https://www.usoftmall.com/")) {
+                                // sendMessage(models);
+                                sendWechatMessage(models);
                             }
 
                             // 生成推荐信息
@@ -290,6 +298,21 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         }
     }
 
+    private void sendWechatMessage(final List<MessageModel> models) {
+        ThreadUtils.task(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    log.info("发送消息实体" + JSON.toJSONString(models));
+                    String res = HttpUtil.doPost(USOFTMALL_URL + "/wx/sendTemplateMessage", FlexJsonUtils.toJsonDeep(models));
+                    log.info("消息请求发送日志" + res);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }).run();
+    }
+
     /**
      * 根据企业UU和物料原厂型号cmpCode获取替代物料信息
      *
@@ -1345,5 +1368,11 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
 
     }
 
-
+    @Override
+    public ModelMap getPurcInquiryItemCount() {
+        ModelMap result = new ModelMap();
+        Long count = inquiryItemInfoDao.count();
+        result.put("count", count);
+        return result;
+    }
 }

src/main/resources/config/application-cloud.properties

@@ -21,3 +21,4 @@ datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMill
 # Access path
 ps.product.url=https://api-product.usoftmall.com/
 ps.message.url=http://api-message.ubtob.com/
+mall.url = https://www.usoftmall.com/

src/main/resources/config/application-dev.properties

@@ -24,4 +24,5 @@ datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMill
 ps.product.url=http://192.168.253.102:8080/
 ps.message.url=http://192.168.253.12:24000/message/
 # wang localhost
-#ps.message.url=http://192.168.253.131:20000/
+#ps.message.url=http://192.168.253.131:20000/
+mall.url = http://192.168.253.12:23400/

src/main/resources/config/application-test.properties

@@ -20,4 +20,5 @@ datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMill
 
 # Access path
 ps.product.url=http://218.17.158.219:24000/
-ps.message.url=http://218.17.158.219:24000/message/
+ps.message.url=http://218.17.158.219:24000/message/
+mall.url = http://192.168.253.12:23400/