|
|
@@ -573,7 +573,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
|
|
|
if (tradeOrderDO.getAuditStatus() + 1 > tradeOrderDO.getAuditType()) {
|
|
|
BigDecimal supplementAmount = tradeOrderDO.getRealPayAmount().subtract(damaged);
|
|
|
- int isSupplement = supplementAmount.compareTo(BigDecimal.ZERO) > 0 ? 1 : 0;
|
|
|
+ int isSupplement = supplementAmount.compareTo(BigDecimal.ZERO) > 0 ? 0 : 1;
|
|
|
try {
|
|
|
Map map = new HashMap();
|
|
|
map.put("orderNo", tradeOrderDO.getOrderNo());
|
|
|
@@ -582,15 +582,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
ShipRespDTO shipRespDTO = shipApi.queryShip(tradeOrderDO.getShipId());
|
|
|
map.put("routeName", routeRespDTO.getName());
|
|
|
map.put("boatName", shipRespDTO.getName());
|
|
|
- BigDecimal deposi = tradeOrderDO.getDeposi();
|
|
|
- Integer deposiStatus = tradeOrderDO.getDeposiStatus();
|
|
|
- BigDecimal realPay = BigDecimal.ZERO;
|
|
|
- if (deposiStatus == 2) {
|
|
|
- realPay = deposi;
|
|
|
- } else if(tradeOrderDO.getPayStatus()==1){
|
|
|
- realPay = tradeOrderDO.getPayAmount();
|
|
|
- }
|
|
|
-
|
|
|
map.put("wyAmount", damaged);
|
|
|
map.put("wyRefundAmount", isSupplement==0?supplementAmount:BigDecimal.ZERO);
|
|
|
map.put("wyPayAmount", isSupplement==1?supplementAmount.abs():BigDecimal.ZERO);
|
|
|
@@ -604,7 +595,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
reqDTO.setUserId(Long.parseLong(tradeOrderDO.getSellerId()));
|
|
|
notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
|
|
|
} catch (Exception e) {
|
|
|
- log.error("发送短信异常", e);
|
|
|
+ log.error("发送站内信异常", e);
|
|
|
}
|
|
|
|
|
|
tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
|