|
|
@@ -311,6 +311,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
@Resource
|
|
|
private TradeRefundService tradeRefundService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private TradeOrderBindMapper tradeOrderBindMapper;
|
|
|
+
|
|
|
|
|
|
public final static String AGENCY_LOGIN_INFO = "agencyLoginInfo";
|
|
|
|
|
|
@@ -3074,7 +3077,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
tradeOrderBindDO.setBindId(orderId);
|
|
|
tradeOrderBindDO.setCustom("");
|
|
|
tradeOrderBindDO.setRemark(desc);
|
|
|
- shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
|
|
|
+ tradeOrderBindDO.setOrderId(tradeOrderDO.getId());
|
|
|
+ tradeOrderBindDO.setCreateTime(LocalDateTime.now());
|
|
|
+ tradeOrderBindDO.setCreator(tradeOrderDO.getCreator());
|
|
|
+ tradeOrderBindMapper.update(new LambdaUpdateWrapper<TradeOrderBindDO>()
|
|
|
+ .set(TradeOrderBindDO::getDeleted, 1)
|
|
|
+ .set(TradeOrderBindDO::getUpdateTime, tradeOrderBindDO.getUpdateTime()==null?new Date():tradeOrderBindDO.getUpdateTime())
|
|
|
+ .eq(TradeOrderBindDO::getOrderId, shipTradeOrderCreateReqVO.getOldtradeOrderDO().getId()));
|
|
|
+ tradeOrderBindMapper.insert(tradeOrderBindDO);
|
|
|
+// shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
|
|
|
} else if (oldDeposi.compareTo(newDeposi)!=0) {
|
|
|
AuditUserDO auditUserDO = auditUserMapper.selectOne(new LambdaQueryWrapperX<AuditUserDO>().eq(AuditUserDO::getType, 3).eq(AuditUserDO::getAuditStatus, 1).eq(AuditUserDO::getDeleted, 0).orderByDesc(AuditUserDO::getCreateTime).last("limit 1"));
|
|
|
tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", 3).set("audit_user", auditUserDO == null ? "" : auditUserDO.getAuditUser()).set("order_status", TradeOrderStatusEnum.TRANSFER.getStatus()).set("audit_status", 1).set("confirm_type",1).eq("id", neworderId));
|
|
|
@@ -3086,7 +3097,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
tradeOrderBindDO.setBindId(orderId);
|
|
|
tradeOrderBindDO.setCustom("");
|
|
|
tradeOrderBindDO.setRemark(desc);
|
|
|
- shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
|
|
|
+ tradeOrderBindMapper.update(new LambdaUpdateWrapper<TradeOrderBindDO>()
|
|
|
+ .set(TradeOrderBindDO::getDeleted, 1)
|
|
|
+ .set(TradeOrderBindDO::getUpdateTime, tradeOrderBindDO.getUpdateTime()==null?new Date():tradeOrderBindDO.getUpdateTime())
|
|
|
+ .eq(TradeOrderBindDO::getOrderId, shipTradeOrderCreateReqVO.getOldtradeOrderDO().getId()));
|
|
|
+ tradeOrderBindMapper.insert(tradeOrderBindDO);
|
|
|
+// shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
|
|
|
log.error("{}>>>>>>>>>>>>>>>>>>>>>> motifyOtcOrder 进入审核流程2 <<<<<<<<<<<<<<<<<<<<<<" + 3 + ";{}", orderNo, auditUserDO == null ? "" : auditUserDO.getAuditUser());
|
|
|
}
|
|
|
// if(Objects.equals(TradeOrderStatusEnum.TRANSFER.getStatus(), neworderStatus)) {
|