From 19c3024816a0aa7d0995d3108fff8cda4e1d5e38 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 26 十月 2024 09:01:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java                        |   39 ++++
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java                                   |    4 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java                                |   12 
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java                     |    1 
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java                        |    8 +
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java            |    3 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java            |    2 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java                                 |    4 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java                       |   12 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java        |    1 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java                |    2 
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/ChargingHandshakeController.java            |    2 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java  |   55 ++++--
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml                                         |  106 +++++++-----
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java                           |   27 ++
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TEvaluationTagClient.java                          |    2 
 ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml                           |    3 
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingHandshakeServiceImpl.java |   12 +
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java                |    1 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java                             |   11 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java                          |    8 +
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml                                              |    7 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java             |    3 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java           |   15 +
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml                                         |    2 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java              |   83 +++++----
 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java                          |    1 
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingHandshakeService.java          |    4 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ParkingRecordPageQuery.java                      |    2 
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java                                 |    2 
 30 files changed, 292 insertions(+), 142 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index b6cd84b..3e5d867 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -80,6 +80,14 @@
     @ApiModelProperty(value = "总费用")
     @TableField("order_amount")
     private BigDecimal orderAmount;
+    
+    @ApiModelProperty(value = "支付金额")
+    @TableField("payment")
+    private BigDecimal payment;
+    
+    @ApiModelProperty(value = "支付方式")
+    @TableField("payType")
+    private String payType;
 
     @ApiModelProperty(value = "状态(1=已进场,2=已出场,3=已缴费出场)")
     @TableField("status")
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
index ac3be77..9ae1359 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
@@ -11,6 +11,7 @@
 public class QrCodeDelivery {
 
     private String charging_pile_code; // 桩编码
+    private String charging_gun_code; // 枪编码
     private Integer code_format; // "0:第一种前缀+桩编号  1:第二种前缀+桩编号+枪编号"
     private Integer prefix_length; // 二维码前缀长度长度最大不超过200 字节
     private String code_prefix; // 如:“www.baidu.com?No=”
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java
index 5f61a56..6f2f04c 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java
@@ -9,7 +9,7 @@
 @Data
 public class TCharingUserEvaluateVO {
     @ApiModelProperty("评价分")
-    Long aver;
+    Double aver;
     @ApiModelProperty("各个评分数量")
     List<Map<String,Object>> evaluate;
     @ApiModelProperty("差评数量")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TEvaluationTagClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TEvaluationTagClient.java
index b11e4bb..65045dc 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TEvaluationTagClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TEvaluationTagClient.java
@@ -26,7 +26,7 @@
 	 * @return
 	 */
 	@PostMapping("/t-evaluation-tag/getTagList")
-	R<List<TEvaluationTagVO>> getTagList(Integer type);
+	R<List<TEvaluationTagVO>> getTagList(@RequestParam("type") Integer type);
 	/**
 	 * 获取标签列表
 	 * @return
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index c079129..4c2f434 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -238,11 +238,13 @@
 		roleSiteClient.delRoleSite(dto.getRoleId());
 		//添加站点权限
 		List<TRoleSite> roleSites = new ArrayList<>();
-		for (Integer siteId : dto.getSiteIds()) {
-			TRoleSite roleSite = new TRoleSite();
-			roleSite.setRoleId(role.getRoleId().intValue());
-			roleSite.setSiteId(siteId);
-			roleSites.add(roleSite);
+		if(null != dto.getSiteIds()){
+			for (Integer siteId : dto.getSiteIds()) {
+				TRoleSite roleSite = new TRoleSite();
+				roleSite.setRoleId(role.getRoleId().intValue());
+				roleSite.setSiteId(siteId);
+				roleSites.add(roleSite);
+			}
 		}
 		roleSiteClient.addRoleSite(roleSites);
 		return AjaxResult.success();
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 37e4f92..622f1a1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -188,17 +188,17 @@
 		siteList.setPageSize(99999);
 		PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
 		for (GetSiteListDTO record : list.getRecords()) {
-			Long count = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 1).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
+			Long count = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 1).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
 			record.setC1(count);
-			Long count1 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 1).eq(TChargingGun::getStatus, 2).count();
+			Long count1 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 1).eq(TChargingGun::getStatus, 2).count();
 			record.setC2(count1);
-			Long count2 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 2).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
+			Long count2 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 2).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
 			record.setK1(count2);
-			Long count3 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 2).eq(TChargingGun::getStatus, 2).count();
+			Long count3 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 2).eq(TChargingGun::getStatus, 2).count();
 			record.setK2(count3);
-			Long count4 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 3).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
+			Long count4 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 3).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
 			record.setM1(count4);
-			Long count5 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 3).eq(TChargingGun::getStatus, 2).count();
+			Long count5 = chargingGunService.lambdaQuery().eq(TChargingGun::getSiteId, record.getId()).eq(TChargingGun::getChargeMode, 3).eq(TChargingGun::getStatus, 2).count();
 			record.setM2(count5);
 
 			//利用率
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index aaf608f..2670e36 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -377,6 +377,7 @@
 
             }else if (byId.getAuditStatus()==2){
                 byId.setTwoRemark(steategyPassDto.getRemark());
+                byId.setTwoAuditTime(LocalDateTime.now());
             }
 
             byId.setAuditStatus(4);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
index d7272a4..89d4819 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
@@ -4,16 +4,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.chargingPile.api.dto.CheckChargingStrategyDTO;
-import com.ruoyi.chargingPile.api.model.Site;
-import com.ruoyi.chargingPile.api.model.TAccountingStrategy;
-import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.model.*;
 import com.ruoyi.chargingPile.api.vo.StrategyPriceVO;
 import com.ruoyi.chargingPile.api.vo.TAccountingStrategyDetailVO;
-import com.ruoyi.chargingPile.service.ISiteService;
-import com.ruoyi.chargingPile.service.TAccountingStrategyDetailService;
-import com.ruoyi.chargingPile.service.TAccountingStrategyService;
-import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.chargingPile.service.*;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -40,13 +34,15 @@
 
     private final ISiteService siteService;
     private final TChargingPileService chargingPileService;
+    private final TChargingGunService chargingGunService;
     private final TAccountingStrategyService accountingStrategyService;
     private final TAccountingStrategyDetailService accountingStrategyDetailService;
 
     @Autowired
-    public TAccountingStrategyDetailController(ISiteService siteService, TChargingPileService chargingPileService, TAccountingStrategyService accountingStrategyService, TAccountingStrategyDetailService accountingStrategyDetailService) {
+    public TAccountingStrategyDetailController(ISiteService siteService, TChargingPileService chargingPileService, TChargingGunService chargingGunService, TAccountingStrategyService accountingStrategyService, TAccountingStrategyDetailService accountingStrategyDetailService) {
         this.siteService = siteService;
         this.chargingPileService = chargingPileService;
+        this.chargingGunService = chargingGunService;
         this.accountingStrategyService = accountingStrategyService;
         this.accountingStrategyDetailService = accountingStrategyDetailService;
     }
@@ -123,11 +119,22 @@
         if(Objects.isNull(chargingPile)){
             return R.fail("未查询到该桩设备");
         }
-        Site site = siteService.getById(chargingPile.getSiteId());
-        TAccountingStrategy accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
-        TAccountingStrategyDetail one = accountingStrategyDetailService.getOne(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
-                .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId())
-                .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
+        TChargingGun chargingGun = chargingGunService.getOne(Wrappers.lambdaQuery(TChargingGun.class)
+                .eq(TChargingGun::getChargingPileId, chargingPile.getId())
+                .last("LIMIT 1"));
+        TAccountingStrategy accountingStrategy = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
+        TAccountingStrategyDetail one;
+        if(Objects.nonNull(accountingStrategy)){
+            one = accountingStrategyDetailService.getOne(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+                    .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId())
+                    .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
+        }else {
+            Site site = siteService.getById(chargingPile.getSiteId());
+            accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
+            one = accountingStrategyDetailService.getOne(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+                    .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId())
+                    .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
+        }
         return R.ok(one);
     }
     /**
@@ -178,11 +185,21 @@
         if(Objects.isNull(chargingPile)){
             return R.fail("未查询到该桩设备");
         }
-        Site site = siteService.getById(chargingPile.getSiteId());
-        TAccountingStrategy accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
-        List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
-                .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId()));
-        return R.ok(accountingStrategyDetails);
+        TChargingGun chargingGun = chargingGunService.getOne(Wrappers.lambdaQuery(TChargingGun.class)
+                .eq(TChargingGun::getChargingPileId, chargingPile.getId())
+                .last("LIMIT 1"));
+        TAccountingStrategy accountingStrategy = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
+        if(Objects.nonNull(accountingStrategy)){
+            List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+                    .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId()));
+            return R.ok(accountingStrategyDetails);
+        }else {
+            Site site = siteService.getById(chargingPile.getSiteId());
+            accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
+            List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+                    .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId()));
+            return R.ok(accountingStrategyDetails);
+        }
     }
 }
 
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index 0f54b24..ff411ec 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -60,10 +60,10 @@
 
     private final TChargingPileService chargingPileService;
     private final TChargingGunService chargingGunService;
-	
+
 	@Resource
 	private RedisService redisService;
-	
+
 	@Resource
 	private TFaultMessageService faultMessageService;
 
@@ -113,7 +113,7 @@
 		return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
 				.in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds)));
 	}
-	
+
 	@ResponseBody
 	@GetMapping("/pageChargingPileList")
 	@ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
@@ -121,7 +121,7 @@
 		PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
 		return AjaxResult.success(list);
 	}
-	
+
 	@ResponseBody
 	@Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
 	@PostMapping("/addChargingPile")
@@ -129,8 +129,8 @@
 	public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){
 		return chargingPileService.addChargingPile(chargingPile);
 	}
-	
-	
+
+
 	@ResponseBody
 	@GetMapping("/getChargingPile/{id}")
 	@ApiOperation(value = "获取充电桩详情数据", tags = {"管理后台-充电桩信息"})
@@ -138,8 +138,8 @@
 		TChargingPile chargingPile = chargingPileService.getChargingPile(id);
 		return AjaxResult.success(chargingPile);
 	}
-	
-	
+
+
 	@ResponseBody
 	@Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
 	@PostMapping("/editChargingPile")
@@ -147,9 +147,9 @@
 	public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){
 		return chargingPileService.editChargingPile(chargingPile);
 	}
-	
-	
-	
+
+
+
 	@ResponseBody
 	@DeleteMapping("/delChargingPile")
 	@Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -160,8 +160,8 @@
 	public AjaxResult delChargingPile(@RequestParam("id") Integer[] id){
 		return chargingPileService.delChargingPile(id);
 	}
-	
-	
+
+
 	@ResponseBody
 	@Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
 	@PostMapping("/batchSetAccountingStrategy")
@@ -170,8 +170,8 @@
 		chargingPileService.batchSetAccountingStrategy(setAccountingStrategy);
 		return AjaxResult.success();
 	}
-	
-	
+
+
 	@ResponseBody
 	@GetMapping("/chargeMonitoring/{siteId}")
 	@ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
@@ -188,8 +188,8 @@
 		ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
 		return AjaxResult.success(chargingGunCountMonitoring);
 	}
-	
-	
+
+
 	@ResponseBody
 	@GetMapping("/getChargingGunMonitoring")
 	@ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
@@ -197,8 +197,8 @@
 		PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
 		return AjaxResult.success(chargingGunMonitoring);
 	}
-	
-	
+
+
 	/**
 	 * 根据id获取充电桩信息
 	 * @param id
@@ -210,8 +210,8 @@
 		TChargingPile chargingPile = chargingPileService.getById(id);
 		return R.ok(chargingPile);
 	}
-	
-	
+
+
 	/**
 	 * 更新充电桩状态
 	 * @param code
@@ -223,29 +223,40 @@
 		TChargingPile chargingPile = chargingPileService.getOne(new LambdaQueryWrapper<TChargingPile>()
 				.eq(TChargingPile::getCode, code).eq(TChargingPile::getDelFlag, 0));
 		if(null != chargingPile){
-			if(chargingPile.getStatus() == 1){
-				TFaultMessage faultMessage = new TFaultMessage();
-				faultMessage.setSiteId(chargingPile.getSiteId());
-				faultMessage.setChargingPileId(chargingPile.getId());
-				faultMessage.setStatus(1);
-				faultMessage.setDownTime(LocalDateTime.now());
-				faultMessage.setCreateTime(LocalDateTime.now());
-				faultMessage.setDelFlag(false);
-				faultMessage.setContent("设备离线");
-				faultMessageService.save(faultMessage);
-				
-				chargingPile.setStatus(0 == status ? 1 : 3);
-				chargingPileService.updateById(chargingPile);
+			//充电桩正常,返回异常,处理充电桩状态和添加故障记录
+			if(chargingPile.getStatus() == 1 && 1 == status){
+				TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
+						.eq(TFaultMessage::getStatus, 2).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
+				if(null == faultMessage){
+					faultMessage = new TFaultMessage();
+					faultMessage.setSiteId(chargingPile.getSiteId());
+					faultMessage.setChargingPileId(chargingPile.getId());
+					faultMessage.setStatus(2);
+					faultMessage.setDownTime(LocalDateTime.now());
+					faultMessage.setCreateTime(LocalDateTime.now());
+					faultMessage.setDelFlag(false);
+					faultMessage.setContent("设备故障");
+					faultMessageService.save(faultMessage);
+
+					chargingPile.setStatus(0 == status ? 1 : 3);
+					chargingPileService.updateById(chargingPile);
+				}
 			}
 			if(chargingPile.getStatus() != 1 && 0 == status){
-				TFaultMessage one = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId()).isNull(TFaultMessage::getEndTime));
+				TFaultMessage one = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
+						.isNull(TFaultMessage::getEndTime));
 				if(null != one){
 					one.setEndTime(LocalDateTime.now());
 					faultMessageService.updateById(one);
 				}
+
+				chargingPile.setStatus(0 == status ? 1 : 3);
+				chargingPileService.updateById(chargingPile);
 			}
 			if(0 == status){
-				redisService.getCacheMap("charging_pile_online").put(code, System.currentTimeMillis());
+				Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_pile_online");
+				charging_pile_online.put(code, System.currentTimeMillis());
+				redisService.setCacheMap("charging_pile_online", charging_pile_online);
 			}
 		}
 	}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
index 3d0e9e0..3c8920c 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
@@ -155,7 +155,7 @@
     @PostMapping(value = "/getRecordAmount")
     public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore){
         BigDecimal sum =  parkingRecordService.getSum(sixBefore);
-        return R.ok();
+        return R.ok(sum);
     }
     
     
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
index 0f2598b..3ead497 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
@@ -63,8 +63,7 @@
     @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "列表")
     @PostMapping(value = "/page")
     public R<Page<TParkingRecord>> page(@RequestBody ParkingRecordPageQuery query) {
-        Page<TParkingRecord> page = parkingRecordService.lambdaQuery().ge(query.getStart() != null, TParkingRecord::getCreateTime, query.getStart())
-                .le(query.getEnd() != null, TParkingRecord::getCreateTime, query.getEnd())
+        Page<TParkingRecord> page = parkingRecordService.lambdaQuery()
                 .like(query.getLicensePlate() != null, TParkingRecord::getLicensePlate, query.getLicensePlate())
                 .eq(query.getStatus() != null, TParkingRecord::getStatus, query.getStatus())
                 .eq(query.getOutParkingType() != null, TParkingRecord::getOutParkingType, query.getOutParkingType())
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ParkingRecordPageQuery.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ParkingRecordPageQuery.java
index 0062f60..b67c9f9 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ParkingRecordPageQuery.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ParkingRecordPageQuery.java
@@ -2,6 +2,7 @@
 
 import com.ruoyi.common.core.web.page.BasePage;
 import lombok.Data;
+import org.stringtemplate.v4.ST;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -10,6 +11,7 @@
 public class ParkingRecordPageQuery extends BasePage {
     LocalDate start;
     LocalDate end;
+    String timePeriod;
     String licensePlate;
     Integer status;
     Integer outParkingType;
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index f320a87..dcea1b1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -144,6 +144,7 @@
         String code_prefix = "https://mxcd.zhinenganguan.com?No=";
         QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
         qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+        qrCodeDelivery.setCharging_gun_code(dto.getCode());
         qrCodeDelivery.setCode_format(1);
         qrCodeDelivery.setPrefix_length(code_prefix.length());
         qrCodeDelivery.setCode_prefix(code_prefix);
@@ -181,6 +182,7 @@
         String code_prefix = "https://mxcd.zhinenganguan.com?No=";
         QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
         qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+        qrCodeDelivery.setCharging_gun_code(dto.getCode());
         qrCodeDelivery.setCode_format(1);
         qrCodeDelivery.setPrefix_length(code_prefix.length());
         qrCodeDelivery.setCode_prefix(code_prefix);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 5a8e7ee..640d886 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -27,6 +27,7 @@
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.integration.api.feignClient.IntegrationClient;
 import com.ruoyi.integration.api.feignClient.IotInterfaceClient;
 import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
 import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
@@ -106,6 +107,9 @@
 	
 	@Resource
 	private TFaultMessageService faultMessageService;
+	
+	@Resource
+	private IntegrationClient integrationClient;
 	
 	
 	
@@ -284,6 +288,11 @@
 			tChargingGun.setAccountingStrategyId(setAccountingStrategy.getAccountingStrategyId());
 		}
 		chargingGunService.updateBatchById(list);
+		//下发硬件更新计费模板
+		for (TChargingPile chargingPile : this.listByIds(id)) {
+			integrationClient.setupBillingModel1(chargingPile.getCode());
+		}
+		
 	}
 
 	@Override
@@ -589,8 +598,10 @@
 		
 		if(datas.size() > 0){
 			for (TChargingPile data : datas) {
-				if(data.getStatus() == 1){
-					TFaultMessage faultMessage = new TFaultMessage();
+				TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, data.getId())
+						.eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
+				if(null == faultMessage){
+					faultMessage = new TFaultMessage();
 					faultMessage.setSiteId(data.getSiteId());
 					faultMessage.setChargingPileId(data.getId());
 					faultMessage.setStatus(1);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
index 3cb2293..e88746d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
@@ -79,8 +79,7 @@
             </if>
             AND status = 3
         </where>
-        group by create_time
-        ORDER BY create_time DESC
+
     </select>
     <select id="parkingData" resultType="java.util.Map">
         SELECT
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
index bdefd57..f3ece3c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
@@ -72,6 +72,8 @@
 		parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 		parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
 		parkingRecord.setOrderAmount(new BigDecimal(order.getReceivable()));
+		parkingRecord.setPayment(new BigDecimal(order.getPayment()));
+		parkingRecord.setPayType(order.getPayType());
 		BigDecimal payment = new BigDecimal(order.getPayment());
 		parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
 		parkingRecordClient.updateParkingRecord(parkingRecord);
@@ -120,6 +122,7 @@
 		parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeavetime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 		parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
 		parkingRecord.setOrderAmount(new BigDecimal(order.getMoney()));
+		parkingRecord.setPayment(new BigDecimal(order.getMoney()));
 		parkingRecordClient.updateParkingRecord(parkingRecord);
 	}
 	
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/ChargingHandshakeController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/ChargingHandshakeController.java
index 844d62e..8807522 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/ChargingHandshakeController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/ChargingHandshakeController.java
@@ -29,7 +29,7 @@
 	 */
 	@PostMapping("/getDataByOrderCode")
 	public R<ChargingHandshake> getDataByOrderCode(@RequestParam("code") String code){
-		ChargingHandshake chargingHandshake = chargingHandshakeService.findById(code);
+		ChargingHandshake chargingHandshake = chargingHandshakeService.getDataByOrderCode(code);
 		return R.ok(chargingHandshake);
 	}
 }
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
index bd592d8..267029d 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
@@ -289,6 +289,7 @@
     public JSONObject getMessageJsonString(Object object, String serviceId){
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(object));
         jsonObject.put("service_id", serviceId);
+        log.info("发送数据service_id:{},发送内容:{}",serviceId,jsonObject);
         return jsonObject;
     }
 }
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingHandshakeService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingHandshakeService.java
index 11c7824..e37ba16 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingHandshakeService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingHandshakeService.java
@@ -4,6 +4,8 @@
 import com.ruoyi.integration.mongodb.base.BaseService;
 
 public interface ChargingHandshakeService extends BaseService<ChargingHandshake> {
-
+	
+	
+	ChargingHandshake getDataByOrderCode(String code);
 
 }
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingHandshakeServiceImpl.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingHandshakeServiceImpl.java
index 00ef612..1d55331 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingHandshakeServiceImpl.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingHandshakeServiceImpl.java
@@ -5,8 +5,14 @@
 import com.ruoyi.integration.mongodb.service.ChargingHandshakeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Service
