feat：“线下订单导出表添加设备名称”

src/main/java/com/szwl/model/excel/CoinOrderTarget.java

@@ -31,6 +31,12 @@ public class CoinOrderTarget {
     private String clientId;
 
     /**
+     * 设备名称
+     */
+    @Excel(name = "Machine name", width = 20.0D)
+    private String machineName;
+
+    /**
      * 支付时间
      */
     @Excel(name = "Payment time", width = 20.0D)
@@ -117,4 +123,12 @@ public class CoinOrderTarget {
     public void setPrice(BigDecimal price) {
         this.price = price;
     }
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
 }

src/main/java/com/szwl/service/impl/TCoinOrderServiceImpl.java

@@ -1,9 +1,12 @@
 package com.szwl.service.impl;
 
+import com.szwl.feign.SzwlFeign;
 import com.szwl.model.bean.OrderDaoChuDTO;
+import com.szwl.model.bo.R;
 import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TCoinOrder;
 import com.szwl.mapper.TCoinOrderMapper;
+import com.szwl.model.entity.TEquipment;
 import com.szwl.model.excel.CoinOrderTarget;
 import com.szwl.model.query.OrderDaoChuParam;
 import com.szwl.model.query.OrderStatisticsDTO;
@@ -29,6 +32,10 @@ import java.util.List;
 public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOrder> implements TCoinOrderService {
     @Resource
     TCoinOrderMapper tCoinOrderMapper;
+
+    @Autowired
+    SzwlFeign szwlFeign;
+
     @Override
     public List<CoinOrderTarget> findByCoinOrder(TAdmin admin, List<TCoinOrder> coinOrders) {
         ArrayList<CoinOrderTarget> list = new ArrayList<>();
@@ -37,6 +44,10 @@ public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOr
             coinOrderTarget.setSn(coinOrder.getSn());
             coinOrderTarget.setProductName(coinOrder.getProductName());
             coinOrderTarget.setClientId(coinOrder.getClientId());
+            if (coinOrder.getEquipmentId() != null) {
+                TEquipment equipment = R.getDataIfSuccess(szwlFeign.findById(String.valueOf(coinOrder.getEquipmentId())));
+                coinOrderTarget.setMachineName(equipment.getName());
+            }
             coinOrderTarget.setName(admin.getUsername());
             coinOrderTarget.setPrice(coinOrder.getPrice());
             coinOrderTarget.setPayDate(coinOrder.getCreateDate());