FIX: 推送微信物流状态

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

@@ -34,6 +34,7 @@ import com.fs.live.service.ILiveOrderItemService;
 import com.fs.live.service.ILiveOrderService;
 import com.fs.live.vo.LiveAfterSalesListUVO;
 import com.fs.live.vo.LiveAfterSalesVo;
+import com.fs.store.cache.IFsUserCacheService;
 import com.fs.store.cache.IFsWarehousesCacheService;
 import com.fs.store.config.StoreConfig;
 import com.fs.store.domain.*;
@@ -140,6 +141,8 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
         return baseMapper.selectLiveAfterSalesList(liveAfterSales);
     }
 
+    @Autowired
+    private IFsUserCacheService fsUserCacheService;
     /**
      * 查询售后记录列表
      *
@@ -149,7 +152,16 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
     @Override
     public List<LiveAfterSalesVo> selectLiveAfterSalesVoList(LiveAfterSalesVo liveAfterSales)
     {
-        return baseMapper.selectLiveAfterSalesVoList(liveAfterSales);
+        List<LiveAfterSalesVo> liveAfterSalesVos = baseMapper.selectLiveAfterSalesVoList(liveAfterSales);
+        for (LiveAfterSalesVo item : liveAfterSalesVos) {
+            if(ObjectUtil.isNotNull(item.getUserId())) {
+                FsUser fsUser = fsUserCacheService.selectFsUserById(item.getUserId());
+                if(ObjectUtil.isNotNull(fsUser)) {
+                    item.setUserName(String.format("%s_%s",fsUser.getUserId(),fsUser.getNickname()));
+                }
+            }
+        }
+        return liveAfterSalesVos;
     }
 
     @Override

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

@@ -951,12 +951,13 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         if(order.getStatus()==-2){
             return R.error("已退款");
         }
+        log.info("准备退款 订单: {}",JSON.toJSONString(order));
         if(StringUtils.isNotEmpty(order.getExtendOrderId())){
             ErpRefundUpdateRequest request=new ErpRefundUpdateRequest();
             request.setTid(order.getOrderCode());
             request.setOid(order.getOrderCode());
             request.setRefund_state(1);
-            request.setOrderStatus(order.getStatus());
+            request.setOrderStatus(liveAfterSales.getOrderStatus());
 
             // 根据仓库code找erp
             if(StringUtils.isNotBlank(order.getStoreHouseCode())){

fs-service-system/src/main/java/com/fs/live/vo/LiveAfterSalesVo.java

@@ -81,6 +81,7 @@ public class LiveAfterSalesVo {
     /** 用户id */
     @Excel(name = "用户id")
     private Long userId;
+    private String userName;
 
     /** 商家收货人 */
     @Excel(name = "商家收货人")

fs-service-system/src/main/resources/mapper/live/LiveAfterSalesMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select las.id, las.live_id, las.store_id, las.order_id, las.refund_amount,
         las.refund_type, las.reasons, las.explains, las.explain_img, las.delivery_code, las.delivery_sn, las.delivery_name, las.status, las.sales_status,
         las.order_status, las.create_time, las.is_del, las.user_id, las.consignee, las.phone_number, las.address, las.company_id, las.company_user_id, las.dept_id,
-        cu.nick_name as company_user_nick_name, c.company_name,lo.order_code,lo.user_phone
+        cu.nick_name as company_user_nick_name, c.company_name,lo.order_code,lo.user_phone,las.user_id
         from live_after_sales las
         left join live_order lo on lo.order_id = las.order_id
         left join company_user cu on cu.user_id = las.company_user_id