@@ -28,4 +34,10 @@
     public List<ChargingHandshake> findAll() {
         return mongoTemplate.findAll(ChargingHandshake.class);
     }
+    
+    @Override
+    public ChargingHandshake getDataByOrderCode(String code) {
+        List<ChargingHandshake> charging_gun_code = mongoTemplate.find(new Query().addCriteria(Criteria.where("transaction_serial_number").is(code)), ChargingHandshake.class);
+        return charging_gun_code.size() > 0 ? charging_gun_code.get(0) : null;
+    }
 }
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java
index 6b9ad6d..0e4dd03 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java
@@ -11,6 +11,7 @@
 public class QrCodeDeliveryMessage extends BaseMessage {
 
     private String charging_pile_code; // 桩编码
+    private String charging_gun_code; // 枪编码
     private Integer code_format; // "0:第一种前缀+桩编号  1:第二种前缀+桩编号+枪编号"
     private Integer prefix_length; // 二维码前缀长度长度最大不超过200 字节
     private String code_prefix; // 如:“www.baidu.com?No=”
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
index ae00e91..6730597 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -314,11 +314,11 @@
                     chargingBillPayExport.setPlatformPay("支付宝小程序支付");
 
             }
-            TChargingOrderRefund one = tChargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).one();
-            if (one!=null){
-                chargingBillRefundExport.setRechargeSerialNumber(one.getSerailNumber());
-                chargingBillRefundExport.setCode(one.getCode());
-                chargingBillRefundExport.setPayTime(tChargingOrder.getPayTime()!=null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(tChargingOrder.getPayTime())):"");
+            List<TChargingOrderRefund> one1 = tChargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).list();
+            for (TChargingOrderRefund one : one1) {
+                chargingBillRefundExport.setRechargeSerialNumber(tChargingOrder.getRechargeSerialNumber());
+                chargingBillRefundExport.setCode(tChargingOrder.getCode());
+                chargingBillRefundExport.setPayTime(tChargingOrder.getCreateTime()!=null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(tChargingOrder.getCreateTime())):"");
                 if (tChargingOrder.getRefundTime()!=null){
                     chargingBillRefundExport.setRefundTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(tChargingOrder.getRefundTime())));
                 }
