From c6731159f3adabf8502055152398e2f4c6f5b2df Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 27 九月 2024 09:11:19 +0800
Subject: [PATCH] 9.24
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 4 +-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 3 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java | 13 ++++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java | 11 ++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 5 ++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 45 ++++++++++++++--------
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java | 2
7 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
index c95a809..4f762b6 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
@@ -5,6 +5,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -56,6 +58,7 @@
@ApiModelProperty(value = "退款成功时间")
@TableField("refund_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime refundTime;
@ApiModelProperty(value = "订单编号")
@@ -96,7 +99,11 @@
private BigDecimal paymentAmount;
@ApiModelProperty(value = "支付时间")
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime payTime;
-
-
+ @ApiModelProperty(value = "订单id")
+ @TableField(exist = false)
+ private String orderId;
+ @TableField(exist = false)
+ private String userId;
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index d10c050..3568f2b 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -223,7 +223,7 @@
Page<TAppUser> page = appUserService.lambdaQuery()
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
.eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId())
- .like(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode())
+ .eq(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode())
.eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
.eq(userListQueryDto.getStatus() != null, TAppUser::getStatus, userListQueryDto.getStatus())
.eq(userListQueryDto.getVipTypeId() != null, TAppUser::getVipId, userListQueryDto.getVipTypeId())
@@ -295,6 +295,7 @@
.ge(TAppUser::getVipEndTime, LocalDateTime.now())
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
.eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId())
+ .eq(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode())
.eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
.eq(userListQueryDto.getStatus() != null, TAppUser::getStatus, userListQueryDto.getStatus())
.eq(userListQueryDto.getVipTypeId() != null, TAppUser::getVipId, userListQueryDto.getVipTypeId())
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index ec0648d..fc24034 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -71,6 +71,11 @@
public R delete(String ids) {
//拿到单位列表
String[] split = ids.split(",");
+
+ List<TAppUserTag> list = appUserTagService.lambdaQuery().in(TAppUserTag::getUserTagId).list();
+ if (!list.isEmpty()){
+ return R.fail("当前标签已有用户获取，无法删除");
+ }
for (String id : split) {
otherClient.deleteTag(Integer.valueOf(id));
}
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 cd63f1b..1316ac6 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
@@ -19,6 +19,7 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.IntegrationClient;
import com.ruoyi.system.api.domain.SysUser;
@@ -61,8 +62,7 @@
private ISiteService siteService;
@Autowired
private SysUserClient sysUserClient;
- @Resource
- private TokenService tokenService;
+
@Autowired
public TAccountingStrategyController(TAccountingStrategyService accountingStrategyService, TAccountingStrategyDetailService accountingStrategyDetailService) {
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
index 83ea8cf..5508963 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
@@ -19,6 +19,8 @@
import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.TShoppingOrderService;
+import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.feignClient.CouponClient;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
@@ -109,6 +111,17 @@
byId.setReceivingAddress(data.getAddress());
}
}
+ if (byId.getOrderType()==1){
+ TGoods data = goodsClient.getGoodsById(byId.getGoodsId()).getData();
+ if (data!=null){
+ byId.setName(data.getName());
+ }
+ }else {
+ TCoupon data = couponClient.getCouponById1(byId.getCouponId()).getData();
+ if (data!=null){
+ byId.setName(data.getName());
+ }
+ }
return AjaxResult.success(byId);
}
@GetMapping("/deleteShoppingOrder")
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 65a8a6b..ed7f52c 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
@@ -109,12 +109,11 @@
</if>
</select>
<select id="payOrderQuery" resultType="com.ruoyi.order.dto.PayOrderDto">
- SELECT * FROM (SELECT
+ SELECT o.*,i.phone FROM (SELECT
id,
`code`,
1 as type,
title,
- phone,
`status`,
order_amount,
payment_amount ,
@@ -123,7 +122,8 @@
pay_time,
refund_status,
(payment_amount-refund_amount) as final_amount,
- del_flag
+ del_flag,
+ app_user_id
FROM
charging_pile_order.t_charging_order
where recharge_payment_status = 2
@@ -133,7 +133,6 @@
`code`,
2 as type,
title,
- phone,
`status`,
order_amount,
payment_amount ,
@@ -142,7 +141,8 @@
pay_time,
refund_status,
(payment_amount-refund_amount) as final_amount,
- del_flag
+ del_flag,
+ app_user_id
FROM
charging_pile_order.t_shopping_order
where payment_status = 2
@@ -152,7 +152,6 @@
`code`,
3 as type,
title,
- phone,
payment_status AS `status`,
order_amount,
payment_amount ,
@@ -161,7 +160,8 @@
pay_time,
refund_status,
(payment_amount-refund_amount) as final_amount,
- del_flag
+ del_flag,
+ app_user_id
FROM
charging_pile_order.t_vip_order
@@ -172,7 +172,6 @@
`code`,
4 as type,
title,
- phone,
`status`,
order_amount ,
order_amount as payment_amount,
@@ -181,9 +180,11 @@
out_parking_time as pay_time,
null as refund_status,
0 as final_amount,
- 0 as del_flag
+ 0 as del_flag,
+ app_user_id
FROM
charging_pile_service.t_parking_record ) o
+ LEFT JOIN `charging_pile_account`.`t_app_user` i on o.app_user_id = i.id
<where>
o.del_flag = 0
<if test="data.code != null and data.code != ''">
@@ -207,6 +208,13 @@
#{id}
</foreach>
</if>
+ <if test="data.isRefund == 1">
+ AND o.refund_status is not null
+ </if>
+ <if test="data.isRefund == 1">
+ AND o.refund_status is null
+ </if>
+
</where>
ORDER BY o.create_time desc
@@ -226,7 +234,9 @@
re.refund_remark,
co.recharge_serial_number as serail_number,
co.payment_amount,
- co.pay_time
+ co.create_time as pay_time,
+ co.id as order_id,
+ co.app_user_id as user_id
FROM t_charging_order_refund re
LEFT JOIN t_charging_order co ON re.charging_order_id = co.id
UNION ALL
@@ -243,7 +253,9 @@
re.refund_remark,
so.serial_number,
so.payment_amount,
- so.pay_time
+ so.create_time as pay_time,
+ so.id as order_id,
+ so.app_user_id as user_id
FROM t_shopping_order_refund re
LEFT JOIN t_shopping_order so on re.shopping_order_id = so.id
UNION ALL
@@ -260,7 +272,9 @@
vr.refund_remark,
vo.serial_number,
vo.payment_amount,
- vo.pay_time
+ vo.create_time as pay_time,
+ vo.id as order_id,
+ vo.app_user_id as user_id
FROM t_vip_order_refund vr
LEFT JOIN t_vip_order vo on vr.vip_order_id = vo.id
@@ -274,7 +288,7 @@
AND o.refund_code LIKE CONCAT('%',#{data.refundCode},'%')
</if>
</where>
-
+ order by o.refund_time desc
</select>
<select id="chargingOrderGroup" resultType="com.ruoyi.common.core.dto.ChargingOrderGroup">
@@ -1325,10 +1339,9 @@
SUM(service_charge) as servicecharge,
SUM(electrovalence) as electrovalence,
count(1) as orderCount,
- SUM(electricity) as electricity,
+ SUM(electricity) as electricity
FROM
t_charging_order
-
WHERE del_flag = 0 and recharge_payment_status = 2 and DATE(
<if test="statisticsQueryDto.type == 1">
start_time
@@ -1361,7 +1374,7 @@
SUM(service_charge) as servicecharge,
SUM(electrovalence) as electrovalence,
count(1) as orderCount,
- SUM(electricity) as electricity,
+ SUM(electricity) as electricity
FROM
t_charging_order
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
index 2a669b4..e9df6f3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
@@ -36,7 +36,7 @@
public R<Page<TUserTag>> page(@RequestBody TagListQueryDto tagListQueryDto) {
Page<TUserTag> page = tUserTagService.lambdaQuery()
.orderByDesc(TUserTag::getCreateTime)
- .like(tagListQueryDto.getTagName()!=null&& tagListQueryDto.getTagName().isEmpty(), TUserTag::getName, tagListQueryDto.getTagName())
+ .like(tagListQueryDto.getTagName()!=null&& tagListQueryDto.getTagName()!="", TUserTag::getName, tagListQueryDto.getTagName())
.page(Page.of(tagListQueryDto.getPageCurr(), tagListQueryDto.getPageSize()));
return R.ok(page);
--
Gitblit v1.7.1