Merge branch 'refs/heads/master' into 支付优化测试
This commit is contained in:
@ -438,6 +438,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
BigDecimal giftAmount = BigDecimal.ZERO;
|
BigDecimal giftAmount = BigDecimal.ZERO;
|
||||||
|
|
||||||
dishOrderDO.setTotalMoney(dishOrderDO.getTotalMoney().subtract(money));
|
dishOrderDO.setTotalMoney(dishOrderDO.getTotalMoney().subtract(money));
|
||||||
|
dishOrderDO.setRefundAmount(dishOrderDO.getRefundAmount().subtract(money));
|
||||||
if(dishOrderDO.getWxAmount().compareTo(money)>=0){
|
if(dishOrderDO.getWxAmount().compareTo(money)>=0){
|
||||||
dishOrderDO.setWxAmount(dishOrderDO.getWxAmount().subtract(money));
|
dishOrderDO.setWxAmount(dishOrderDO.getWxAmount().subtract(money));
|
||||||
wxAmount = wxAmount.add(money);
|
wxAmount = wxAmount.add(money);
|
||||||
|
Reference in New Issue
Block a user