@@ -328,6 +328,7 @@
                 chargingBillRefundExport.setRefundSerialNumber(one.getRefundSerialNumber());
                 chargingBillRefundExports.add(chargingBillRefundExport);
             }
+
             // 支付信息
             chargingBillPayExport.setId(i+"");
             chargingBillPayExport.setRechargeSerialNumber(tChargingOrder.getRechargeSerialNumber());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 7785418..0100bb5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -292,6 +292,14 @@
     @ApiOperation(value = "充电明细", tags = {"管理后台-支付订单-订单信息"})
     public R<List<TChargingOrderAccountingStrategy>> chargingDetail(Long orderId) {
         List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
+            String format = tChargingOrderAccountingStrategy.getCreateTime().format(formatter);
+            tChargingOrderAccountingStrategy.setStartTime(format+" "+tChargingOrderAccountingStrategy.getStartTime());
+            tChargingOrderAccountingStrategy.setEndTime(format+" "+tChargingOrderAccountingStrategy.getEndTime());
+        }
+
+
         return R.ok(list);
     }
 
@@ -904,7 +912,7 @@
             start = statisticsQueryDto.getStartTime();
             end = statisticsQueryDto.getEndTime();
         }
-        List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list();
+        List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getCreateTime, start).le(TChargingOrder::getCreateTime, end).in(TChargingOrder::getSiteId, siteIds).list();
         List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
         chargingOrderIds.add(-1L);
         //上方饼图
