Merge remote-tracking branch 'origin/master'

game-business/src/main/java/com/game/business/controller/AppUsersCashrecordController.java

@@ -151,6 +151,10 @@ public class AppUsersCashrecordController extends BaseController
         update.setId(cashrecord.getId());
         update.setStatus(appUsersCashrecord.getStatus());
         update.setReason(appUsersCashrecord.getReason());
+        if(appUsersCashrecord.getCallOther() == 0 && 1== appUsersCashrecord.getStatus().intValue() &&
+                (null == appUsersCashrecord.getCashChannelId() || appUsersCashrecord.getCashChannelId() < 1)){
+            return R.fail("审核失败，未找到对应渠道，请驳回或者人工审核");
+        }
         if(1 == appUsersCashrecord.getStatus().intValue() && null != appUsersCashrecord.getCashChannelId() && appUsersCashrecord.getCashChannelId() > 0
          && appUsersCashrecord.getCallOther() == 0){
             //审核通过
@@ -192,6 +196,8 @@ public class AppUsersCashrecordController extends BaseController
                     appUsersCashrecordService.updateAppUsersCashrecord(cashRecord);
                     throw new ServiceException("发起提现失败: " + map.get("msg"));
                 }
+            }else{
+                return R.fail("审核失败，未找到对应渠道，请驳回或者人工审核");
             }
         }
         if(2 == appUsersCashrecord.getStatus().intValue()){

game-business/src/main/java/com/game/business/mapper/AppUsersChargeMapper.java

@@ -67,6 +67,6 @@ public interface AppUsersChargeMapper extends BaseMapper<AppUsersCharge> {
     @Select("select next_val from sys_sequence where sequence_name = 'app_users_charge'")
     public Long getMaxId();
 
-    @Select("select IFNULL(sum(coin),0) from app_users_charge where uid = #{userId} and status = 1")
+    @Select("select IFNULL(sum(coin),0) from app_users_charge where uid = #{userId} and status = 1 and coin_type = 1")
     public Double sumCharge(@Param("userId") Long userId);
 }