联合丽格V1.0.2

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -959,7 +959,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         newOrderDao.insertShortLink(markId, shortLink, url);
         return shortLink;
     }
-
+    @Transactional(readOnly = false)
     public boolean getSendSms(int markId, String mobile, String content) throws Exception {
         String config = Global.getConfig("cm.config");
         //测试环境手机号允许发短信

src/main/java/com/caimei/modules/product/service/ProductNewService.java

@@ -102,7 +102,7 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
             // 上架平台
             List<String> organizeNames = new ArrayList<>();
             if (p.getGroundMall().contains("0")) {
-                organizeName = "【采美集采联盟】平台";
+                organizeName = "【采美】平台";
                 organizeNames.add(organizeName);
             }
             if (p.getGroundMall().contains("4")) {

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -604,44 +604,44 @@
                     <%--商品状态（0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已隐身 10已冻结）--%>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 0}">
                         <font color="#a9a9a9">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】平台</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已删除
                         </font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 1}">
                         <font color="red">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】平台</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             待审核</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 2}">
                         <font color="green">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】平台</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已上架</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 3}">
                         <font color="darkorange">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】平台</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已下架</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 8}">
                         <font color="red">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】平台</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             审核未通过</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 9}">
                         <font color="darkorange">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】平台</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已隐身</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 10}">
                         <font color="darkorange">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】平台</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已冻结</font>
                     </c:if>