消息反馈 站内信

src/main/java/com/uas/platform/b2c/common/message/service/impl/InternalMessageServiceImpl.java

@@ -51,6 +51,11 @@ public class InternalMessageServiceImpl implements InternalMessageService {
 
     private static final String MESSAGE_PUBLIC_SERVICE_URL = ContextUtils.getBean(MessageConf.class).getMessagePublicServiceDevUrl();
 
+    /**
+     * 消息类型，公共询价的采纳结果
+     */
+    private final String INQUIRY_DECIDE_TYPE = "公共询价采纳结果";
+
     /**
      * 消息类型 （在MALL消息中拼接跳转单据详情url请求时需要）
      */
@@ -64,12 +69,12 @@ public class InternalMessageServiceImpl implements InternalMessageService {
     /**
      * 消息类型 （在MALL消息中拼接求购询价待报价）
      */
-    private final String INQUIRY_TYPE_SELLER_MALL = "MALL公共询价";
+    private final String INQUIRY_TYPE_SELLER_MALL = "MALL跳转卖家待报价页面";
 
     /**
      * 消息类型 （在B2B消息中拼接跳转单据详情url请求时需要）
      */
-    private final String INQUIRY_TYPE_MALL = "公共询价";
+    private final String INQUIRY_TYPE_MALL = "MALL公共询价";
 
 
     @Autowired
@@ -263,7 +268,8 @@ public class InternalMessageServiceImpl implements InternalMessageService {
             params.put("messageId", idString.toString());
             params.put("receiverUu", SystemSession.getUser().getUserUU());
             params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
-            params.put("consumerApp", "B2B");
+            params.put("consumerApp", "MALL");
+
             String res = HttpUtil.doPost(MESSAGE_PUBLIC_SERVICE_URL + "/messages/read", FlexJsonUtils.toJsonDeep(params));
         }
 
@@ -283,7 +289,7 @@ public class InternalMessageServiceImpl implements InternalMessageService {
         HashMap<String, Object> params = new HashMap<>();
         params.put("receiverUu", userUU);
         params.put("receiverEnuu", enUU);
-        params.put("consumerApp", "B2B");
+        params.put("consumerApp", "MALL");
         params.put("isRead", isRead == null ? "" : isRead);
         HttpUtil.Response res = HttpUtil.sendGetRequest(MESSAGE_PUBLIC_SERVICE_URL + "/messages/count", params);
         if (res.getStatusCode() == HttpStatus.OK.value() && null != res.getResponseText()) {
@@ -327,11 +333,11 @@ public class InternalMessageServiceImpl implements InternalMessageService {
                 if (messageModelPage != null) {
                     for (MessageModel messageModel : messageModelPage.getContent()) {
                         // 拼接公共询价链接
-                        if (INQUIRY_TYPE_MALL.equals(messageModel.getType())) {
+                        if (INQUIRY_TYPE_MALL.equals(messageModel.getType()) ) {
                             messageModel.setUrl("/user#/seekPurchase" );
-                        } else if (INQUIRY_DECIDE_TYPE_MALL.equals(messageModel.getType())) {
+                        } else if (INQUIRY_DECIDE_TYPE_MALL.equals(messageModel.getType())||INQUIRY_DECIDE_TYPE.equals(messageModel.getType())) {
                             messageModel.setUrl("/vendor#/vendorPurchaseOffer" );
-                        } else if (INQUIRY_TYPE_SELLER_MALL.equals(messageModel.getType())) {
+                        } else if (INQUIRY_TYPE_SELLER_MALL.equals(messageModel.getType())||INQUIRY_TYPE.equals(messageModel.getType())) {
                             messageModel.setUrl("/vendor#/seekPurchase" );
                         }
                     }

src/main/webapp/resources/view/usercenter/forstore/messagePersonal.html

@@ -115,7 +115,7 @@
     }
     .com-massage ul li a.link:hover{
         color: #5078cb;
-        text-decoration: underline ;
+        text-decoration: underline;
     }
     .com-massage ul li a.noLink:hover{
         color: #333;

src/main/webapp/resources/view/vendor/forstore/messagePersonal.html

@@ -104,7 +104,7 @@
     }
     .com-massage ul li a.link:hover{
         color: #5078cb;
-        text-decoration: underline ;
+        text-decoration: underline;
     }
     .com-massage ul li a.noLink:hover{
         color: #333;

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -699,8 +699,8 @@
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
                 <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
                 <td class="operate" ng-switch="seek.agreed">
-                    <a ng-click="setLinkBoxIndex($index)">联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                    <div class="is-say-price" ng-if="seek.agreed != 1">已报价 <img src="static/img/seekPurchase/check.png" alt="">
+                    <a ng-click="setLinkBoxIndex($index)">联系买家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                    <div class="is-say-price" ng-if="seek.agreed != 1 &&seek.agreed != -1">已报价 <img src="static/img/seekPurchase/check.png" alt="">
                         <div class="say-price-history">
                             <p class="price-title">历史报价</p>
                             <div>
@@ -724,6 +724,7 @@
                         </div>
                     </div>
                     <img ng-if="seek.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="">
+                    <img ng-if="seek.agreed == -1" src="static/img/seekPurchase/refused.png" alt="">
                 </td>
             </tr>
             <!--