|
|
@@ -2021,9 +2021,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
} else {
|
|
|
shipTradeOrderCreateReqVO.setConfirmType(0);
|
|
|
}
|
|
|
- if (tradeOrderDO.getOrderStatus() == 6) {
|
|
|
- shipTradeOrderCreateReqVO.setConfirmType(1);
|
|
|
- }
|
|
|
+// if (tradeOrderDO.getOrderStatus() == 6) {
|
|
|
+// shipTradeOrderCreateReqVO.setConfirmType(1);
|
|
|
+// }
|
|
|
shipTradeOrderCreateReqVO.setDiscountId(discountId);
|
|
|
if (createVO.getSummary().getRealOrderMoney() != null) {
|
|
|
shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealOrderMoney());
|