ufo / yohoufo-fore · Commits

Go to a project

Authored by Lixiaodi
Commit 2d8af39c421764a2dcf8bea106d7addeb31414cd 1 parent 41fb6d63

bug修改

Inline Side-by-side
Showing 1 changed file with 7 additions and 2 deletions
... ... @@ -155,8 +155,13 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
swd.setType(SellerWalletDetail.Type.RE_CHARGE.getValue());
swd.setCreateTime(TimeUtils.getTimeStampSecond());
swd.setUpdateTime(0);
swd.setAvailAmount(orderInfo.getAmount());
swd.setLockAmount(BigDecimal.ZERO);
if (orderInfo.getType() == TYPE_FIRST_RECHARGE) {
swd.setAvailAmount(orderInfo.getAmount());
swd.setLockAmount(BigDecimal.ZERO);
} else {
swd.setAvailAmount(orderInfo.getAmount().add(sw.getAmount()));
swd.setLockAmount(sw.getLockAmount());
}
swd.setIsSet(1);
MerchantOrderAttachInfo att = new MerchantOrderAttachInfo();
att.setPayment(orderInfo.getPayment());
... ...