bugfix

src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java

@@ -17,7 +17,7 @@ import java.util.List;
 @MyBatisDao
 public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
-    String getProductOrder(Integer orderid);
+    List<String> getProductOrder(Integer orderid);
 
     List<String> getOpenidListByPermission(@Param("unionid") String unionid);
 

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

@@ -1709,7 +1709,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                         String time = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
                         String company = StringUtils.strip(logisticsInfo.keySet().toString(), "[]");
                         String companyno = StringUtils.strip(logisticsInfo.values().toString(), "[]");
-                        String pagePath = "pages/user/order/order-details?orderId=" + order.getOrderID();
+                        String pagePath = "pages/user/order/order-details?type=share&orderId="+ order.getOrderID();
                         for (String openid : openidList) {
                             weChatService.sendTemplateMsgy(accessToken, openid, orderNo, time, company, companyno, pagePath);
                         }
@@ -1726,13 +1726,13 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             //推送次数多次发货不推送（只推送一次）
             Date date=new Date();
             logger.info("**************************发货微信消息推送************************************");
-                if ("0".equals(order.getSecondHandOrderFlag()) && "0".equals(order.getRebateFlag())) {
+                if ("0".equals(order.getSecondHandOrderFlag()) && "0".equals(order.getRebateFlag())  && !"6060".equals(newShopOrderDao.getProductOrder(order.getOrderID())) && !"0".equals(order.getOrderType())) {
                     try {
 
                         Integer userid = order.getUserID();
                         String unionid = newShopOrderDao.getOpenidunionId(userid);
                         List<String> openidList = newShopOrderDao.getOpenidListByPermission(unionid);
-                        System.out.println("userid>>>>>>>>>>>>>>>" + userid + "unionid》》》》》》》》》》" + unionid+ "openid》》》》》》》》》" + openidList);
+                        System.out.println("userid>>>>>>>>>>>>>>>" + userid + "unionid》》》》》》》》》》" + newShopOrderDao.getOpenidListByPermission(unionid)+ "openid》》》》》》》》》" + openidList);
                         String accessToken = weChatService.getAccessToken();
                         String orderNo = order.getOrderNo();
                         String time = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);

src/main/java/com/caimei/modules/user/entity/CmRemaks.java

@@ -0,0 +1,44 @@
+package com.caimei.modules.user.entity;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/5/7
+ */
+public class CmRemaks extends DataEntity<CmRemaks> {
+
+    private Integer remarksId;
+
+    private String remarks;
+
+    private String addTime;
+
+    public Integer getRemarksId() {
+        return remarksId;
+    }
+
+    public void setRemarksId(Integer remarksId) {
+        this.remarksId = remarksId;
+    }
+
+    @Override
+    public String getRemarks() {
+        return remarks;
+    }
+
+    @Override
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+}

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -1126,4 +1126,9 @@ public class AgencyController extends BaseController {
     public List<ServiceProviderModel> group(Integer leaderId) {
         return newCmClubService.findGroup(leaderId);
     }
+
+    @RequestMapping("cmrenaks")
+    public String renaks() {
+        return "modules/userNew/cmRemaks";
+    }
 }

src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

@@ -66,6 +66,7 @@
     <li class="active"><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
     <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
     <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
+    <li><a href="${ctx}/new/user/agency/cmrenaks">关键词库</a></li>
 </ul>
 <br/>
 <form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/regist" method="post"

src/main/webapp/WEB-INF/views/modules/userNew/cmRemaks.jsp

@@ -0,0 +1,74 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<html>
+<head>
+    <title>操作日志</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        });
+
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
+        }
+    </script>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li class=""><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
+    <li class="active"><a href="${ctx}/user/cmOperationalLogsShop/">操作日志</a></li>
+</ul>
+<form:form id="searchForm" modelAttribute="cmoperationalLogs" action="${ctx}/user/cmOperationalLogsShop/" method="post"
+           class="breadcrumb form-search">
+    <div class="ul-form">
+        <label>关键字：</label>
+        <form:input path="remarks" name="remarks" htmlEscape="false" maxlength="50" class="input-medium"/>
+    </div>
+</form:form>
+<sys:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>ID</th>
+        <th>关键字</th>
+        <th>添加时间</th>
+        <th>操作</th>
+    </tr>
+    </thead>
+    <tbody>
+<%--    <c:forEach items="${page.list}" var="cmop">--%>
+<%--        <tr>--%>
+<%--            <td>--%>
+<%--                    ${empty cmop.institutionName ? "------" : cmop.institutionName}--%>
+<%--            </td>--%>
+<%--            <td>--%>
+<%--                    ${empty cmop.contact ? "________" : cmop.contact}--%>
+<%--            </td>--%>
+<%--            <td>--%>
+<%--            <fmt:formatDate value="${cmop.operationtime}" pattern="yyyy-MM-dd HH:mm:ss"/>--%>
+<%--        </td>--%>
+<%--            <td>--%>
+<%--                    ${empty cmop.operationtype ? "_______" : cmop.operationtype}--%>
+<%--            </td>--%>
+<%--            --%>
+<%--        </tr>--%>
+<%--    </c:forEach>--%>
+    </tbody>
+</table>
+<div class="pagination">${page}</div>
+</body>
+</html>