Merge remote-tracking branch 'origin/developer' into developerC

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

@@ -2098,6 +2098,7 @@ public class SubmitServiceImpl implements SubmitService {
          * 初始化主订单
          */
         OrderPo mainOrder = new OrderPo();
+        mainOrder.setOrganizeId(0);
         //协销订金订单默认不可见
         mainOrder.setOrderSeen(2);
         mainOrder.setSpId(rechargeDto.getServiceProviderId());

src/main/resources/mapper/OrderClubMapper.xml

@@ -822,13 +822,6 @@
         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}
-    </select>
-
     <select id="getProductOrder" resultType="java.lang.Integer">
         SELECT productID
         FROM `cm_order_product`

src/main/resources/mapper/PayOrderMapper.xml

@@ -187,12 +187,6 @@
         SET payStatus = #{payStatus}
         WHERE orderID = #{orderId}
     </update>
-    <update id="updateUserMoney">
-        UPDATE USER
-        SET userMoney     = #{userMoney},
-            ableUserMoney = #{ableUserMoney}
-        WHERE userID = #{userId}
-    </update>
     <update id="updateCouponRecord">
         update cm_coupon_buyrecord
         set payStatus = 1