@@ -1079,6 +1087,11 @@
 
         //用户标签
       List<Map<String,Object>> maps =    chargingOrderService.getUserTagCount();
+        Map<String,Object> stringObjectMap = new HashMap<>();
+        Long noTagCount =  chargingOrderService.countNoTag();
+        stringObjectMap.put("count",noTagCount);
+        maps.add(stringObjectMap);
+
         //会员标签
         List<Map<String,Object>> maps1 =  chargingOrderService.getVipCount();
 
@@ -1118,11 +1131,14 @@
             siteIds.add(statisticsQueryDto.getSiteId());
         }
         //查询评价分
-        Long aver = chargingOrderService.getAver(siteIds);
+        Double aver = chargingOrderService.getAver(siteIds);
         //查询各个分数
        List<Map<String,Object>> evaluate =  chargingOrderService.getLevelEvaluate(siteIds);
         //查询差评回复数
-        Long count = orderEvaluateService.lambdaQuery().isNotNull(TOrderEvaluate::getResponseTime).count();
+        List<Integer> mark = new ArrayList<>();
+        mark.add(1);
+        mark.add(2);
+        Long count = orderEvaluateService.lambdaQuery().in(TOrderEvaluate::getMark, mark).isNotNull(TOrderEvaluate::getResponseTime).count();
         TCharingUserEvaluateVO tCharingUserEvaluateVO = new TCharingUserEvaluateVO();
         tCharingUserEvaluateVO.setAver(aver);
         tCharingUserEvaluateVO.setEvaluate(evaluate);
