autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-29 23:50:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-06-17 08:47:06 +08:00
parent 4b288507cd 93706fab1d
commit 2474eb2a41
14 changed files with 88 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/AlipayLoginDTO.java
View File

@@ -13,4 +13,9 @@ public class AlipayLoginDTO {
* 小程序appId
*/
private String appId;
/**
* 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
*/
private String requestSource;
}

9
jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberRegisterAndLoginDTO.java
View File

@@ -26,12 +26,17 @@ public class MemberRegisterAndLoginDTO {
private String appId;
/**
* 运营商id
* 一级运营商id
*/
private String merchantId;
private String firstLevelMerchantId;
/**
* 微信用户openId
*/
private String openId;
/**
* 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
*/
private String requestSource;
}

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/WechatLoginDTO.java
View File

@@ -21,4 +21,9 @@ public class WechatLoginDTO {
* 用来获取openId的Code
*/
private String openIdCode;
/**
* 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
*/
private String requestSource;
}

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/agentDev/AgentWechatLoginDTO.java
View File

@@ -25,5 +25,8 @@ public class AgentWechatLoginDTO {
*/
private String openIdCode;
/**
* 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
*/
private String requestSource;
}

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1990,7 +1990,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// return orderBasicInfoMapper.getIndexOrderInfo(dto);
List<IndexOrderInfoVO> voList = orderBasicInfoMapper.getIndexOrderInfoV2(dto);
Map<String, List<IndexOrderInfoVO>> map = voList.stream().collect(Collectors.groupingBy(IndexOrderInfoVO::getDate));
List<IndexOrderInfoVO> resultList = Lists.newArrayList();

3
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -2701,7 +2701,8 @@
use_electricity AS totalElectricity,
total_amount as totalOrderAmount
from settle_order_report
where date(trade_date) &gt;= DATE_SUB(CURDATE(), INTERVAL 30 day)
where del_flag = '0'
and date(trade_date) &gt;= DATE_SUB(CURDATE(), INTERVAL 30 day)
<if test="dto.stationId != null and dto.stationId != ''">
and station_id = #{dto.stationId,jdbcType=VARCHAR}
</if>

6
jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
View File

@@ -381,9 +381,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getGeneralSituationInfo" resultType="com.jsowell.pile.vo.web.IndexGeneralSituationVO">
select
sum(t1.total_amount) as totalChargingAmount,
sum(t1.use_electricity) as totalChargingDegree,
sum(t1.charge_num) as totalChargingQuantity
ifnull(sum(t1.total_amount), 0) as totalChargingAmount,
ifnull(sum(t1.use_electricity), 0) as totalChargingDegree,
ifnull(sum(t1.charge_num), 0) as totalChargingQuantity
from
settle_order_report t1
where