FIX: 推送微信物流状态

fs-service-system/src/main/java/com/fs/erp/dto/ErpRefundUpdateRequest.java

@@ -15,4 +15,5 @@ public class ErpRefundUpdateRequest implements Serializable {
      */
     private Integer orderStatus;
 
+    private Long storeAfterSalesId;//售后id
 }

fs-service-system/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -461,7 +461,13 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
 
         // 如果不是待发货
         if(ObjectUtil.notEqual(param.getOrderStatus(), 2)){
-
+            FsJstAftersalePush fsJstAftersalePush = new FsJstAftersalePush();
+            fsJstAftersalePush.setOrderId(fsStoreOrder.getOrderCode());
+            fsJstAftersalePush.setTaskStatus(0);
+            fsJstAftersalePush.setType(String.valueOf(AfterSalesOrderStatusEnum.WAIT_SELLER_AGREE.getIndex()));
+            fsJstAftersalePush.setRetryCount(0);
+            fsJstAftersalePush.setAfterSaleId(String.valueOf(param.getStoreAfterSalesId()));
+            fsJstAftersalePushMapper.insert(fsJstAftersalePush);
         } else {
             // 如果是发货前退款，直接走取消订单流程
             // 如果是发货后退款，走售后流程

fs-service-system/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -359,6 +359,10 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
             else if(liveAfterSales.getOrderStatus().equals(OrderInfoEnum.STATUS_2.getValue())){
                 liveAfterSales.setStatus(2);
                 baseMapper.updateLiveAfterSales(liveAfterSales);
+
+            } else if(liveAfterSales.getOrderStatus().equals(3)) {
+                liveAfterSales.setStatus(1);
+                baseMapper.updateLiveAfterSales(liveAfterSales);
             }
             LiveAfterSalesLogs salesLogs = new LiveAfterSalesLogs();
             salesLogs.setStoreAfterSalesId(liveAfterSales.getId());

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -958,7 +958,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             request.setOid(order.getOrderCode());
             request.setRefund_state(1);
             request.setOrderStatus(liveAfterSales.getOrderStatus());
-
+            request.setStoreAfterSalesId(liveAfterSales.getId());
             // 根据仓库code找erp
             if(StringUtils.isNotBlank(order.getStoreHouseCode())){
                 String erp = fsWarehousesMapper.selectErpByCode(order.getStoreHouseCode());