|
@@ -269,7 +269,7 @@ public class AppUserController extends BaseController
|
|
|
appUserService.updateUserAmount(rateTran);*/
|
|
appUserService.updateUserAmount(rateTran);*/
|
|
|
}
|
|
}
|
|
|
double give = 0;
|
|
double give = 0;
|
|
|
- if(userChargeDto.getType() == 1 && userChargeDto.getAmount() > 0) { //金币充值不赠送
|
|
|
|
|
|
|
+ if(userChargeDto.getType() == 1 && userChargeDto.getAmount() > 0 && userChargeDto.getRate() > 0) { //金币充值不赠送
|
|
|
// if(null != userChargeDto.getGiveAmount() && userChargeDto.getGiveAmount() > 0){
|
|
// if(null != userChargeDto.getGiveAmount() && userChargeDto.getGiveAmount() > 0){
|
|
|
//今日已赠送金额
|
|
//今日已赠送金额
|
|
|
double todayGiveMoney = appUsersChargeService.isChargeToday(userChargeDto.getUserId(),userChargeDto.getType());
|
|
double todayGiveMoney = appUsersChargeService.isChargeToday(userChargeDto.getUserId(),userChargeDto.getType());
|
dos