|
|
@@ -95,6 +95,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
private final double DEFAULT_BROKERAGE_PROPORTION = 0; //佣金比例
|
|
|
private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
|
|
|
private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
|
|
|
+ private final String DEFUALT_SET_UP_COMMENT = "系统自动生产立项信息,请自行修改或补充";
|
|
|
|
|
|
/*
|
|
|
* -------------------------------------------------- APP管理端 --------------------------------------------------------
|
|
|
@@ -183,14 +184,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
* 订单状态流转
|
|
|
- * @param orderStatus
|
|
|
- * @param intentionStatus
|
|
|
- * @param tradingStatus
|
|
|
- * @param paymentStatus
|
|
|
- * @param liquidationStatus
|
|
|
- * @param actionType
|
|
|
+ * @param orderAction
|
|
|
+ * @param changeAmount
|
|
|
+ * @param tOrder
|
|
|
+ * @param confrim
|
|
|
*/
|
|
|
public void setOrderState(OrderAction orderAction,BigDecimal changeAmount,TOrder tOrder,boolean confrim){
|
|
|
BigDecimal initial = new BigDecimal(0);
|
|
|
@@ -227,12 +225,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getSignTotalAmount());
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
|
|
|
- tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}else if(boundary == 1){ //超过首付未达尾款
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
- tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}else if(boundary == -1){ //首付待付清
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getActuallyFirstPayment().add(changeAmount));
|
|
|
@@ -240,7 +240,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
- tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_LAST){ //支付尾款 (审核流水)
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()){
|
|
|
@@ -252,7 +253,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}else if(boundary == -1){
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
}else if(boundary == 0){
|
|
|
- tOrder.setOrderStatus(OrderState.ALREADY_SIGN.getCode());
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getSignTotalAmount());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
|
|
|
}
|
|
|
@@ -305,12 +305,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.APPLY_FOR_REFUND){ //退款申请
|
|
|
boolean flag = true;
|
|
|
- /*if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_AFTER_SIGN.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
- }*/
|
|
|
+ }
|
|
|
+ if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.REFUSE_REFUND.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
|
|
|
@@ -323,12 +324,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode());
|
|
|
}else if(orderAction == OrderAction.CONFIRM_REFUND){ //退款确认
|
|
|
boolean flag = true;
|
|
|
- /*if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_AFTER_SIGN.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
- }*/
|
|
|
+ }
|
|
|
+ if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
@@ -342,12 +344,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.COMPLETE_REFUND){ //完成退款
|
|
|
boolean flag = true;
|
|
|
- /*if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_AFTER_SIGN.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode()
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
- }*/
|
|
|
+ }
|
|
|
+ if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.AGREE_REFUND.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
@@ -865,7 +868,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
flag2 = true;
|
|
|
}else if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()){
|
|
|
flag2 = true;
|
|
|
- if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signTotalAmount)) > 0){ //实际付款金额超过订单金额 ,应退款处理
|
|
|
+ if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signTotalAmount)) > 0){ //超过全付
|
|
|
tOrder.setLiquidationStatus(LiquidationState.AGREE_REFUND.getCode());
|
|
|
if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
@@ -898,6 +901,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setContractNo(contractNo);
|
|
|
if(StringUtils.isNotBlank(contractPictureUrl))tOrder.setContractPictureUrl(contractPictureUrl);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
+ //如果支付后订单符合待立项,系统自动立项 2018-4-10
|
|
|
+ if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
|
|
|
+ updateSetUpProject(tOrder.getOrderNo(),DEFUALT_SET_UP_COMMENT);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -963,7 +969,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
+ && tOrder.getChangeStatus() != ChangeState.CHANGING.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo,""));
|
|
|
}else{
|
|
|
TOrderDetail detail = new TOrderDetail();
|
|
|
@@ -1004,7 +1011,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrderDetail oldDetail = tOrderDetailMapper.selectByPrimaryKey(detailId);
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(oldDetail.getOrderNo());
|
|
|
checkOrder(tOrder);
|
|
|
- if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
+ && tOrder.getChangeStatus() != ChangeState.CHANGING.getCode()) {
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, oldDetail.getOrderNo(), ""));
|
|
|
} else {
|
|
|
TOrderDetail detail = new TOrderDetail();
|
|
|
@@ -1034,7 +1042,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrderDetail detail = tOrderDetailMapper.selectByPrimaryKey(detailId);
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(detail.getOrderNo());
|
|
|
checkOrder(tOrder);
|
|
|
- if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
+ && tOrder.getChangeStatus() != ChangeState.CHANGING.getCode()) {
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, detail.getOrderNo(), ""));
|
|
|
} else {
|
|
|
BigDecimal totalAmountChange = detail.getCommodityPrice()
|
|
|
@@ -1311,26 +1320,36 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
bill.setRemarks(remarks);
|
|
|
+ order.setUpdateTime(new Date());
|
|
|
if(confrim == AFTConstants.YES){
|
|
|
bill.setConfirmTime(confirmTime);
|
|
|
bill.setConfirmSign(AuditState.AUDIT_SUCCESS.getCode());
|
|
|
checkOrder(order);
|
|
|
if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
- && bill.getTransactionSubject() == TransactionSubject.SUPPLY_PAY.getCode()) //代付+首付状态
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.SUPPLY_PAY.getCode()) { //代付+首付状态
|
|
|
setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
|
|
|
- else if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
- && bill.getTransactionSubject() == TransactionSubject.SUPPLY_PAY.getCode()) //代付+尾款状态
|
|
|
+ tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
+ //如果支付后订单符合待立项,系统自动立项 2018-4-10
|
|
|
+ if(order.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
|
|
|
+ updateSetUpProject(order.getOrderNo(),DEFUALT_SET_UP_COMMENT);
|
|
|
+ } else if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.SUPPLY_PAY.getCode()) { //代付+尾款状态
|
|
|
setOrderState(OrderAction.CONFIRM_PAY_FOR_LAST, bill.getTransactionAmount(), order, false);
|
|
|
- else if(order.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
|
|
|
- && bill.getTransactionSubject() == TransactionSubject.REFUND.getCode()) //待退+退款状态
|
|
|
+ tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
+ //如果支付后订单符合待立项,系统自动立项 2018-4-10
|
|
|
+ if(order.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
|
|
|
+ updateSetUpProject(order.getOrderNo(),DEFUALT_SET_UP_COMMENT);
|
|
|
+ } else if(order.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.REFUND.getCode()) { //待退+退款状态
|
|
|
setOrderState(OrderAction.COMPLETE_REFUND, bill.getTransactionAmount(), order, false);
|
|
|
- else if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode()
|
|
|
- && bill.getTransactionSubject() == TransactionSubject.SUPPLY_COLLECT.getCode()) //代收+提现状态
|
|
|
+ tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
+ }else if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode()
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.SUPPLY_COLLECT.getCode()) { //代收+提现状态
|
|
|
setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
|
|
|
- else
|
|
|
+ tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
+ } else {
|
|
|
throw new BusinessException(new Error(ErrorConstants.BILL_ALREADY_EXPIRE, billNo , ""));
|
|
|
- order.setUpdateTime(new Date());
|
|
|
- tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
+ }
|
|
|
}else if(confrim == AFTConstants.NO){
|
|
|
bill.setConfirmTime(confirmTime);
|
|
|
bill.setConfirmSign(AuditState.AUDIT_FAIL.getCode());
|
|
|
@@ -1361,7 +1380,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.SIGNED.getCode()
|
|
|
|| tOrder.getApproval() != ApprovalState.WAIT_AUDIT.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo , ""));
|
|
|
}
|
|
|
@@ -1374,6 +1392,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setApproval(ApprovalState.AUDIT_REFUSE.getCode());
|
|
|
}
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
+ //如果支付后订单符合待立项,系统自动立项 2018-4-10
|
|
|
+ if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
|
|
|
+ updateSetUpProject(tOrder.getOrderNo(),DEFUALT_SET_UP_COMMENT);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -1415,6 +1436,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(!flag)
|
|
|
throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
|
|
|
tOrder.setProjectStage(ProjectStage.ALREADY_SET_UP.getCode());
|
|
|
+ tOrder.setOrderStage(OrderStage.PROJECT.getCode());
|
|
|
tOrder.setUpdateTime(createTime);
|
|
|
tOrder.setSetUpTime(createTime);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
@@ -1476,6 +1498,20 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public int updateRefundForTest(String orderNo, String refundAmount) {
|
|
|
+ TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
+ if(tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()){
|
|
|
+ addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
|
|
|
+ TransactionSubject.REFUND,PayChannel.UNIONPAY, new BigDecimal(refundAmount), TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
+ tOrder.setUpdateTime(new Date());
|
|
|
+ tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
+ }else{
|
|
|
+ throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public int updateDistributionOrder(String orderNo, String financeId) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
@@ -1601,7 +1637,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setSellerId(TokenManager.getUserId());
|
|
|
}else{
|
|
|
tOrder.setBuyerId(TokenManager.getUserId());
|
|
|
- //tOrder.setBuyerId("123");
|
|
|
tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
|
|
|
}
|
|
|
tOrder.setOrderType(commodityType);
|
|
|
@@ -1679,15 +1714,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
*/
|
|
|
private int updateOrderSatusByChange(String orderNo){
|
|
|
if(StringUtils.isBlank(orderNo)) return 0;
|
|
|
- int resultStatus;
|
|
|
- int allChangeCount = tOrderChangeMapper.selectCountByStatus(ChangeState.CHANGING.getCode(), orderNo);
|
|
|
- int completeChangeCoumt = tOrderChangeMapper.selectCountByStatus(ChangeState.CHANGED.getCode(), orderNo);
|
|
|
- if(allChangeCount == 0){
|
|
|
- resultStatus = ChangeState.UNCHANGE.getCode();
|
|
|
- } else if(allChangeCount - completeChangeCoumt > 0){
|
|
|
+ int resultStatus = ChangeState.UNCHANGE.getCode();
|
|
|
+ int onChangeCount = tOrderChangeMapper.selectCountByStatus(ChangeState.CHANGING.getCode(), orderNo);
|
|
|
+ if(onChangeCount > 0){
|
|
|
resultStatus = ChangeState.CHANGING.getCode();
|
|
|
} else {
|
|
|
- resultStatus = ChangeState.CHANGED.getCode();
|
|
|
+ int completeChangeCoumt = tOrderChangeMapper.selectCountByStatus(ChangeState.CHANGED.getCode(), orderNo);
|
|
|
+ if(completeChangeCoumt>0) resultStatus = ChangeState.CHANGED.getCode();
|
|
|
}
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
tOrder.setChangeStatus(resultStatus);
|
|
|
@@ -1702,4 +1735,5 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrderChangeMapper.updateByPrimaryKeySelective(change);
|
|
|
return updateOrderSatusByChange(change.getOrderNo());
|
|
|
}
|
|
|
+
|
|
|
}
|