bugfix

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

@@ -19,7 +19,7 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     String getProductOrder(Integer orderid);
 
-    List<String> getOpenidListByPermission(@Param("userid")Integer userid,@Param("unionid") String unionid);
+    List<String> getOpenidListByPermission(@Param("unionid") String unionid);
 
     int deleteByOrderID(@Param("orderID") Integer orderID);
 

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

@@ -1697,13 +1697,14 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             Date date=new Date();
             logger.info("****************************发货微信消息推送************************************");
             if("1".equals(order.getSendOutStatus())){
-                if ("0".equals(order.getSecondHandOrderFlag()) && "0".equals(order.getRebateFlag()) && "6060".equals(newShopOrderDao.getProductOrder(order.getOrderID()))) {
+                if ("0".equals(order.getSecondHandOrderFlag()) && "0".equals(order.getRebateFlag()) && !"6060".equals(newShopOrderDao.getProductOrder(order.getOrderID())) && !"0".equals(order.getOrderType())) {
                     try {
-                        String accessToken = weChatService.getAccessToken();
+
                         Integer userid = order.getUserID();
-                        String unionid = newShopOrderDao.getOpenidunionId(order.getUserID());
-                        List<String> openidList = newShopOrderDao.getOpenidListByPermission(userid, unionid);
-                        logger.info("userid>>>>>>>>>>>>>>>" + order.getUserID() + "unionid》》》》》》》》》》" + newShopOrderDao.getOpenidunionId(order.getUserID()) + "openid》》》》》》》》》" + openidList);
+                        String unionid = newShopOrderDao.getOpenidunionId(userid);
+                        List<String> openidList = newShopOrderDao.getOpenidListByPermission(unionid);
+                        System.out.println("userid>>>>>>>>>>>>>>>" + userid + "unionid》》》》》》》》》》" + unionid + "openid》》》》》》》》》" + openidList);
+                        String accessToken = weChatService.getAccessToken();
                         String orderNo = order.getOrderNo();
                         String time = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
                         String company = StringUtils.strip(logisticsInfo.keySet().toString(), "[]");
@@ -1727,11 +1728,12 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             logger.info("**************************发货微信消息推送************************************");
                 if ("0".equals(order.getSecondHandOrderFlag()) && "0".equals(order.getRebateFlag())) {
                     try {
-                        String accessToken = weChatService.getAccessToken();
+
                         Integer userid = order.getUserID();
-                        String unionid = newShopOrderDao.getOpenidunionId(order.getUserID());
-                        List<String> openidList = newShopOrderDao.getOpenidListByPermission(userid, unionid);
-                        logger.info("userid>>>>>>>>>>>>>>>" + order.getUserID() + "unionid》》》》》》》》》》" + newShopOrderDao.getOpenidunionId(order.getUserID()) + "openid》》》》》》》》》" + openidList);
+                        String unionid = newShopOrderDao.getOpenidunionId(userid);
+                        List<String> openidList = newShopOrderDao.getOpenidListByPermission(unionid);
+                        System.out.println("userid>>>>>>>>>>>>>>>" + userid + "unionid》》》》》》》》》》" + unionid+ "openid》》》》》》》》》" + openidList);
+                        String accessToken = weChatService.getAccessToken();
                         String orderNo = order.getOrderNo();
                         String time = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
                         String company = StringUtils.strip(logisticsInfo.keySet().toString(), "[]");

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -1144,19 +1144,16 @@
         ORDER BY a.shopOrderID DESC
     </select>
     <select id="getOpenidListByPermission" resultType="java.lang.String">
-        SELECT DISTINCT cm.crmopenid
-        FROM `cm_mall_operation_user` cm
-                 LEFT JOIN `user` u ON u.userID = cm.userID
-        WHERE u.userID = #{userid}
-          AND cm.unionId = #{unionid}
+        SELECT openid
+        FROM `wechat_user`
+        WHERE unionid = #{unionid}
     </select>
 
     <select id="getOpenidunionId" resultType="java.lang.String">
-        SELECT DISTINCT cm.unionId
+        SELECT cm.unionId
         FROM `cm_mall_operation_user` cm
-                 LEFT JOIN `user` u ON u.userID = cm.userID
+        LEFT JOIN `user` u ON u.userID = cm.userID
         WHERE u.userID = #{userid}
-          AND cm.id = 1068
     </select>
     <select id="getProductOrder" resultType="java.lang.String">
         SELECT productID

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

@@ -510,7 +510,7 @@
                 <form:select path="splitCode" class="select-ele input-medium">
                     <form:option value="" label="请选择"/>
                     <c:forEach items="${splitCodeList}" var="splitCodeList" varStatus="index">
-                        <form:option value="${splitCodeList.splitCode}" label="${splitCodeList.codeRemark}"/>
+                        <form:option value="${splitCodeList.splitCode}" label="${splitCodeList.splitCode} ${splitCodeList.codeRemark}"/>
                     </c:forEach>
                 </form:select>
                 </c:if>