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

update 查询未开发票订单，新增站点id条件

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-18 17:07:02 +08:00
parent 1cd9c7d770
commit d0dc2e64c2
5 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -142,7 +142,8 @@ public interface OrderBasicInfoMapper {
*/
List<OrderVO> getListByMemberIdAndOrderStatus(@Param("memberId") String memberId,
@Param("orderStatusList") List<String> orderStatusList,
@Param("dateTime") LocalDateTime dateTime);
@Param("dateTime") LocalDateTime dateTime,
@Param("stationId") String stationId);
/**
* 将某订单修改为某状态

11
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -4,7 +4,12 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.OrderDetail;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.GenerateOrderDTO;
import com.jsowell.pile.dto.IndexQueryDTO;
import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.dto.QueryPersonPileDTO;
import com.jsowell.pile.dto.QueryStartChargeDTO;
import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
@@ -123,6 +128,8 @@ public interface IOrderBasicInfoService {
List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime);
List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime, String stationId);
void realTimeMonitorDataRedis2DB(String transactionCode, String orderCode);
void updateElecAmount();
@@ -239,4 +246,6 @@ public interface IOrderBasicInfoService {
List<OrderAmountDetailVO> queryOrderAmountDetail(List<String> orderCodes);
List<OrderPeriodAmountVO> transformPeriodAmountByOrderDetail(OrderDetail orderDetail);
}

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

@@ -1374,12 +1374,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
*/
@Override
public List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList) {
return orderBasicInfoMapper.getListByMemberIdAndOrderStatus(memberId, orderStatusList, null);
return getListByMemberIdAndOrderStatus(memberId, orderStatusList, null, null);
}
@Override
public List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime) {
return orderBasicInfoMapper.getListByMemberIdAndOrderStatus(memberId, orderStatusList, dateTime);
return getListByMemberIdAndOrderStatus(memberId, orderStatusList, dateTime, null);
}
@Override
public List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime, String stationId) {
return orderBasicInfoMapper.getListByMemberIdAndOrderStatus(memberId, orderStatusList, dateTime, stationId);
}
@Override

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

@@ -743,6 +743,9 @@
join pile_station_info t3 on t1.station_id = t3.id
where t1.del_flag = '0'
and t1.member_id = #{memberId,jdbcType=VARCHAR}
<if test="stationId != null and stationId != ''">
and t1.station_id = #{stationId,jdbcType=VARCHAR}
</if>
<if test="orderStatusList != null and orderStatusList.size() != 0">
and t1.order_status in
<foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
@@ -753,7 +756,6 @@
and t1.create_time <![CDATA[ >= ]]> #{dateTime,jdbcType=VARCHAR}
</if>
order by t1.create_time desc
</select>
<update id="updateOrderStatusByOrderCode">