xdd

fs-service-system/src/main/java/com/fs/store/service/ExpressToWxService.java

@@ -1,12 +1,14 @@
 package com.fs.store.service;
 
 import lombok.Getter;
+import org.springframework.stereotype.Service;
 
 @Getter
 public abstract class ExpressToWxService {
 
     private String orderCode;
 
+
     public void setOrderCode(String orderCode) {
         this.orderCode = orderCode;
     }
@@ -19,6 +21,8 @@ public abstract class ExpressToWxService {
 
     public abstract String getOrderGoodsInfo();
 
+    public abstract String getExpressCompany();
+    public abstract String getExpressNo();
 
     public abstract boolean support(Integer type);
 }

fs-service-system/src/main/java/com/fs/store/service/impl/LiveStreamShopExpressToWxService.java

@@ -9,6 +9,8 @@ import com.fs.live.domain.LiveOrderPayment;
 import com.fs.live.mapper.LiveOrderItemMapper;
 import com.fs.live.mapper.LiveOrderMapper;
 import com.fs.live.mapper.LiveOrderPaymentMapper;
+import com.fs.store.domain.FsStoreDelivers;
+import com.fs.store.mapper.FsStoreDeliversMapper;
 import com.fs.store.service.ExpressToWxService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +32,8 @@ public class LiveStreamShopExpressToWxService extends ExpressToWxService {
     private LiveOrderPaymentMapper liveOrderPaymentMapper;
     @Autowired
     private LiveOrderItemMapper liveOrderItemMapper;
+    @Autowired
+    private FsStoreDeliversMapper fsStoreDeliversMapper;
 
     private LiveOrder liveOrder;
     private LiveOrderPayment liveOrderPayment;
@@ -71,6 +75,24 @@ public class LiveStreamShopExpressToWxService extends ExpressToWxService {
         return sb.toString();
     }
 
+    @Override
+    public String getExpressCompany() {
+        List<FsStoreDelivers> byOrderId = fsStoreDeliversMapper.findByOrderIdWithType(liveOrder.getOrderId(),1);
+        if(CollectionUtils.isEmpty(byOrderId)){
+            throw new IllegalArgumentException(String.format("当前订单 %s 无物流记录",getOrderCode()));
+        }
+        return byOrderId.get(0).getDeliverSn();
+    }
+
+    @Override
+    public String getExpressNo() {
+        List<FsStoreDelivers> byOrderId = fsStoreDeliversMapper.findByOrderIdWithType(liveOrder.getOrderId(),1);
+        if(CollectionUtils.isEmpty(byOrderId)){
+            throw new IllegalArgumentException(String.format("当前订单 %s 无物流记录",getOrderCode()));
+        }
+        return byOrderId.get(0).getDeliverId();
+    }
+
     @Override
     public boolean support(Integer type) {
         return 1==type;

fs-service-system/src/main/java/com/fs/store/service/impl/ShopExpressToWxService.java

@@ -3,8 +3,10 @@ package com.fs.store.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fs.store.domain.FsStoreDelivers;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStorePayment;
+import com.fs.store.mapper.FsStoreDeliversMapper;
 import com.fs.store.mapper.FsStoreOrderMapper;
 import com.fs.store.mapper.FsStorePaymentMapper;
 import com.fs.store.service.ExpressToWxService;
@@ -26,7 +28,8 @@ public class ShopExpressToWxService extends ExpressToWxService {
     private FsStoreOrderMapper fsStoreOrderMapper;
     @Autowired
     private FsStorePaymentMapper fsStorePaymentMapper;
-
+    @Autowired
+    private FsStoreDeliversMapper fsStoreDeliversMapper;
 
     private FsStoreOrder fsStoreOrder;
     private FsStorePayment fsStorePayment;
@@ -61,6 +64,24 @@ public class ShopExpressToWxService extends ExpressToWxService {
         return getOrderGoodsInfo(fsStoreOrder);
     }
 
+    @Override
+    public String getExpressCompany() {
+        List<FsStoreDelivers> byOrderId = fsStoreDeliversMapper.findByOrderId(fsStoreOrder.getId());
+        if(CollectionUtils.isEmpty(byOrderId)){
+            throw new IllegalArgumentException(String.format("当前订单 %s 无物流记录",getOrderCode()));
+        }
+        return byOrderId.get(0).getDeliverSn();
+    }
+
+    @Override
+    public String getExpressNo() {
+        List<FsStoreDelivers> byOrderId = fsStoreDeliversMapper.findByOrderId(fsStoreOrder.getId());
+        if(CollectionUtils.isEmpty(byOrderId)){
+            throw new IllegalArgumentException(String.format("当前订单 %s 无物流记录",getOrderCode()));
+        }
+        return byOrderId.get(0).getDeliverId();
+    }
+
     @Override
     public boolean support(Integer type) {
         return 0 == type;