From 082b7025e5654be2d38a7caccfe714937217410b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 07 十一月 2023 14:22:33 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java | 3 -
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html | 58 -----------------------------
cloud-server-management/src/main/webapp/static/modular/system/operator/operator_add.js | 8 ++++
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 29 ++++++++------
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html | 2
cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js | 4 +-
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 2 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 5 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/Operator_add.html | 2
10 files changed, 33 insertions(+), 82 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
index 78a9cad..3eb3c69 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
@@ -77,15 +77,12 @@
*/
@RequestMapping("/base/benefitVideo/add")
public Object addSite(@RequestBody BenefitsVideoClassification site){
- QueryWrapper<BenefitsVideoClassification> wrapper = new QueryWrapper<BenefitsVideoClassification>().eq("name", site.getName());
- if (benefitsVideoClassificationService.list(wrapper).size()==0){
if(site.getId()!= null ){
benefitsVideoClassificationService.updateById(site);
return 200;
}else {
return benefitsVideoClassificationService.save(site);
}
- }else return 500;
}
/**
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 7b459a7..e39623c 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
@@ -569,20 +569,23 @@
coupon.setIllustrate(dataVo.getIllustrate());
coupon.setDistributionMethod(dataVo.getDistributionMethod());
coupon.setRedemptionMethod(dataVo.getExchangeMethod());
- switch (dataVo.getExchangeMethod()){
- case 1:
- coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
- break;
- case 2:
- coupon.setCash(dataVo.getRequiredCash());
- coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
- break;
- case 3:
- coupon.setCash(dataVo.getRequiredCash());
- break;
- default:
- break;
+ if (dataVo.getExchangeMethod()!=null){
+ switch (dataVo.getExchangeMethod()){
+ case 1:
+ coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+ break;
+ case 2:
+ coupon.setCash(dataVo.getRequiredCash());
+ coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+ break;
+ case 3:
+ coupon.setCash(dataVo.getRequiredCash());
+ break;
+ default:
+ break;
+ }
}
+
coupon.setQuantityIssued(dataVo.getQuantityIssued());
coupon.setPickUpQuantity(dataVo.getPickUpQuantity());
coupon.setUseScope(dataVo.getCompany());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index e09a22b..713a533 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -187,11 +187,10 @@
String money = byId.getMoney();
// todo 这里手动支付 默认按照现金当作支付金额 后续可能要问下产品
String[] split = money.split(",");
- BigDecimal bigDecimal = new BigDecimal(split[0]);
-
-
+ Double aDouble = Double.valueOf(split[0]);
System.out.println("============"+id);
SiteBooking siteBooking = new SiteBooking();
+ siteBooking.setPayMoney(aDouble);
siteBooking.setId(id);
siteBooking.setStatus(1);
siteBooking.setPayType(4);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 7263dbc..6164351 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -453,7 +453,7 @@
evaluateStudent.setImgs(images);
appUserClient.save(evaluateStudent);
-// evaluateStudentService.updateById(evaluateStudent);
+ evaluateStudentService.updateById(evaluateStudent);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
index 2f3f50e..797af0b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
@@ -180,64 +180,6 @@
</div>
</div>
-
-
- <div class="row">
- <div class="col-lg-6" style="">
- <div class="form-group" >
- <label class="col-sm-4 control-label" >
- 结算账户类型：<input type="radio" name="type" value="1">对公 <input type="radio" name="type" value="2">对私
- </label>
- </div>
-
- <div class="form-group">
- <label class="col-sm-3 control-label">开户银行：</label>
- <div class="col-sm-9">
- <select style="width: 150px" class="form-control" id="bank" onchange="TSite.oneChange(this)" name="bank">
- <option value="">选择开户银行</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">开户所在地：</label>
- <div class="col-sm-9" style="display: flex">
- <select style="width: 150px" class="form-control" id="pCode" onchange="TSite.oneChange(this)" name="bank">
- <option value="">选择省</option>
- @for(obj in provinceList){
- <option value="${obj.code}">${obj.name}</option>
- @}
- </select>
- <select style="width: 150px" class="form-control" id="cCode" name="bank">
- <option value="">选择市区</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">*银行卡号：</label>
- <div class="col-sm-9">
- <input style="width: 300px" class="form-control" id="backNumber" name="backNumber" type="text">
- </div>
- </div>
- </div>
- <div class="col-lg-6" style="">
- <div class="form-group">
- <label class="col-sm-3 control-label">*开户名称：</label>
- <div class="col-sm-9">
- <input style="width: 300px" class="form-control" id="backUserName" placeholder="请输入" type="text">
- </div>
- </div>
- <div class="form-group" >
- <label class="col-sm-3 control-label">*开户行全称：</label>
- <div class="col-sm-9">
- <input style="width: 300px" class="form-control" id="backName" placeholder="请输入" type="text">
- </div>
- </div>
- </div>
- </div>
-
-
-
-
<div class="row" id="benefit">
<div class="col-lg-6" style="">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/Operator_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/Operator_add.html
index 549860e..aa019a8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/Operator_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/Operator_add.html
@@ -55,7 +55,7 @@
<div class="form-group" >
<label class="col-sm-3 control-label">*管理员手机号：</label>
<div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" class="form-control" id="phone" placeholder="请输入管理员手机号" type="text">
+ <input style="width: 300px" class="form-control" id="phone" placeholder="请输入管理员手机号" type="number">
</div>
</div>
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
index 8094f59..31a1bbe 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
@@ -131,7 +131,7 @@
<input class="col-sm-1 control-label" onclick="exchangeMethod1()" name="exchangeMethod" type="radio"
value="1" style="margin-top: 10px"/>
<label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">积分</label>
- <input class="col-sm-1 control-label" name="exchangeMethod" checked onclick="exchangeMethod2()" type="radio"
+ <input class="col-sm-1 control-label" name="exchangeMethod" onclick="exchangeMethod2()" type="radio"
value="2" style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 20%;margin-top: 7px">现金+积分</label>
<input class="col-sm-1 control-label" name="exchangeMethod" onclick="exchangeMethod3()" type="radio"
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/operator/operator_add.js b/cloud-server-management/src/main/webapp/static/modular/system/operator/operator_add.js
index 79c70b1..c1b7311 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/operator/operator_add.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/operator/operator_add.js
@@ -130,6 +130,7 @@
TSite.addSubmit = function(){
+ var phoneRegex = /^1[0-9]{10}$/;
var areaType = $("input[name='areaType']:checked").val();
if ("" == $("#name").val() || null == $("#name").val()){
Feng.error("请输入运营商名称");
@@ -143,6 +144,13 @@
Feng.error("请输入管理员电话");
return;
}
+ console.log("看看手机号")
+ console.log($("#phone").val())
+ if (!phoneRegex.test($("#phone").val())){
+
+ Feng.info("手机号不合法,请重新输入!");
+ return;
+ }
if (areaType == 2){
var comArr=[];
$(".areaValueClass").each(function () {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
index f7fc5e5..b0cfb2c 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
@@ -395,7 +395,8 @@
if ($('#userType').val()==1){
// 兑换方式
let exchangeMethod = $(':radio[name="exchangeMethod"]:checked').val();
-
+ console.log("看看exchangeMethod")
+ console.log(exchangeMethod)
if (distributionMethod === '1') {
if (exchangeMethod === '' || exchangeMethod === undefined || exchangeMethod === null) {
return Feng.error('兑换方式不能为空');
@@ -460,7 +461,6 @@
var ajax = new $ax(Feng.ctxPath + "/tCouponManage/commitData", function (data) {
Feng.success("添加成功!");
window.parent.TCoupon.table.refresh();
- couponInfoDlg.close();
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
index f507aa8..b5b04d4 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
@@ -871,12 +871,14 @@
if (isNaN(quantityIssued1) || isNaN(pickUpQuantity1)) {
Feng.error("优惠卷数量必须为数字")
console.log('Both quantityIssued and pickUpQuantity must be numbers.');
+ return
} else if (quantityIssued1 >= pickUpQuantity1) {
console.log('quantityIssued is greater than pickUpQuantity.');
} else {
Feng.error("发放数量必须大于限领数量")
+ return
console.log('quantityIssued is not greater than pickUpQuantity.');
}
var imgOne ="";
--
Gitblit v1.7.1