fix：“优化线下订单添加“

src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -39,7 +39,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wuhs
@@ -99,7 +99,7 @@ public class TCoinOrderController {
         LambdaQueryWrapper<TCoinOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TCoinOrder::getSn, sn);
         List<TCoinOrder> coinOrders = coinOrderService.list(queryWrapper);
-        if(coinOrders.size() > 0) {
+        if (coinOrders.size() > 0) {
             try {
                 esTCoinOrderService.insertData(coinOrders.get(0));
             } catch (Exception e) {
@@ -143,12 +143,12 @@ public class TCoinOrderController {
         tOrderDetails.setAdminId(adminId);
 
         // 设备类型
-        if (StringUtils.isNotEmpty(machineType) && machineType.equals("1")) {
-            coinOrder.setMachineType(machineType);
-            tOrderDetails.setMachineType(machineType);
-        } else {
+        if (StringUtils.isEmpty(machineType) || machineType.equals("0")) {
             coinOrder.setMachineType("0");
             tOrderDetails.setMachineType("0");
+        } else {
+            coinOrder.setMachineType(machineType);
+            tOrderDetails.setMachineType(machineType);
         }
         // 公司平台
         if (StringUtils.isNotEmpty(companyType) && companyType.equals("1")) {
@@ -205,10 +205,10 @@ public class TCoinOrderController {
         try {
             // 推送微信订单
             // 判断是否开启订单推送功能
-            if(admin != null && StringUtils.isNotEmpty(admin.getOrderNotice()) && admin.getOrderNotice().equals("1")) {
+            if (admin != null && StringUtils.isNotEmpty(admin.getOrderNotice()) && admin.getOrderNotice().equals("1")) {
                 String openId = R.getDataIfSuccess(szwlFeign.getOpenId(adminId));
                 // 获取openId
-                if(StringUtils.isNotEmpty(openId)) {
+                if (StringUtils.isNotEmpty(openId)) {
                     coinOrderService.sendWechatMessage(openId, equipment, coinOrder, admin.getCompanyType());
                 }
             }
@@ -236,7 +236,7 @@ public class TCoinOrderController {
         LambdaQueryWrapper<TCoinOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TCoinOrder::getSn, sn);
         List<TCoinOrder> coinOrders = coinOrderService.list(queryWrapper);
-        if(coinOrders.size() > 0) {
+        if (coinOrders.size() > 0) {
             try {
                 esTCoinOrderService.insertData(coinOrders.get(0));
             } catch (Exception e) {
@@ -280,12 +280,12 @@ public class TCoinOrderController {
         tOrderDetails.setAdminId(adminId);
 
         // 设备类型
-        if (StringUtils.isNotEmpty(machineType) && machineType.equals("1")) {
-            coinOrder.setMachineType(machineType);
-            tOrderDetails.setMachineType(machineType);
-        } else {
+        if (StringUtils.isEmpty(machineType) || machineType.equals("0")) {
             coinOrder.setMachineType("0");
             tOrderDetails.setMachineType("0");
+        } else {
+            coinOrder.setMachineType(machineType);
+            tOrderDetails.setMachineType(machineType);
         }
         // 公司平台
         if (StringUtils.isNotEmpty(companyType) && companyType.equals("1")) {
@@ -326,7 +326,7 @@ public class TCoinOrderController {
                 String[] split = name.split(",");
                 for (String s : split) {
                     String[] strings = s.split("-");
-                    map.put(strings[0],Integer.valueOf(strings[1]));
+                    map.put(strings[0], Integer.valueOf(strings[1]));
                 }
                 for (String key : map.keySet()) {
                     // key:"A01",value:"1"
@@ -381,10 +381,10 @@ public class TCoinOrderController {
         try {
             // 推送微信订单
             // 判断是否开启订单推送功能
-            if(admin != null && StringUtils.isNotEmpty(admin.getOrderNotice()) && admin.getOrderNotice().equals("1")) {
+            if (admin != null && StringUtils.isNotEmpty(admin.getOrderNotice()) && admin.getOrderNotice().equals("1")) {
                 String openId = R.getDataIfSuccess(szwlFeign.getOpenId(adminId));
                 // 获取openId
-                if(StringUtils.isNotEmpty(openId)) {
+                if (StringUtils.isNotEmpty(openId)) {
                     coinOrderService.sendWechatMessage(openId, equipment, coinOrder, admin.getCompanyType());
                 }
             }
@@ -489,31 +489,31 @@ public class TCoinOrderController {
     @PostMapping("/fixOrder")
     public ResponseModel<?> fixOrder(@RequestBody TCoinOrderParam param) {
         LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
-        query.gt(TCoinOrder::getCreateDate,param.getCreateDate_start());
-        query.lt(TCoinOrder::getCreateDate,param.getCreateDate_end());
+        query.gt(TCoinOrder::getCreateDate, param.getCreateDate_start());
+        query.lt(TCoinOrder::getCreateDate, param.getCreateDate_end());
         List<TCoinOrder> list = coinOrderService.list(query);
         ArrayList<String> snList = new ArrayList<>();
         for (TCoinOrder coinOrder : list) {
             String sn = coinOrder.getSn();
             if (!snList.contains(sn)) {
                 LambdaQueryWrapper<TCoinOrder> snQuery = Wrappers.lambdaQuery();
-                snQuery.eq(TCoinOrder::getSn,sn);
-                query.gt(TCoinOrder::getCreateDate,param.getCreateDate_start());
-                query.lt(TCoinOrder::getCreateDate,param.getCreateDate_end());
+                snQuery.eq(TCoinOrder::getSn, sn);
+                query.gt(TCoinOrder::getCreateDate, param.getCreateDate_start());
+                query.lt(TCoinOrder::getCreateDate, param.getCreateDate_end());
                 List<TCoinOrder> coinOrderList = coinOrderService.list(snQuery);
-                if(coinOrderList.size() > 1) {
+                if (coinOrderList.size() > 1) {
                     snList.add(sn);
                 }
             }
         }
-        if(snList.size() > 0) {
+        if (snList.size() > 0) {
             for (String s : snList) {
-                try{
+                try {
                     LambdaQueryWrapper<TCoinOrder> snQuery = Wrappers.lambdaQuery();
-                    snQuery.eq(TCoinOrder::getSn,s);
+                    snQuery.eq(TCoinOrder::getSn, s);
                     List<TCoinOrder> coinOrderList = coinOrderService.list(snQuery);
-                    if(coinOrderList.size() > 1) {
-                        for(int i = 1; i < coinOrderList.size(); i++) {
+                    if (coinOrderList.size() > 1) {
+                        for (int i = 1; i < coinOrderList.size(); i++) {
                             TCoinOrder coinOrder = coinOrderList.get(i);
                             Long id = coinOrder.getId();
                             coinOrderService.removeById(id);
@@ -521,7 +521,7 @@ public class TCoinOrderController {
                         }
                     }
                 } catch (Exception e) {
-                    log.error("ElasticsearchRunner deleteData 发生错误：{}" , e);
+                    log.error("ElasticsearchRunner deleteData 发生错误：{}", e);
                 }
             }
         }
@@ -529,6 +529,5 @@ public class TCoinOrderController {
     }
 
 
-
 }
 

src/main/java/com/szwl/controller/TOrderController.java

@@ -6,16 +6,10 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import cn.com.crbank.ommo.esclient.ElasticsearchRunner;
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.util.ListUtils;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.common.aop.LogAnnotation;
@@ -28,8 +22,13 @@ import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.dto.OrderDto;
 import com.szwl.model.entity.*;
-import com.szwl.model.excel.*;
-import com.szwl.model.query.*;
+import com.szwl.model.excel.CoinOrderTarget;
+import com.szwl.model.excel.OrderByAdminTarget;
+import com.szwl.model.excel.OrderByClientidTarget;
+import com.szwl.model.excel.OrderTarget;
+import com.szwl.model.query.OrderStatisticsDTO;
+import com.szwl.model.query.StatisticsParam;
+import com.szwl.model.query.TOrderParam;
 import com.szwl.model.utils.DateUtils;
 import com.szwl.model.utils.FgObjectUtil;
 import com.szwl.model.utils.JsonUtils;
@@ -38,7 +37,6 @@ import com.szwl.service.es.EsTEquipmentService;
 import com.szwl.service.es.EsTOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -650,7 +648,7 @@ public class TOrderController {
             param.setIfForeign(isForeignUser(param.getAdminId()));
             if (admin.getType() == 2) {
                 //商家
-                if (param.getEquipmentId() != null && param.getEquipmentId() != "") {
+                if (param.getEquipmentId() != null && !param.getEquipmentId().isEmpty()) {
                     //查机器
                     TEquipment equipment = R.getDataIfSuccess(szwlFeign.findById(param.getEquipmentId()));
                     param.setClientId(equipment.getClientId());