fix：“修改订单按支付时间统计，线下订单导出添加支付方式”

src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -191,8 +191,8 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
         if(StringUtils.equals("0",param.getIfForeign())){ // 国内用户
             TOrderParam tOrderParam = new TOrderParam();
             tOrderParam.setStatus(1);
-            tOrderParam.setCreateDate_start(start);
-            tOrderParam.setCreateDate_end(end);
+            tOrderParam.setPayDate_start(start);
+            tOrderParam.setPayDate_end(end);
             if(StringUtils.isNotEmpty(param.getAdminId())){ // 所属商家id
                 tOrderParam.setAdminId(Long.parseLong(param.getAdminId()));
             }
@@ -223,8 +223,8 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
         }else{ // 国外用户
             TEquipmentParam tEquipmentParam = new TEquipmentParam();
             TCoinOrderParam tCoinOrderParam = new TCoinOrderParam();
-            tCoinOrderParam.setCreateDate_start(start);
-            tCoinOrderParam.setCreateDate_end(end);
+            tCoinOrderParam.setPayDate_start(start);
+            tCoinOrderParam.setPayDate_end(end);
             // 设备id
             if(StringUtils.isNotEmpty(param.getClientId())){
 //                tEquipmentParam.setId(Long.parseLong(param.getEquipmentId()));
@@ -348,7 +348,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
 
             // 时间聚合
             AggregationBuilder dateHistogram = AggregationBuilders.dateHistogram(aggregationResultName)
-                    .field("createDate")
+                    .field("payDate")
                     .calendarInterval(interval)
                     .format(format);
 

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

@@ -42,9 +42,19 @@ public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOr
             coinOrderTarget.setPayDate(coinOrder.getCreateDate());
             coinOrderTarget.setStatus("已支付");
             if (coinOrder.getPayType() == 0) {
-                coinOrderTarget.setFrp_code("无需支付");
+                coinOrderTarget.setFrp_code("No-Pay");
+            } else if (coinOrder.getPayType() == 1) {
+                coinOrderTarget.setFrp_code("Coin");
+            } else if (coinOrder.getPayType() == 2) {
+                coinOrderTarget.setFrp_code("Notes");
+            } else if (coinOrder.getPayType() == 3) {
+                coinOrderTarget.setFrp_code("Coin + Notes");
+            } else if (coinOrder.getPayType() == 4) {
+                coinOrderTarget.setFrp_code("Credit card");
+            } else if (coinOrder.getPayType() == 5) {
+                coinOrderTarget.setFrp_code("E-PAYMENT");
             } else {
-                coinOrderTarget.setFrp_code("投币支付");
+                coinOrderTarget.setFrp_code("Other");
             }
             list.add(coinOrderTarget);
         }