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

# Conflicts:
#	src/main/java/com/caimei365/order/controller/PayNonOrderApi.java
#	src/main/java/com/caimei365/order/service/PayNonOrderService.java
#	src/main/resources/mapper/PayOrderMapper.xml

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

@@ -249,8 +249,6 @@ public interface PayOrderMapper {
 
     Integer findClubType(Integer userId);
 
-    void bugFix(Integer userId);
-
     List<CouponCheckVo> findCouponOrder();
 
     void deleteAuthVipRoleRelation(int userId);

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

@@ -860,12 +860,6 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
         return ResponseJson.error("支付失败", null);
     }
 
-    @Override
-    public ResponseJson bugCheck(Integer userId) {
-        payOrderMapper.bugFix(userId);
-        return ResponseJson.success("修好了！");
-    }
-
 
     private ResponseJson<JSONObject> toPayCoupon(PayParamBo payParam, HttpHeaders headers) {
         // 定义支付请求结果

src/main/resources/mapper/PayOrderMapper.xml

@@ -134,9 +134,6 @@
         set payStatus = 1
         where id = #{recordId}
     </update>
-    <update id="bugFix">
-        UPDATE USER SET userMoney = ableUserMoney WHERE userId = #{userId}
-    </update>
     <update id="updateAuthVipInfo">
         UPDATE auth_vip_user set authUserId=#{userId}, beginTime=#{beginTime}, endTime=#{endTime}, delFlag=#{delFlag}, updateTime=#{updateTime}
         WHERE authUserId = #{userId}