yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改BUG

Browse Source
This commit is contained in:
yuyang 2021-11-23 16:34:52 +08:00
parent 5a447df6bd
commit 7fd7513e13
8 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysMenuMapper.java
View File

@ -54,7 +54,7 @@ public interface SysMenuMapper
/**
* 根据用户ID查询菜单
*
* @param username 用户ID
* @param userId 用户ID
* @return 菜单列表
*/
public List<SysMenu> selectMenuTreeByUserId(Long userId);

2
xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
View File

@ -381,6 +381,6 @@
<select id="getTerminal" resultType="String">
select serial_number as serialNumber from xhpc_terminal where charging_station_id=#{chargingStationId} and status=#{status} and del_flag=2
select serial_number as serialNumber from xhpc_terminal where charging_station_id=#{chargingStationId} and status=#{status} and del_flag=0
</select>
</mapper>

3
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

@ -238,6 +238,9 @@ public class XhpcPileOrderController extends BaseController {
CacheOrderData cacheOrderData = (CacheOrderData)cacheMap.get("orderData");
//获取充电订单
XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
if(xhpcChargeOrder == null ){
return R.fail(500,"无效订单号："+orderNo);
}
if(xhpcChargeOrder.getStatus()==1 || xhpcChargeOrder.getStatus()==3){
logger.info("订单已结束不能重复结算>>>>>orderNo："+orderNo+">>>chargeOrderId:"+xhpcChargeOrder.getChargeOrderId());
return R.ok();

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java
View File

@ -944,5 +944,7 @@ public class XhpcHistoryOrderController extends BaseController {
//
// System.out.println(decimal.divide(decimal1,2,BigDecimal.ROUND_DOWN));
}
}

4
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -621,10 +621,10 @@
and co.source=#{source}
</if>
<if test="startTime !=null and startTime !=''">
and co.start_time &gt;= #{startTime}
and ho.start_time &gt;= #{startTime}
</if>
<if test="endTime !=null and endTime !=''">
and co.start_time &lt;= #{endTime}
and ho.start_time &lt;= #{endTime}
</if>
<if test="transactionNumber !=null and transactionNumber !=''">
and ho.serial_number like concat('%', #{transactionNumber}, '%')

2
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java
View File

@ -55,7 +55,7 @@ public interface XhpcAppUserMapper {
public List<Map<String, Object>> selectAppUserList(@Param("phone") String phone);
public Map<String, Object> userSum(@Param("phone") String phone);
public Map<String, Object> userSum(@Param("phone")String phone,@Param("time")String time);
/**
* 手机号查询C端用户信息

8
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.xhpc.user.service.impl;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import com.xhpc.common.core.constant.HttpStatus;
import com.xhpc.common.core.constant.StatusConstants;
import com.xhpc.common.core.constant.UserConstants;
@ -85,7 +87,11 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
@Override
public Map<String, Object> userSum(String phone) {
return xhpcAppUserMapper.userSum(phone);
//最近30天用户的活跃度
Date newDate = DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, -30);
String time = DateUtil.format(newDate, "yyyy-MM-dd HH:mm:ss");
return xhpcAppUserMapper.userSum(phone,time);
}
/**

5
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
View File

@ -200,11 +200,8 @@
<select id="userSum" resultType="map">
select
count(xau.app_user_id) userSum,
(select count(DISTINCT user_id) from xhpc_charge_order where datediff(now(),create_time)>30) userVitality
(select count(DISTINCT user_id) from xhpc_charge_order where create_time &gt;= #{time}) userVitality
from xhpc_app_user xau
LEFT JOIN (select count(1) count ,user_id from xhpc_charge_order where del_flag = 0 ) a on a.user_id =
xau.app_user_id
WHERE xau.del_flag = 0
<if test="phone != null and phone != ''">
and xau.phone like concat(concat('%', #{phone}), '%')
</if>