From a9edc2f62628007e2c5e86d416d484780238f13f Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 11 四月 2025 14:19:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml | 4 ++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java | 2 +-
cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java | 5 +++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminAgreement/tHuiminAgreement_add.html | 2 ++
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 21 +++++++++++++++------
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java | 3 ++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java | 3 +--
7 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index 588136b..e48fc69 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -100,6 +100,9 @@
return ResultUtil.tokenErr();
}
THuiminCard huiminCard = huiminCardService.getById(id);
+ if (huiminCard.getEndTime()!=null && huiminCard.getEndTime().before(new Date())){
+ return ResultUtil.error("该惠民卡已过期");
+ }
if (huiminCard.getGrantCount()!=null){
if (huiminCard.getGrantCount()<=payHuiminService.lambdaQuery().eq(TPayHuimin::getCardId, huiminCard.getId())
.eq(TPayHuimin::getStatus,2).count()){
@@ -329,13 +332,10 @@
List<THuiminCard> list = huiminCardService.list();
for (MyHuiminCardVO myHuiminCardVO : cardList) {
TPayHuimin byId = payHuiminService.getById(myHuiminCardVO.getId());
+ myHuiminCardVO.setEndTime(byId.getEndTime());
+
myHuiminCardVO.setSalesMoney(byId.getSalesMoney());
- if (myHuiminCardVO.getEndTime().before(new Date())){
- // 已过期
- myHuiminCardVO.setIsExpire(1);
- }else{
- myHuiminCardVO.setIsExpire(0);
- }
+
int count = huiminRecordService.count(new LambdaQueryWrapper<THuiminRecord>()
.eq(THuiminRecord::getHuiminCardId, myHuiminCardVO.getCardId()));
// 购卡7日内没有使用记录可退款。超过7日不管有没有使用记录都不能退款
@@ -351,6 +351,15 @@
if (null!=huiminCard){
myHuiminCardVO.setCover(huiminCard.getBuyCover());
}
+ if (myHuiminCardVO.getEndTime().before(new Date())){
+ // 已过期
+ myHuiminCardVO.setIsExpire(1);
+ if (null!=huiminCard){
+ myHuiminCardVO.setCover(huiminCard.getUnBuyCover());
+ }
+ }else{
+ myHuiminCardVO.setIsExpire(0);
+ }
// 查询绑定人员列表
List<TStudent> studentByIds = studentClient.getStudentByIds(myHuiminCardVO.getStudentId());
myHuiminCardVO.setStudentList(studentByIds);
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
index 5b0759b..2d64453 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
@@ -5,6 +5,7 @@
import com.dsh.activity.entity.HuiminPayQuery;
import com.dsh.activity.model.response.SalesDetailVO;
import com.dsh.activity.service.PayHuiminService;
+import com.dsh.activity.util.ResultUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,9 +51,9 @@
* @param id
*/
@PostMapping("/base/tPayHuimin/refund")
- public void refund(Integer id){
+ public ResultUtil<?> refund(@RequestBody Integer id){
try {
- payHuiminService.refund(id);
+ return payHuiminService.refund(id);
} catch (AlipayApiException e) {
throw new RuntimeException(e);
}
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
index 6722d27..847863f 100644
--- a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
@@ -8,7 +8,7 @@
where
find_in_set(#{storeId},t1.storeIds)
- and t1.endTime >= now()
+
and t1.status = 1
order by t1.sort desc
limit #{pageNo}, #{pageSize}
@@ -19,7 +19,7 @@
where
find_in_set(#{storeId},t1.storeIds)
- and t1.endTime >= now()
+
and t1.status = 1
order by t1.sort desc
</select>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java
index c121f7a..77a20d2 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.activity.model.HuiminPayQuery;
import com.dsh.guns.modular.system.model.SalesDetailVO;
+import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -38,7 +39,7 @@
* @param id
*/
@PostMapping("/base/tPayHuimin/refund")
- void refund(Integer id);
+ ResultUtil<?> refund(@RequestBody Integer id);
@PostMapping("/base/tPayHuimin/export-data")
List<SalesDetailVO> exportData(@RequestBody HuiminPayQuery query);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
index 904c18b..e076a00 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
@@ -61,7 +61,7 @@
model.addAttribute("objectType", objectType);
model.addAttribute("item", huiminAgreement);
//查询运营商列表
- model.addAttribute("operatorList", operatorService.list(new QueryWrapper<TOperator>().eq("state", 1)));
+ model.addAttribute("operatorList", operatorService.list(new QueryWrapper<TOperator>().eq(Objects.nonNull(operatorId), "id",operatorId).eq("state", 1)));
model.addAttribute("operatorId", operatorId);
return PREFIX + "tHuiminAgreement_add.html";
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java
index 736dc83..d61281c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java
@@ -191,8 +191,7 @@
@PostMapping("/refund")
@ResponseBody
public ResultUtil<?> refund(Integer id) {
- payHuiminClient.refund(id);
- return ResultUtil.success();
+ return payHuiminClient.refund(id);
}
/**
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminAgreement/tHuiminAgreement_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminAgreement/tHuiminAgreement_add.html
index 669951c..e4c1699 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminAgreement/tHuiminAgreement_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminAgreement/tHuiminAgreement_add.html
@@ -29,7 +29,9 @@
<label class="col-sm-1 control-label" for="operator">所属运营商：</label>
<div class="col-sm-3">
<select id="operator" class="form-control">
+ @if(objectType == 1){
<option value="">默认</option>
+ @}
@if(isNotEmpty(operatorList)){
@for(item in operatorList){
@if(objectType == 2){
--
Gitblit v1.7.1