|
@@ -166,6 +166,7 @@ public class AppUserController extends BaseController
|
|
}
|
|
}
|
|
//扣除手续费
|
|
//扣除手续费
|
|
FinTranRecord rateTran = new FinTranRecord();
|
|
FinTranRecord rateTran = new FinTranRecord();
|
|
|
|
+ rateTran.setId(null);
|
|
BeanUtils.copyProperties(tran,rateTran);
|
|
BeanUtils.copyProperties(tran,rateTran);
|
|
if(TranCurrencyType.Balance.getType() == rateTran.getCurrencyType()){
|
|
if(TranCurrencyType.Balance.getType() == rateTran.getCurrencyType()){
|
|
rate = BigDecimal.valueOf(rateTran.getDiamondCoinChange() * userChargeDto.getRate()).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
rate = BigDecimal.valueOf(rateTran.getDiamondCoinChange() * userChargeDto.getRate()).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
@@ -174,12 +175,12 @@ public class AppUserController extends BaseController
|
|
rate = BigDecimal.valueOf(rateTran.getCoinChange() * userChargeDto.getRate()).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
rate = BigDecimal.valueOf(rateTran.getCoinChange() * userChargeDto.getRate()).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
rateTran.setCoinChange(rate.doubleValue() * -1);
|
|
rateTran.setCoinChange(rate.doubleValue() * -1);
|
|
}
|
|
}
|
|
- rateTran.setTranType3(FinTranType3.CHARGE_OUT_RATE.getType());
|
|
|
|
|
|
+ /*rateTran.setTranType3(FinTranType3.CHARGE_OUT_RATE.getType());
|
|
rateTran.setTranType2(FinTranType3.CHARGE_OUT_RATE.getTranType2().getType());
|
|
rateTran.setTranType2(FinTranType3.CHARGE_OUT_RATE.getTranType2().getType());
|
|
rateTran.setTranType1(userChargeDto.getType() == 1?FinTranType1.U_Outcome_Balance.getType():FinTranType1.U_Outcome_Coin.getType());
|
|
rateTran.setTranType1(userChargeDto.getType() == 1?FinTranType1.U_Outcome_Balance.getType():FinTranType1.U_Outcome_Coin.getType());
|
|
rateTran.setRemarks("充值手续费");
|
|
rateTran.setRemarks("充值手续费");
|
|
- rateTran.setId(null);
|
|
|
|
- appUserService.updateUserAmount(rateTran);
|
|
|
|
|
|
+
|
|
|
|
+ appUserService.updateUserAmount(rateTran);*/
|
|
}
|
|
}
|
|
double give = 0;
|
|
double give = 0;
|
|
// if(null != userChargeDto.getGiveAmount() && userChargeDto.getGiveAmount() > 0){
|
|
// if(null != userChargeDto.getGiveAmount() && userChargeDto.getGiveAmount() > 0){
|
|
@@ -215,7 +216,7 @@ public class AppUserController extends BaseController
|
|
appUsersCharge.setTouid(appUser.getUserid());
|
|
appUsersCharge.setTouid(appUser.getUserid());
|
|
appUsersCharge.setUid(appUser.getUserid());
|
|
appUsersCharge.setUid(appUser.getUserid());
|
|
|
|
|
|
- appUsersCharge.setCoin(BigDecimal.valueOf(userChargeDto.getAmount() - rate.doubleValue()));
|
|
|
|
|
|
+ appUsersCharge.setCoin(BigDecimal.valueOf(userChargeDto.getAmount()));
|
|
appUsersCharge.setCoinType(Long.parseLong(String.valueOf(userChargeDto.getType())));
|
|
appUsersCharge.setCoinType(Long.parseLong(String.valueOf(userChargeDto.getType())));
|
|
appUsersCharge.setOrderno(IdUtil.fastUUID());
|
|
appUsersCharge.setOrderno(IdUtil.fastUUID());
|
|
// 充值成功
|
|
// 充值成功
|