bugfix

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -240,13 +240,13 @@ public interface OrderClubMapper {
     /**
      * 根据用户id获取用户openid列表(微信公众号openid,下单)
      */
-    List<String> getOpenidListByPermission(String unionid);
+    List<String> getOpenidListByPermission(String unionId);
 
-    Integer getUserId(Integer orderid);
+    Integer getUserId(Integer orderId);
 
-    String getOpenidunionId(Integer userid);
-     //查询是否是订金订单6060是订金订单其他不是
-    List<Integer> getProductOrder(Integer orderid);
+    String getOpenidunionId(Integer userId);
+
+    List<Integer> getProductOrder(Integer orderId);
     /*
      *根据orderId查询商品名称
      */

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -806,7 +806,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             log.info("【支付异步回调】>>>>>>>>>>>>>>订单(全部支付),修改订单状态：" + order.getStatus() + "，orderId：" + orderId);
             log.info("************************订单支付完成消息推送*********************");
             //判断是否是二手订单和返佣订单
-                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId) && !"6060".equals(orderClubMapper.getProductOrder(orderId))) {
+                if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId) && !orderClubMapper.getProductOrder(orderId).contains(6060)) {
                     try {
                         String accessToken = weChatService.getAccessToken();
                         log.info(">>>>>>>>>>>>>>>>>"+order.getUserId()+">>>>>>>>>>>>>>"+orderClubMapper.getOpenidunionId(order.getUserId()));
@@ -1016,12 +1016,9 @@ public class PayOrderServiceImpl implements PayOrderService {
     @Override
     public ResponseJson<String> payWhetherSuccess(Integer orderId, Integer paySuccessCounter) {
         Integer dbPayCounter = payOrderMapper.getDbPaySuccessCounter(orderId);
-
         if (paySuccessCounter.equals(dbPayCounter)) {
-
             return ResponseJson.error(-2, "支付失败", "付款次数异常");
         } else if (dbPayCounter > paySuccessCounter) {
-
             if ( 1 == orderClubMapper.getReceiptStatus(orderId)) {
                 if (0 == orderClubMapper.getsecondHandOrderFlag(orderId) && 0 == orderClubMapper.getrebateFlag(orderId)) {
                     try {
@@ -1046,8 +1043,6 @@ public class PayOrderServiceImpl implements PayOrderService {
                     }
                 }
             }
-
-
             return ResponseJson.success("支付成功");
         } else {
             return ResponseJson.error("支付异常", null);

src/main/resources/mapper/OrderClubMapper.xml

@@ -497,17 +497,17 @@
         AND scr.delFlag = '0' AND osc.expiredTime > NOW()
     </select>
     <select id="getOpenidListByPermission" resultType="java.lang.String">
-        SELECT openid FROM `wechat_user` WHERE unionId= #{unionid}
+        SELECT openid FROM `wechat_user` WHERE unionId= #{unionId}
     </select>
 
     <select id="getOpenidunionId" resultType="java.lang.String">
         SELECT DISTINCT cm.unionId FROM  `cm_mall_operation_user` cm
         LEFT JOIN `user` u ON u.userID = cm.userID
-        WHERE u.userID=#{userid}
+        WHERE u.userID=#{userId}
     </select>
 
     <select id="getProductOrder" resultType="java.lang.Integer">
-        SELECT productID FROM `cm_order_product` WHERE orderId=#{orderid}
+        SELECT productID FROM `cm_order_product` WHERE orderId=#{orderId}
     </select>
 
     <select id="getOrderIds" resultType="java.lang.String">
@@ -587,6 +587,6 @@
         select userId from cm_order where orderID = #{orderId}
     </select>
     <select id="getUserId" resultType="java.lang.Integer">
-        SELECT userID FROM `cm_order` WHERE orderID=#{orderid}
+        SELECT userID FROM `cm_order` WHERE orderID=#{orderId}
     </select>
 </mapper>