|
|
@@ -217,7 +217,9 @@ public class TradeOrderServiceImpl implements TradeOrderService {
|
|
|
|
|
|
String changedFields = BeanUtils.getChangedFields(shipTradeOrderCreateReqVO.getOldtradeOrderDO(), tradeOrderBO.getTradeOrderDO());
|
|
|
System.err.println("changedFields=" + changedFields + shipTradeOrderCreateReqVO.getChangedFields1());
|
|
|
- tradeOrderBO.getTradeOrderBindDO().setRemark(changedFields + shipTradeOrderCreateReqVO.getChangedFields1());
|
|
|
+ if(tradeOrderBO.getTradeOrderBindDO()!=null) {
|
|
|
+ tradeOrderBO.getTradeOrderBindDO().setRemark(changedFields + shipTradeOrderCreateReqVO.getChangedFields1());
|
|
|
+ }
|
|
|
tradeOrderRepositoryService.modifyOrder(tradeOrderBO,shipTradeOrderCreateReqVO.getOldtradeOrderDO().getId());
|
|
|
//4 下单成功回调
|
|
|
tradeSupplierCallbackService.afterAllOrderCreate(tradeOrderBO.getTradeOrderDO());
|