From 763c2b92c534b9830f39d304cb423817740c55f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 24 九月 2024 15:51:40 +0800
Subject: [PATCH] 玩湃微信商户分账
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 54 ++++++------------
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 18 +++--
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 5 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 1
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 31 ++++-----
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorAuth.java | 30 ++++++---
cloud-server-activity/src/main/resources/mapper/CouponMapper.xml | 3
7 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index d3c2feb..219f9f3 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -325,11 +325,16 @@
}
if (ofSearch.getStoreId() != null || ofSearch.getStoreIds().size() != 0) {
for (Map<String, Object> map : mapList1) {
+ if (map.get("cityManagerId").equals(ofSearch.getOperatorId())){
+ mapList.add(map);
+ continue;
+ }
// 如果当前登陆人是运营商 只能查看平台添加的优惠券应只展示使用范围为全国通用、
// 指定城市有运营商管辖的、指定门店有运营商旗下门店
if (ofSearch.getObjType() == 2) {
if (Integer.parseInt(String.valueOf(map.get("useScope"))) == 1) {
mapList.add(map);
+ continue;
}
if (Integer.parseInt(String.valueOf(map.get("useScope"))) == 2) {
// 获取到优惠券id 查询这个优惠券指定了哪些城市
diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
index ad7517a..d746ed3 100644
--- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
@@ -30,7 +30,8 @@
state,
illustrate,
auditStatus,
- publisherType
+ publisherType,
+ cityManagerId
from t_coupon
where 1=1
<if test="objType == 3">
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index f842961..52544e2 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -1002,20 +1002,20 @@
}
private String smid = "2088330203191220";//平台支付宝商户号
- public static void main(String[] args) {
- BigDecimal bigDecimal = new BigDecimal("100");
-
-
- String s = "1";
- double v = Double.parseDouble(s);
- double v1 = v * 0.01;
-
- BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(v1));
- BigDecimal multiply = bigDecimal1.multiply(bigDecimal);
- System.err.println(v);
- System.err.println(v1);
- System.err.println(multiply);
- }
+// public static void main(String[] args) {
+// BigDecimal bigDecimal = new BigDecimal("100");
+//
+//
+// String s = "1";
+// double v = Double.parseDouble(s);
+// double v1 = v * 0.01;
+//
+// BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(v1));
+// BigDecimal multiply = bigDecimal1.multiply(bigDecimal);
+// System.err.println(v);
+// System.err.println(v1);
+// System.err.println(multiply);
+// }
public ResultUtil AlipayPayment(String code, BigDecimal request) {
// 二级商户商户号
String smidUser;
@@ -1569,9 +1569,6 @@
@Autowired
private TCoursePackageService packageService;
-
- @Autowired
- private TCoursePackagePaymentService packagePaymentService;
@Autowired
private CoursePackageStudentService coursePackageStudentService;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index ca128ff..a5d0e85 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -195,6 +195,7 @@
public Object listAll(Integer id, String merchantNumber,String name) throws Exception {
TOperator byId = operatorService.getById(id);
byId.setMerchantNumber(merchantNumber);
+ byId.setMerchantName(name);
operatorService.updateById(byId);
ResultUtil resultUtil = payMoneyUtil.addReceiver(merchantNumber, name);
if (resultUtil.getCode() == 500){
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index b54e8ac..9c652e9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -116,29 +116,10 @@
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
model.addAttribute("userType",objectType);
- List<CityManager> province = cityManagerClient.listAll();
- // 已有城市管理的省
- ArrayList<String> list1 = new ArrayList<>();
- // 已有城市管理的市
- ArrayList<String> list2 = new ArrayList<>();
- for (CityManager cityManager : province) {
- list1.add(cityManager.getProvince());
- list2.add(cityManager.getCity());
- }
- HashSet<String> set = new HashSet<String>(list1);
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
-
List<TCity> list3 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
-
-
-
-
-
-
-
model.addAttribute("list",list3);
model.addAttribute("siteType",siteType);
String roleid = UserExt.getUser().getRoleid();
@@ -146,12 +127,8 @@
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("type",1);
-
-
List<TOperator> list5 = tOperatorService.list();
-
model.addAttribute("list5",list5);
-
return PREFIX + "TSite.html";
}
/**
@@ -656,21 +633,28 @@
@Autowired
private TOperatorService tOperatorService;
-
+ @Autowired
+ private TOperatorCityService operatorCityService;
/**
* 跳转到添加场地管理
*/
@RequestMapping("/add")
public String tCompetitionAdd(Model model) {
- List<CityManager> province = cityManagerClient.listAll();
- System.out.println(province);
- // 已有城市管理的省
- ArrayList<String> list1 = new ArrayList<>();
- // 已有城市管理的市
- ArrayList<String> list2 = new ArrayList<>();
- for (CityManager cityManager : province) {
- list1.add(cityManager.getProvince());
- list2.add(cityManager.getCity());
+ if (UserExt.getUser().getObjectType()==2){
+ // 查询这个运营商管理的省
+ TOperator id = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
+ if (id.getType()==1){
+ // 全国
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ }else{
+ // 找到他管理的省
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0));
+ model.addAttribute("list",list);
+ }
+ }else{
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
}
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
@@ -687,13 +671,11 @@
List<TOperator> list = tOperatorService.list();
model.addAttribute("yysList",list);
model.addAttribute("userType",objectType);
- HashSet<String> set = new HashSet<String>(list1);
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
model.addAttribute("siteType",siteType);
- model.addAttribute("province",set);
- model.addAttribute("city",list2);
+ model.addAttribute("province",list);
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorAuth.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorAuth.java
index 8649591..ffb8064 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorAuth.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorAuth.java
@@ -47,16 +47,13 @@
private String legalAddress;
@TableField(value = "legalFront")
private String legalFront;
- @TableField(value = "merchantNumber")
- private String merchantNumber;
+
@TableField(value = "legalBack")
private String legalBack;
- @TableField(value = "aliasName")
- private String aliasName;
+
@TableField(value = "accountType")
private Integer accountType;
- @TableField(value = "auditState")
- private Integer auditState;
+
@TableField(value = "bank")
private String bank;
@TableField(value = "accountName")
@@ -73,8 +70,7 @@
private String bankName;
@TableField(value = "bankNumber")
private String bankNumber;
- @TableField(value = "bankCardTwo")
- private String bankCardTwo;
+
@TableField(value = "refuseReason")
private String refuseReason;
@@ -100,8 +96,8 @@
private String signUrl;
@TableField(value = "signState")
private String signState;
-
-
+ @TableField(value = "bankCardTwo")
+ private String bankCardTwo;
@TableField(value = "isBenefits")
private String isBenefits;
@TableField(value = "benefitsName")
@@ -118,4 +114,18 @@
private String benefitsEndTime;
@TableField(value = "benefitsAddress")
private String benefitsAddress;
+ @TableField(value = "auditState")
+ private Integer auditState;
+ @TableField(value = "aliasName")
+ private String aliasName;
+ @TableField(value = "merchantNumber")
+ private String merchantNumber;
+
+
+
+
+
+
+
+
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index dd87c09..24328af 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -472,14 +472,18 @@
console.log("看看是否可预约值")
console.log(reservation);
var checkbox = document.querySelector('input[name="pt"]');
- if (checkbox.checked) {
- data.type = 1
- console.log("选中是平台");
- data.operatorId = 0;
- } else {
- console.log("运营商");
- data.type = 2;
+ console.log(checkbox)
+ if (checkbox!=null){
+ if (checkbox.checked) {
+ data.type = 1
+ console.log("选中是平台");
+ data.operatorId = 0;
+ } else {
+ console.log("运营商");
+ data.type = 2;
+ }
}
+
if (reservation == 1) {
if (data.typeName === "智慧场地") {
console.log("===========这是智慧球场")
--
Gitblit v1.7.1