From 4ee77a0ee732b1d760b08d986ab308dc8d89f6be Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 10:43:54 +0800
Subject: [PATCH] 支付会员购买bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 30 +++++++++++++++++-------------
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html | 2 +-
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 21 +++++++++++++++++++++
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 3 +++
cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java | 1 +
5 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
index 3ca1fe4..acf9f66 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
@@ -121,6 +121,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(vipEndTime);
calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
+ appUser.setIsVip(1);
appUser.setVipEndTime(calendar.getTime());
appUserService.updateById(appUser);
return;
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index c48f6a3..99037d0 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -384,6 +384,9 @@
List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
return registerOrderVOS;
}
+ }else{
+ List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
+ return registerOrderVOS;
}
List<RegisterOrderVO> result = new ArrayList<>();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index f10b1d3..266e1e8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -135,29 +135,33 @@
model.addAttribute("objectType",UserExt.getUser().getObjectType());
return PREFIX + "TShop_add.html";
}
+
// 运营商根据省筛选市区
@RequestMapping("/getCityYys")
@ResponseBody
public Object getCityYys(String province) {
Integer objectId = UserExt.getUser().getObjectId();
- // todo
// 通过选择的省 获取管理的市
TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
.eq("code",province).eq("operatorId",objectId));
-
- List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>()
- .eq("pid", province).eq("operatorId", UserExt.getUser().getObjectId()));
- if (list.size() == 0){
- // 管理整个省 获取这个省下的所有市
- List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- // 拿到省的id
- TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode()));
- // 获取省下面的所有市
- return cityService.list(new QueryWrapper<TCity>().eq("parent_id", code.getId()));
+ // 如果为null 则说明管理的全国
+ if (byId == null){
+ TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", province));
+ return cityService.list(new QueryWrapper<TCity>().eq("parent_id",code.getId()));
}else{
- // 没有管理整个省 获取对应的市
- return list;
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>()
+ .eq("operatorId", UserExt.getUser().getObjectId())
+ .eq("pid",byId.getId()));
+ if (list.size() == 0){
+ // 说明管理整个省
+ TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode()));
+ // 获取省下面的所有市
+ return cityService.list(new QueryWrapper<TCity>().eq("parent_id", code.getId()));
+ }else{
+ // 没有管理整个省 获取对应的市
+ return list;
+ }
}
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
index 3198faa..b937bcf 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
@@ -91,7 +91,7 @@
<div class="form-group" id="provinceCode1">
<label class="col-sm-3 control-label">所在省：</label>
<div class="col-sm-9">
- <select class="form-control" id="pCode1" name="pCode1" onchange="TCarInfoDlg.oneChange(this)">
+ <select class="form-control" id="pCode1" name="pCode1" onchange="TCarInfoDlg.oneChange9(this)">
<option value="">选择省</option>
@for(i in list){
<option value="${i.code}">${i.name}</option>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
index 7aeb2d8..aa8e242 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -122,6 +122,27 @@
ajax.set("oneId",oneId);
ajax.start();
}
+TCarInfoDlg.oneChange9 = function (e) {
+ console.log(111)
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tShop/getCityYys", function(data){
+ if(data!=null){
+ if(language==1){
+ var content='<option value="">选择市</option>';
+ }else if(language==2){
+ var content='<option value="">Choose your franchisee</option>';
+ }else {
+ var content='<option value="">Pilih franchisee Anda</option>';
+ }
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#cCode1").empty().append(content);
+ }
+ });
+ ajax.set("province",oneId);
+ ajax.start();
+}
TCarInfoDlg.oneChangeNext = function (e) {
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/oneChangeNext", function(data){
--
Gitblit v1.7.1