|
|
@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fs.common.core.domain.AjaxResult;
|
|
|
import com.fs.common.core.domain.R;
|
|
|
import com.fs.common.exception.CustomException;
|
|
|
+import com.fs.common.utils.CloudHostUtils;
|
|
|
import com.fs.common.utils.DateUtils;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.poi.ExcelUtil;
|
|
|
@@ -328,50 +329,54 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
|
|
|
or.setOrderId(order.getOrderId());
|
|
|
or.setStatus(order.getOrderStatus());
|
|
|
fsStoreOrderMapper.updateFsStoreOrder(or);
|
|
|
- if (order.getOrderStatus() == 2) {
|
|
|
- FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderId(order.getOrderId());
|
|
|
- String newOrderSn = OrderCodeUtils.getOrderSn();
|
|
|
- if (StringUtils.isEmpty(newOrderSn)) {
|
|
|
- newOrderSn = OrderCodeUtils.getOrderSn();
|
|
|
- }
|
|
|
- FsStoreOrder newOrder = new FsStoreOrder();
|
|
|
- newOrder.setOrderId(order.getOrderId());
|
|
|
- newOrder.setOrderCode(newOrderSn);
|
|
|
- fsStoreOrderMapper.updateFsStoreOrder(newOrder);
|
|
|
- or.setOrderCode(newOrderSn);
|
|
|
- if (fsStoreOrder.getPackageOrderId() != null) {
|
|
|
- FsPackageOrder fsPackageOrder = new FsPackageOrder();
|
|
|
- fsPackageOrder.setOrderId(fsStoreOrder.getPackageOrderId());
|
|
|
- fsPackageOrder.setOrderSn(newOrderSn);
|
|
|
- fsPackageOrderMapper.updateFsPackageOrder(fsPackageOrder);
|
|
|
- }
|
|
|
- if (fsStoreOrder.getInquiryOrderId() != null) {
|
|
|
- FsInquiryOrder fsInquiryOrder = new FsInquiryOrder();
|
|
|
- fsInquiryOrder.setOrderSn(newOrderSn);
|
|
|
- fsInquiryOrder.setOrderId(fsStoreOrder.getInquiryOrderId());
|
|
|
- fsInquiryOrderMapper.updateFsInquiryOrder(fsInquiryOrder);
|
|
|
- }
|
|
|
+ //金牛订单取消售后审核不需要操作
|
|
|
+ if(!CloudHostUtils.hasCloudHostName("金牛名医","康年堂")){
|
|
|
+ if (order.getOrderStatus() == 2) {
|
|
|
+ FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderId(order.getOrderId());
|
|
|
+ String newOrderSn = OrderCodeUtils.getOrderSn();
|
|
|
+ if (StringUtils.isEmpty(newOrderSn)) {
|
|
|
+ newOrderSn = OrderCodeUtils.getOrderSn();
|
|
|
+ }
|
|
|
+ FsStoreOrder newOrder = new FsStoreOrder();
|
|
|
+ newOrder.setOrderId(order.getOrderId());
|
|
|
+ newOrder.setOrderCode(newOrderSn);
|
|
|
+ fsStoreOrderMapper.updateFsStoreOrder(newOrder);
|
|
|
+ or.setOrderCode(newOrderSn);
|
|
|
+ if (fsStoreOrder.getPackageOrderId() != null) {
|
|
|
+ FsPackageOrder fsPackageOrder = new FsPackageOrder();
|
|
|
+ fsPackageOrder.setOrderId(fsStoreOrder.getPackageOrderId());
|
|
|
+ fsPackageOrder.setOrderSn(newOrderSn);
|
|
|
+ fsPackageOrderMapper.updateFsPackageOrder(fsPackageOrder);
|
|
|
+ }
|
|
|
+ if (fsStoreOrder.getInquiryOrderId() != null) {
|
|
|
+ FsInquiryOrder fsInquiryOrder = new FsInquiryOrder();
|
|
|
+ fsInquiryOrder.setOrderSn(newOrderSn);
|
|
|
+ fsInquiryOrder.setOrderId(fsStoreOrder.getInquiryOrderId());
|
|
|
+ fsInquiryOrderMapper.updateFsInquiryOrder(fsInquiryOrder);
|
|
|
+ }
|
|
|
|
|
|
- List<FsStorePayment> payments = fsStorePaymentMapper.selectFsStorePaymentByPay(2, fsStoreOrder.getOrderId());
|
|
|
- if (fsStoreOrder.getPackageOrderId() != null) {
|
|
|
- payments = fsStorePaymentMapper.selectFsStorePaymentByPay(3, fsStoreOrder.getPackageOrderId());
|
|
|
- }
|
|
|
- for (FsStorePayment payment : payments) {
|
|
|
- FsStorePayment fsStorePayment = new FsStorePayment();
|
|
|
- fsStorePayment.setPaymentId(payment.getPaymentId());
|
|
|
- fsStorePayment.setBusinessCode(newOrderSn);
|
|
|
- fsStorePaymentMapper.updateFsStorePayment(fsStorePayment);
|
|
|
- }
|
|
|
+ List<FsStorePayment> payments = fsStorePaymentMapper.selectFsStorePaymentByPay(2, fsStoreOrder.getOrderId());
|
|
|
+ if (fsStoreOrder.getPackageOrderId() != null) {
|
|
|
+ payments = fsStorePaymentMapper.selectFsStorePaymentByPay(3, fsStoreOrder.getPackageOrderId());
|
|
|
+ }
|
|
|
+ for (FsStorePayment payment : payments) {
|
|
|
+ FsStorePayment fsStorePayment = new FsStorePayment();
|
|
|
+ fsStorePayment.setPaymentId(payment.getPaymentId());
|
|
|
+ fsStorePayment.setBusinessCode(newOrderSn);
|
|
|
+ fsStorePaymentMapper.updateFsStorePayment(fsStorePayment);
|
|
|
+ }
|
|
|
|
|
|
- try {
|
|
|
- fsStoreOrderService.createOmsOrder(order.getOrderId());
|
|
|
- } catch (ParseException e) {
|
|
|
+ try {
|
|
|
+ fsStoreOrderService.createOmsOrder(order.getOrderId());
|
|
|
+ } catch (ParseException e) {
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
return 1;
|
|
|
}
|
|
|
|