| | |
|---|
| | | }
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | // 邀请隐藏订单号
|
|---|
| | | if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|
|---|
| | | // 邀请 隐藏订单号
|
|---|
| | | if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
|
|---|
| | | String orderNo = order.getOrderNo();
|
|---|
| | | orderNo = orderNo.substring(0, orderNo.length()-6);
|
|---|
| | | order.setOrderNo(orderNo + "******");
|
|---|
| | | } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|
|---|
| | | || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
|
|---|
| | | || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
|
|---|
| | | String orderNo = order.getOrderNo();
|
|---|
| | |
|---|
| | | commonOrder.setCommonOrderGoods(goods);
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | CommonOrder oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
|
|---|
| | | commonOrder.getSourceType(), commonOrder.getOrderBy());
|
|---|
| | | CommonOrder oldCommonOrder = null;
|
|---|
| | |
|
|---|
| | | if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
|
|---|
| | | oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
|
|---|
| | | commonOrder.getTradeId());
|
|---|
| | | else
|
|---|
| | | oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
|
|---|
| | | commonOrder.getSourceType(), commonOrder.getOrderBy());
|
|---|
| | |
|
|---|
| | | if (oldCommonOrder == null)// 新增
|
|---|
| | | {
|
|---|
| | |
|---|
| | | commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
|
|---|
| | | return commonOrder;
|
|---|
| | | } else {// 修改
|
|---|
| | | // 已经结算或者已经失效的订单不处理
|
|---|
| | | if (oldCommonOrder.getState() == CommonOrder.STATE_JS
|
|---|
| | | || oldCommonOrder.getState() == CommonOrder.STATE_SX) {
|
|---|
| | | // 已经结算，已经失效，状态未改变的订单不处理
|
|---|
| | | if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
|
|---|
| | | || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
|
|---|
| | | return oldCommonOrder;
|
|---|
| | | }
|
|---|
| | | // 交易ID一致才修改
|
|---|
