| | |
|---|
| | | continue;
|
|---|
| | | }
|
|---|
| | | CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
|
|---|
| | | CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());
|
|---|
| | | updateCommonOrder.seteIncome(newCommonOrder.geteIncome());
|
|---|
| | | updateCommonOrder.setEstimate(newCommonOrder.getEstimate());
|
|---|
| | | updateCommonOrder.setPayment(newCommonOrder.getPayment());
|
|---|
| | | updateCommonOrder.setSettlement(newCommonOrder.getSettlement());
|
|---|
| | | updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());
|
|---|
| | | updateCommonOrder.setState(newCommonOrder.getState());
|
|---|
| | | updateCommonOrder.setStateWholeOrder(wholeOrderState);
|
|---|
| | | updateCommonOrder.setUpdateTime(new Date());
|
|---|
| | | updateCommonOrder.setTradeId(newCommonOrder.getTradeId());
|
|---|
| | | commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
|
|---|
| | | commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));
|
|---|
| | | continue;
|
|---|
| | |
|
|---|
| | | // 交易ID一致才修改
|
|---|
| | | if (commonOrder.getTradeId() != null
|
|---|
| | | && commonOrder.getTradeId().equalsIgnoreCase(newCommonOrder.getTradeId())) {
|
|---|
| | |
|
|---|
| | | CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());
|
|---|
| | | updateCommonOrder.seteIncome(newCommonOrder.geteIncome());
|
|---|
| | | updateCommonOrder.setEstimate(newCommonOrder.getEstimate());
|
|---|
| | | updateCommonOrder.setPayment(newCommonOrder.getPayment());
|
|---|
| | | updateCommonOrder.setSettlement(newCommonOrder.getSettlement());
|
|---|
| | | updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());
|
|---|
| | | updateCommonOrder.setState(newCommonOrder.getState());
|
|---|
| | | updateCommonOrder.setStateWholeOrder(wholeOrderState);
|
|---|
| | | updateCommonOrder.setUpdateTime(new Date());
|
|---|
| | | updateCommonOrder.setTradeId(newCommonOrder.getTradeId());
|
|---|
| | | commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
|
|---|
| | | commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));
|
|---|
| | | } else
|
|---|
| | | commonOrderList.add(commonOrder);
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | return commonOrderList;
|
|---|