@@ -1429,8 +1445,9 @@
         //将capMap的chargingCapacity除以totalRatedPower保留两位数
         capMap.forEach(map -> {
             BigDecimal chargingCapacity = (BigDecimal) map.get("chargingCapacity");
-            BigDecimal result = chargingCapacity.divide(totalRatedPower, 2, RoundingMode.HALF_UP);
-            map.put("chargingCapacity", result);
+            BigDecimal result = chargingCapacity.divide(totalRatedPower, 4, RoundingMode.HALF_UP);
+            BigDecimal multiply = result.multiply(new BigDecimal(100));
+            map.put("chargingCapacity", multiply);
         });
 
 
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
index 5c10122..f5d173a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
@@ -106,7 +106,7 @@
 
 	Map<String, Object> countLocalCar();
 
-    Long getAver(@Param("siteIds") List<Integer> siteIds);
+	Double getAver(@Param("siteIds") List<Integer> siteIds);
 
 	List<Map<String, Object>> getLevelEvaluate(@Param("siteIds")List<Integer> siteIds);
 
@@ -137,4 +137,6 @@
 	List<Map<String, Object>> countAllUserData();
 
 	List<Map<String, Object>> needElec1(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto")  ChargingStatisticsQueryDto statisticsQueryDto);
+
+	Long countNoTag();
 }
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index bd3928f..705fae3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -212,7 +212,7 @@
 
 	Map<String, Object> countLocalCar();
 
-    Long getAver(List<Integer> siteIds);
+    Double getAver(List<Integer> siteIds);
 
 	List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
 
@@ -266,4 +266,6 @@
 	 * @return
 	 */
 	EndOfChargePageInfo getEndOfChargePageInfo(String id);
+
+	Long countNoTag();
 }
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 4ca0bdc..923d807 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -539,6 +539,7 @@
 		chargingOrder.setRechargePaymentStatus(2);
 		chargingOrder.setRechargeSerialNumber(transaction_id);
 		chargingOrder.setStatus(2);
+		chargingOrder.setPayTime(LocalDateTime.now());
 
 		//添加安全检测数据到缓存中,每步安全检测完成后需要更新缓存数据
 		PreChargeCheck preChargeCheck = new PreChargeCheck();
@@ -608,12 +609,16 @@
 						if(times > m){
 							//充电时间跨度两个计费策略,需要继续对下一个策略进行计算
 							serviceCharge = s_server_amount.multiply(new BigDecimal(m));
-							discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
 							rechargeAmount1 = rechargeAmount1.subtract(s_total_amount.multiply(new BigDecimal(m)));
+							if(null != discount){
+								discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
+							}
 							nowTimeMillis = null;
 						}else{
 							serviceCharge = s_server_amount.multiply(new BigDecimal(times));
-							discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
+							if(null != discount){
+								discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
+							}
 							break;
 						}
 					}
@@ -792,6 +797,12 @@
 		one.setRefundStatus(2);
 		one.setRefundTime(LocalDateTime.now());
 		chargingOrderRefundService.updateById(one);
+		
+		TChargingOrder chargingOrder = this.getById(one.getChargingOrderId());
+		chargingOrder.setRefundStatus(2);
+		chargingOrder.setRefundSerialNumber(refund_id);
+		chargingOrder.setRefundTime(LocalDateTime.now());
+		this.updateById(chargingOrder);
 		return AjaxResult.success();
 	}
 
@@ -833,6 +844,7 @@
 			Integer m = Integer.valueOf(data.getCumulative_charging_time() % 60);
 			chargingDetails.setChargedTime(String.format("%02d", h) + ":" + String.format("%02d", m));
 		}
