Browse Source

Merge remote-tracking branch 'origin/main'

jinch 1 week atrás
parent
commit
1c34b07875

+ 3 - 0
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -358,6 +358,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 item.setAuditUserName(user != null ? user.getUsername() : "未知");
             });
             tradeOrderDO.setTradeOrderAuditList(tradeOrderAuditList);
+            if(tradeOrderDO.getDamaged()==null){
+                tradeOrderDO.setDamaged(BigDecimal.ZERO);
+            }
             return CommonResult.success(tradeOrderDO);
         }
         return CommonResult.error(ORDER_NOT_EXIST);