From 1906d789eb2dfa6246f33ff87e218cdc50be8ca3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 九月 2024 17:02:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java |    2 +-
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java              |    2 +-
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java   |   10 +++-------
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java            |    4 +++-
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java      |    2 +-
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java    |    8 ++++++++
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java                     |    4 ++++
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml                    |    6 ++++++
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java             |    7 +++----
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java                   |    3 +++
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java      |    2 +-
 11 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
index ab1d385..9d3b023 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
@@ -41,7 +41,7 @@
             }
 
             @Override
-            public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
+            public R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
                 return R.fail("根据优惠券id查询领取记录:"+throwable.getMessage());
             }
     
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
index 00990ee..ceeb10c 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
@@ -43,7 +43,7 @@
      * @return
      */
     @PostMapping("/t-app-coupon/getExchangeRecordByCouponId")
-    R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId);
+    R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId);
     /**
      * 后台远程调用 给用户发放优惠券
      */
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java
index 690a19c..b6dd626 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @ApiModel(value = "发票管理VO")
@@ -27,5 +28,7 @@
     private BigDecimal addedService;
     @ApiModelProperty(value = "用户电话")
     private String userPhone;
+    @ApiModelProperty(value = "充电订单ids")
+    private List<String> ids;
 
 }
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index 283a412..56842b3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -202,7 +202,7 @@
      * @return
      */
     @PostMapping("/getExchangeRecordByCouponId")
-    public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId){
+    public R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId){
         return R.ok(tAppCouponService.pagelist(couponId));
     }
 
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java
index 5929c6b..ec20a19 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java
@@ -20,7 +20,7 @@
  */
 public interface TAppCouponMapper extends BaseMapper<TAppCoupon> {
 
-    List<ExchangeRecordVO> pageList(@Param("pageInfo")PageInfo<ExchangeRecordVO> pageInfo,@Param("req") ExchangeRecordGoodsQuery dto);
+    List<ExchangeRecordVO> pageList(@Param("req") ExchangeRecordGoodsQuery dto);
 
     List<CouponListVOVO> couponList(@Param("pageInfo")PageInfo<CouponListVOVO> pageInfo,@Param("userId") Long userId);
 
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java
index 09023c0..bfa8cee 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java
@@ -9,6 +9,8 @@
 import com.ruoyi.common.core.web.page.BasePage;
 import com.ruoyi.common.core.web.page.PageInfo;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -19,7 +21,7 @@
  */
 public interface TAppCouponService extends IService<TAppCoupon> {
 
-    PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery couponId);
+    List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery couponId);
 
     PageInfo<CouponListVOVO> couponList(CouponListDto dto);
 
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
index 42c336b..2ee9278 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -69,10 +69,9 @@
     private TokenService tokenService;
 
     @Override
-    public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
+    public List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        PageInfo<ExchangeRecordVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
-        List<ExchangeRecordVO> list = this.baseMapper.pageList(pageInfo,dto);
+        List<ExchangeRecordVO> list = this.baseMapper.pageList(dto);
         // 订单ids
         StringBuilder stringBuilder = new StringBuilder();
         for (ExchangeRecordVO exchangeRecordVO : list) {
@@ -120,7 +119,6 @@
                 }
             }
         }
-
         // 去除最后一个字符
         if (StringUtils.hasText(stringBuilder.toString())){
             String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString();
@@ -130,9 +128,7 @@
                 list.get(i).setOrderId(data.get(i));
             }
         }
-
-        pageInfo.setRecords(list);
-        return pageInfo;
+        return list;
     }
 
 
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
index 392cebb..d20be80 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
@@ -8,11 +8,15 @@
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
+
 @Data
 @ApiModel("支付订单查询dto")
 public class PayOrderQueryDto extends BasePage {
     @ApiModelProperty("订单编号")
     private String code;
+    @ApiModelProperty("开票跳转-订单ids数组")
+    private List<String> ids;
     @ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
     private Integer type;
     @ApiModelProperty("手机号")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
index fea0c6d..6ce5163 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
@@ -255,6 +255,14 @@
 		query.setUserIds(userList.stream().map(TAppUser::getId).collect(Collectors.toList()));
 		PageInfo<TOrderInvoiceVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
 		List<TOrderInvoiceVO> list = this.baseMapper.pageList(query,pageInfo);
+		for (TOrderInvoiceVO tOrderInvoiceVO : list) {
+			List<Long> collect = orderInvoiceDetailService.lambdaQuery().eq(TOrderInvoiceDetail::getOrderInvoiceId, tOrderInvoiceVO.getId())
+					.eq(TOrderInvoiceDetail::getOrderType, 1).list().stream()
+					.map(TOrderInvoiceDetail::getOrderId).collect(Collectors.toList());
+			// 将其全部转化为String
+			tOrderInvoiceVO.setIds(collect.stream().map(String::valueOf).collect(Collectors.toList()));
+		}
+		// 查询这个开票的订单ids
 
 		List<Long> ids = list.stream().map(TOrderInvoiceVO::getId).collect(Collectors.toList());
 
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 ad2a33a..b8ccaca 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
@@ -193,6 +193,12 @@
                     <if test="data.createTime2 != null">
                         AND o.create_time &lt;= #{data.createTime2}
                     </if>
+                    <if test="data.ids != null and data.ids() > 0">
+                        AND o.id IN
+                        <foreach collection="data.ids" item="id" open="(" separator="," close=")">
+                            #{id}
+                        </foreach>
+                    </if>
                 </where>
         ORDER BY o.create_time desc
 
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index e4e934c..512f879 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -112,10 +112,9 @@
 
     @PostMapping("/exchangeRecord")
     @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录")
-    public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
-        PageInfo<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
-        List<ExchangeRecordVO> records = data.getRecords();
-        for (ExchangeRecordVO record : records) {
+    public AjaxResult<List<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
+        List<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
+        for (ExchangeRecordVO record : data) {
             TCoupon byId = tCouponService.getById(record.getCouponId());
             if (byId!=null){
                     record.setDiscountAmount("¥"+byId.getDiscountAmount());

--
Gitblit v1.7.1