+		//转换成UTC时间
 		ChargingHandshake chargingHandshake = chargingHandshakeClient.getDataByOrderCode(one.getCode()).getData();
 		if(null != chargingHandshake && null != data && null != one.getAppUserCarId()){
 			BigDecimal bms_battery_capacity = chargingHandshake.getBms_battery_capacity();
@@ -1930,7 +1942,7 @@
 			chargingOrderRefund.setRefundTitle("充电完成退款");
 			chargingOrderRefund.setRefundContent("充电完成退款");
 			chargingOrderRefund.setRefundReason("充电完成退款");
-			chargingOrderRefund.setRefundRemark("充电完成退款");
+			chargingOrderRefund.setRefundRemark("实际充电消费金额:" + refundAmount);
 			chargingOrderRefund.setRefundTotalAmount(refundAmount);
 			chargingOrderRefund.setPayAmount(rechargeAmount);
 			if(1 == rechargePaymentType){
@@ -2038,7 +2050,7 @@
 	}
 
 	@Override
-	public Long getAver(List<Integer> siteIds) {
+	public Double getAver(List<Integer> siteIds) {
 		return this.baseMapper.getAver(siteIds);
 	}
 
@@ -2056,6 +2068,11 @@
 	public R payRefund(PayOrderRefundDto payOrderQueryDto) {
 			if (payOrderQueryDto.getType()==1){
 				TChargingOrder tChargingOrder = this.baseMapper.selectById(payOrderQueryDto.getOrderId());
+				if (tChargingOrder.getPaymentAmount().compareTo(payOrderQueryDto.getRefundAmount())==-1){
+					return R.fail("退款金额需小于支付金额");
+				}
+
+
 				TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
 				chargingOrderRefund.setChargingOrderId(tChargingOrder.getId());
 				chargingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
@@ -2117,6 +2134,9 @@
 			}
 			if (payOrderQueryDto.getType()==2){
 				TShoppingOrder tChargingOrder = shoppingOrderService.getById(payOrderQueryDto.getOrderId());
+				if (tChargingOrder.getPaymentAmount().compareTo(payOrderQueryDto.getRefundAmount())==-1){
+					return R.fail("退款金额需小于支付金额");
+				}
 				TShoppingOrderRefund chargingOrderRefund = new TShoppingOrderRefund();
 				chargingOrderRefund.setShoppingOrderId(tChargingOrder.getId());
 				chargingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
@@ -2166,6 +2186,10 @@
 
 						tChargingOrder.setRefundStatus(2);
 						tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
+
+						if (payOrderQueryDto.getRefundAmount().compareTo(tChargingOrder.getPaymentAmount())==0){
+							tChargingOrder.setStatus(5);
+						}
 						shoppingOrderService.updateById(tChargingOrder);
 
 						shoppingOrderRefundService.save(chargingOrderRefund);
@@ -2539,7 +2563,7 @@
 			tSettlementConfirm.setIncomePercentage(0+"%");
 			tSettlementConfirm.setIncomePercentage(0+"%");
 		}else{
-			BigDecimal subtract = income.subtract(beforeIncome).divide(beforeIncome).setScale(2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"));
+			BigDecimal subtract = income.subtract(beforeIncome).divide(beforeIncome,2,RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"));
 			tSettlementConfirm.setIncomePercentage(subtract+"%");
 			tSettlementConfirm.setIncomePercentage(subtract+"%");
 
@@ -2659,4 +2683,9 @@
 		info.setDuration(0 == hour ? String.format("%s分钟", second) : String.format("%s小时%s分钟", hour, second));
 		return info;
 	}
+
+	@Override
+	public Long countNoTag() {
+		return this.baseMapper.countNoTag();
+	}
 }
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
index e294a86..e831ef1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -93,6 +93,14 @@
             TChargingOrder tChargingOrder = chargingOrderMapper.selectById(orderAppeal.getOrderId());
             orderAppealVO.setChargingOrder(tChargingOrder);
             if(Objects.nonNull(tChargingOrder)){
+                SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
+                if(Objects.nonNull(siteNameVO)){
+                    orderAppealVO.setGunName(siteNameVO.getGunName());
+                    orderAppealVO.setGunNumber(siteNameVO.getGunNumber());
+                    orderAppealVO.setPileName(siteNameVO.getPileName());
+                    orderAppealVO.setPileNumber(siteNameVO.getPileNumber());
+                    orderAppealVO.setSiteName(siteNameVO.getSiteName());
+                }
                 orderAppealVO.setEndMode(tChargingOrder.getEndMode());
             }
         }else if (orderAppeal.getOrderType() == 2) {
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 769ad04..92f06df 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -121,12 +121,12 @@
         title,
         `status`,
         order_amount,
-        payment_amount ,
+        order_amount as payment_amount ,
         create_time,
         end_time,
         pay_time,
         refund_status,
-        (payment_amount-refund_amount) as final_amount,
+        (order_amount) as final_amount,
         del_flag,
         app_user_id
         FROM
@@ -372,7 +372,7 @@
 
     </select>
     <select id="countAll" resultType="java.util.Map">
-        select sum(electrovalence) as electrovalence,sum(service_charge) as service_charge,ROUND(sum(order_amount) * 0.0006, 2) as commission_amount,sum(sharing_amount) as sharing_amount
+        select sum(electrovalence) as electrovalence,sum(service_charge) as service_charge,ROUND(sum(electrovalence+service_charge) * 0.0006, 2) as commission_amount,sum(sharing_amount) as sharing_amount
         from t_charging_order
         where create_time &gt;= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2
     </select>
@@ -425,6 +425,7 @@
         SUM(service_charge-coupon_discount_amount) as servicecharge,
         SUM(charging_capacity) as electrovalence,
         SUM(electrovalence) AS paymentAmount,
+        SUM(payment_amount) AS paymoney,
         count(1) as orderCount
         FROM
         t_charging_order
@@ -449,6 +450,7 @@
         SUM(service_charge-coupon_discount_amount) as servicecharge,
         SUM(charging_capacity) as electrovalence,
         SUM(electrovalence) AS paymentAmount,
+        SUM(payment_amount) AS paymoney,
         count(1) as orderCount
         FROM
         t_charging_order
@@ -473,6 +475,7 @@
         SUM(service_charge-coupon_discount_amount) as servicecharge,
         SUM(charging_capacity) as electrovalence,
         SUM(electrovalence) AS paymentAmount,
+        SUM(payment_amount) AS paymoney,
 
         count(1) as orderCount
         FROM
@@ -498,6 +501,9 @@
         DATE_FORMAT( create_time, '%Y-%m-%d' ) as time,
         SUM(service_charge-coupon_discount_amount) as servicecharge,
         SUM(charging_capacity) as electrovalence,
+        SUM(electrovalence) AS paymentAmount,
+        SUM(payment_amount) AS paymoney,
+
         count(1) as orderCount
         FROM
         t_charging_order
@@ -722,6 +728,8 @@
             charging_pile_account.t_app_user_tag a
             JOIN ( SELECT app_user_id, MAX( create_time ) AS max_create_time FROM charging_pile_account.t_app_user_tag GROUP BY app_user_id ) b ON a.app_user_id = b.app_user_id
             AND a.create_time = b.max_create_time
+            LEFT JOIN `charging_pile_other`.`t_user_tag` ct on a.user_tag_id = ct.id
+            WHERE ct.del_flag = 0
             ) o
             LEFT JOIN `charging_pile_other`.`t_user_tag` tt on o.user_tag_id = tt.id
         GROUP BY
@@ -765,10 +773,10 @@
             </if>
             <if test="statisticsQueryDto.dayType == 5">
                 <if test="statisticsQueryDto.startTime != null">
-                    AND co.create_time >= #{statisticsQueryDto.startTime}
+                    and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
                 </if>
                 <if test="statisticsQueryDto.endTime != null">
-                    AND co.create_time &lt;= #{statisticsQueryDto.endTime}
+                    and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
                 </if>
             </if>
         </where>
@@ -783,12 +791,14 @@
         GROUP BY vehicle_use
     </select>
     <select id="carUserBrand" resultType="java.util.Map">
-
         SELECT
             count(1) as counts,vehicle_brand
         from charging_pile_account.t_app_user_car
-                where  del_flag = 0
+        where  del_flag = 0
+
         GROUP BY vehicle_brand
+        ORDER BY counts DESC
+            limit 5
     </select>
     <select id="countLocalCar" resultType="java.util.Map">
         SELECT
@@ -799,7 +809,7 @@
         WHERE
             del_flag = 0
     </select>
-    <select id="getAver" resultType="java.lang.Long">
+    <select id="getAver" resultType="java.lang.Double">
         SELECT
             ROUND(AVG(te.mark), 2) AS average_mark
         FROM
@@ -939,19 +949,19 @@
         SELECT
             FORMAT(SUM(TIME_TO_SEC(TIMEDIFF(co.end_time, co.start_time)) /
                        <if test="statisticsQueryDto.dayType == 1">
-                           86400
+                           864
                        </if>
                    <if test="statisticsQueryDto.dayType == 2">
-                       604800
+                       6048
                    </if>
                    <if test="statisticsQueryDto.dayType == 3">
-                       2592000
+                       25920
                    </if>
                    <if test="statisticsQueryDto.dayType == 4">
-                       31536000
+                       315360
                    </if>
                    <if test="statisticsQueryDto.dayType == 5">
-                       (86400*(SELECT TIMESTAMPDIFF(DAY, statisticsQueryDto.startTime, statisticsQueryDto.endTime) AS days_difference
+                       (86400*(SELECT TIMESTAMPDIFF(DAY, #{statisticsQueryDto.startTime}, #{statisticsQueryDto.endTime}) +1 AS days_difference
                        ))
                    </if>
 
@@ -982,12 +992,12 @@
             AND YEAR( co.create_time ) = YEAR(CURDATE() )
         </if>
         <if test="statisticsQueryDto.dayType == 5">
-            <if test="statisticsQueryDto.startTime != null">
-                AND co.create_time >= #{statisticsQueryDto.startTime}
-            </if>
-            <if test="statisticsQueryDto.endTime != null">
-                AND co.create_time &lt;= #{statisticsQueryDto.endTime}
-            </if>
+
+                and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
+
+
+                and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
+
         </if>
         GROUP BY tc.name,cp.name,co.charging_gun_id
 
@@ -1011,7 +1021,7 @@
             31536000
         </if>
         <if test="statisticsQueryDto.dayType == 5">
-            (86400*(SELECT TIMESTAMPDIFF(DAY, statisticsQueryDto.startTime, statisticsQueryDto.endTime) AS days_difference
+            (86400*(SELECT TIMESTAMPDIFF(DAY, #{statisticsQueryDto.startTime}, #{statisticsQueryDto.endTime}) +1 AS days_difference
             ))
         </if>
 
@@ -1043,10 +1053,10 @@
         </if>
         <if test="statisticsQueryDto.dayType == 5">
             <if test="statisticsQueryDto.startTime != null">
-                AND co.create_time >= #{statisticsQueryDto.startTime}
+                and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
             </if>
             <if test="statisticsQueryDto.endTime != null">
-                AND co.create_time &lt;= #{statisticsQueryDto.endTime}
+                and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
             </if>
         </if>
         GROUP BY tc.name,cp.name,co.charging_gun_id
@@ -1069,7 +1079,7 @@
             31536000
         </if>
         <if test="statisticsQueryDto.dayType == 5">
-            (86400*(SELECT TIMESTAMPDIFF(DAY, statisticsQueryDto.startTime, statisticsQueryDto.endTime) AS days_difference
+            (86400*(SELECT TIMESTAMPDIFF(DAY, #{statisticsQueryDto.startTime}, #{statisticsQueryDto.endTime}) +1 AS days_difference
             ))
         </if>
 
@@ -1100,10 +1110,10 @@
         </if>
         <if test="statisticsQueryDto.dayType == 5">
             <if test="statisticsQueryDto.startTime != null">
-                AND co.create_time >= #{statisticsQueryDto.startTime}
+                and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
             </if>
             <if test="statisticsQueryDto.endTime != null">
-                AND co.create_time &lt;= #{statisticsQueryDto.endTime}
+                and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
             </if>
         </if>
         GROUP BY tc.name,cp.name,co.charging_gun_id
@@ -1126,7 +1136,7 @@
             31536000
         </if>
         <if test="statisticsQueryDto.dayType == 5">
-            (86400*(SELECT TIMESTAMPDIFF(DAY, statisticsQueryDto.startTime, statisticsQueryDto.endTime) AS days_difference
+            (86400*(SELECT TIMESTAMPDIFF(DAY, #{statisticsQueryDto.startTime}, #{statisticsQueryDto.endTime}) +1 AS days_difference
             ))
         </if>
 
@@ -1157,10 +1167,10 @@
         </if>
         <if test="statisticsQueryDto.dayType == 5">
             <if test="statisticsQueryDto.startTime != null">
-                AND co.create_time >= #{statisticsQueryDto.startTime}
+                and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
             </if>
             <if test="statisticsQueryDto.endTime != null">
-                AND co.create_time &lt;= #{statisticsQueryDto.endTime}
+                and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
             </if>
         </if>
         GROUP BY tc.name,cp.name,co.charging_gun_id
@@ -1183,7 +1193,7 @@
             31536000
         </if>
         <if test="statisticsQueryDto.dayType == 5">
-            (86400*(SELECT TIMESTAMPDIFF(DAY, statisticsQueryDto.startTime, statisticsQueryDto.endTime) AS days_difference
+            (86400*(SELECT TIMESTAMPDIFF(DAY, #{statisticsQueryDto.startTime}, #{statisticsQueryDto.endTime}) +1 AS days_difference
             ))
         </if>
 
@@ -1214,10 +1224,10 @@
         </if>
         <if test="statisticsQueryDto.dayType == 5">
             <if test="statisticsQueryDto.startTime != null">
-                AND co.create_time >= #{statisticsQueryDto.startTime}
+                and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
             </if>
             <if test="statisticsQueryDto.endTime != null">
-                AND co.create_time &lt;= #{statisticsQueryDto.endTime}
+                and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
             </if>
         </if>
         GROUP BY tc.name,cp.name,co.charging_gun_id
@@ -1238,7 +1248,7 @@
             31536000
         </if>
         <if test="statisticsQueryDto.dayType == 5">
-            (86400*(SELECT TIMESTAMPDIFF(DAY, statisticsQueryDto.startTime, statisticsQueryDto.endTime) AS days_difference
+            (86400*(SELECT TIMESTAMPDIFF(DAY, #{statisticsQueryDto.startTime}, #{statisticsQueryDto.endTime}) +1 AS days_difference
             ))
         </if>
 
@@ -1269,10 +1279,10 @@
         </if>
         <if test="statisticsQueryDto.dayType == 5">
             <if test="statisticsQueryDto.startTime != null">
-                AND co.create_time >= #{statisticsQueryDto.startTime}
+                and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
             </if>
             <if test="statisticsQueryDto.endTime != null">
-                AND co.create_time &lt;= #{statisticsQueryDto.endTime}
+                and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
             </if>
         </if>
         GROUP BY tc.name,cp.name,co.charging_gun_id
@@ -1289,7 +1299,7 @@
                 LEFT JOIN `charging_pile_service`.`t_charging_gun` tc ON co.charging_gun_id = tc.id
                 LEFT JOIN `charging_pile_service`.`t_charging_pile` cp ON tc.charging_pile_id = cp.id
         <where>
-            cp.type = 1
+            cp.type = 1 and co.need_elec != 0
             <if test="siteIds != null and siteIds.size() > 0">
                 and co.site_id IN
                 <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
@@ -1309,12 +1319,11 @@
                 AND YEAR( co.create_time ) = YEAR(CURDATE() )
             </if>
             <if test="statisticsQueryDto.dayType == 5">
-                <if test="statisticsQueryDto.startTime != null">
-                    AND co.create_time >= #{statisticsQueryDto.startTime}
-                </if>
-                <if test="statisticsQueryDto.endTime != null">
-                    AND co.create_time &lt;= #{statisticsQueryDto.endTime}
-                </if>
+
+                    and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
+
+                    and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
+
             </if>
         </where>
         GROUP BY
@@ -1505,10 +1514,10 @@
             </if>
             <if test="statisticsQueryDto.dayType == 5">
                 <if test="statisticsQueryDto.startTime != null">
-                    AND co.create_time >= #{statisticsQueryDto.startTime}
+                    and DATE(co.create_time) >= #{statisticsQueryDto.startTime}
                 </if>
                 <if test="statisticsQueryDto.endTime != null">
-                    AND co.create_time &lt;= #{statisticsQueryDto.endTime}
+                    and DATE(co.create_time)  &lt;= #{statisticsQueryDto.endTime}
                 </if>
             </if>
         </where>
@@ -1517,4 +1526,15 @@
         cp.name,
         co.charging_gun_id;
     </select>
+    <select id="countNoTag" resultType="java.lang.Long">
+        SELECT count(1)
+        from `charging_pile_account`.`t_app_user` au
+        WHERE au.id not IN (
+            SELECT app_user_id
+            from `charging_pile_account`.`t_app_user_tag`
+            GROUP BY app_user_id
+
+        )  and au.del_flag = 0
+
+    </select>
 </mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
index ae289b4..f539844 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
@@ -280,7 +280,7 @@
     <select id="sixBefore" resultType="com.ruoyi.order.dto.SixShopDto">
         SELECT
             DATE_FORMAT( subquery.create_time, '%m' ) AS MONTH,
-	count(1) AS orderNum,
+	count(1) AS count,
 	SUM(payment_amount) AS paymentAmount
         FROM
             (
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml
index 14aa79d..8c13bc7 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml
@@ -58,7 +58,7 @@
         SELECT
         vip_id,
         create_time,
-        payment_amount
+        (payment_amount - refund_amount) as payment_amount
         FROM
         t_vip_order
         <where>
@@ -73,7 +73,7 @@
         GROUP BY
         DATE_FORMAT(subquery.create_time, '%Y-%m'),
         tp.`name`
-
+        ORDER BY MONTH asc
 
     </select>
     <select id="getSumAmout" resultType="java.math.BigDecimal">
@@ -83,8 +83,7 @@
             t_vip_order
         WHERE
             del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} AND
-            payment_status = 2 AND
-            refund_amount IS NULL
+            payment_status = 2
             <if test="sixBefore != null">
                 AND create_time &gt; #{sixBefore}
             </if>

--
Gitblit v1.7.1