|
@@ -317,6 +317,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
|
|
|
LiveOrder orderMap=new LiveOrder();
|
|
LiveOrder orderMap=new LiveOrder();
|
|
|
orderMap.setOrderId(order.getOrderId());
|
|
orderMap.setOrderId(order.getOrderId());
|
|
|
orderMap.setOrderCode(orderSn);
|
|
orderMap.setOrderCode(orderSn);
|
|
|
|
|
+ orderMap.setStatus(order.getStatus());
|
|
|
liveOrderService.updateLiveOrder(orderMap);
|
|
liveOrderService.updateLiveOrder(orderMap);
|
|
|
liveOrderItemMapper.updateFsStoreOrderCode(order.getOrderId(),orderSn);
|
|
liveOrderItemMapper.updateFsStoreOrderCode(order.getOrderId(),orderSn);
|
|
|
try {
|
|
try {
|
|
@@ -426,6 +427,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
|
|
|
storeAfterSales.setSalesStatus(0);
|
|
storeAfterSales.setSalesStatus(0);
|
|
|
storeAfterSales.setCreateTime(Timestamp.valueOf(LocalDateTime.now()));
|
|
storeAfterSales.setCreateTime(Timestamp.valueOf(LocalDateTime.now()));
|
|
|
storeAfterSales.setIsDel(0);
|
|
storeAfterSales.setIsDel(0);
|
|
|
|
|
+ storeAfterSales.setOrderStatus(orderStatus);
|
|
|
storeAfterSales.setUserId(Long.valueOf(userId));
|
|
storeAfterSales.setUserId(Long.valueOf(userId));
|
|
|
storeAfterSales.setOrderStatus(orderStatus);
|
|
storeAfterSales.setOrderStatus(orderStatus);
|
|
|
storeAfterSales.setCompanyId(order.getCompanyId());
|
|
storeAfterSales.setCompanyId(order.getCompanyId());
|
|
@@ -459,16 +461,9 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
|
|
|
request.setRefund_state(1);
|
|
request.setRefund_state(1);
|
|
|
request.setStoreAfterSalesId(storeAfterSales.getId());
|
|
request.setStoreAfterSalesId(storeAfterSales.getId());
|
|
|
if (StringUtils.isNotBlank(order.getExtendOrderId())){
|
|
if (StringUtils.isNotBlank(order.getExtendOrderId())){
|
|
|
- ErpOrderQueryRequert queryRequest = new ErpOrderQueryRequert();
|
|
|
|
|
- queryRequest.setCode(order.getExtendOrderId());
|
|
|
|
|
- ErpOrderQueryResponse response = erpOrderService.getLiveOrder(queryRequest);
|
|
|
|
|
- if (response.getOrders() != null && response.getOrders().size() > 0) {
|
|
|
|
|
- if (response.getOrders().get(0).getCancle() != null && !response.getOrders().get(0).getCancle()) {
|
|
|
|
|
- BaseResponse res = erpOrderService.refundUpdateLive(request);
|
|
|
|
|
- if(res.getSuccess()){
|
|
|
|
|
- return R.ok();
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ BaseResponse response=erpOrderService.refundUpdateLive(request);
|
|
|
|
|
+ if(response.getSuccess()){
|
|
|
|
|
+ return R.ok();
|
|
|
}
|
|
}
|
|
|
else{
|
|
else{
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
@@ -913,7 +908,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
|
|
|
logs.setStoreAfterSalesId(storeAfterSales.getId());
|
|
logs.setStoreAfterSalesId(storeAfterSales.getId());
|
|
|
logs.setChangeMessage(OrderInfoEnum.REFUND_STATUS_1.getDesc());
|
|
logs.setChangeMessage(OrderInfoEnum.REFUND_STATUS_1.getDesc());
|
|
|
liveAfterSalesLogsMapper.insertLiveAfterSalesLogs(logs);
|
|
liveAfterSalesLogsMapper.insertLiveAfterSalesLogs(logs);
|
|
|
- if (storeAfterSales.getOrderStatus().equals(2)) {
|
|
|
|
|
|
|
+ if (storeAfterSales.getOrderStatus().equals(1)) {
|
|
|
if (StringUtils.isNotEmpty(order.getExtendOrderId())) {
|
|
if (StringUtils.isNotEmpty(order.getExtendOrderId())) {
|
|
|
//更新订单code
|
|
//更新订单code
|
|
|
String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
|
|
String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
|
|
@@ -923,6 +918,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
|
|
|
LiveOrder orderMap = new LiveOrder();
|
|
LiveOrder orderMap = new LiveOrder();
|
|
|
orderMap.setOrderId(order.getOrderId());
|
|
orderMap.setOrderId(order.getOrderId());
|
|
|
orderMap.setOrderCode(orderSn);
|
|
orderMap.setOrderCode(orderSn);
|
|
|
|
|
+ orderMap.setStatus(order.getStatus());
|
|
|
liveOrderService.updateLiveOrder(orderMap);
|
|
liveOrderService.updateLiveOrder(orderMap);
|
|
|
//生成新的订单
|
|
//生成新的订单
|
|
|
List<LiveOrderPayment> payments = liveOrderPaymentMapper.selectLiveOrderPaymentByPay(5, order.getOrderId());
|
|
List<LiveOrderPayment> payments = liveOrderPaymentMapper.selectLiveOrderPaymentByPay(5, order.getOrderId());
|
|
@@ -934,7 +930,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
- if (liveOrderPaymentMapper.selectByBuissnessId(Long.valueOf(order.getOrderCode())) != null) {
|
|
|
|
|
|
|
+ if (liveOrderPaymentMapper.selectByBuissnessId(order.getOrderId()) != null) {
|
|
|
liveOrderService.createOmsOrder(order.getOrderId());
|
|
liveOrderService.createOmsOrder(order.getOrderId());
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|