From 062fb1ed6efcaac5d75bbe184524c4929dff7fcd Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 15:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html | 18 ++++--
cloud-server-management/src/main/webapp/static/modular/system/tSiteType/tSiteType.js | 7 ++
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteTypeController.java | 7 ++
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 74 ++++++++++++------------
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 7 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html | 6 +-
7 files changed, 70 insertions(+), 51 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index 01d206d..be84d36 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -120,7 +120,7 @@
if (siteBookings.size() > 0 ){
for (SiteBooking booking : siteBookings) {
RechargesDetail consumeDetail = new RechargesDetail();
- consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.name());
+ consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
consumeDetail.setRecordId(2);
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 5b3ed85..81bd0d1 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -160,44 +160,42 @@
//分账
- Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
- Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
- Integer siteBookings = siteClient.queryByCode(outTradeNo);
- List<Integer> stores = new ArrayList<>();
- stores.add(coursePackagePayments);
- stores.add(paymentCompetitions);
- stores.add(siteBookings);
-
- OperatorUser operatorUser = siteClient.queryOperator(stores);
-
- String alipayProportion = operatorUser.getAlipayProportion();
- String alipayNum = operatorUser.getAlipayNum();
-
- ExtendParams extendParams = new ExtendParams();
-// extendParams.setSysServiceProviderId("YOUR_SERVICE_PROVIDER_ID");
- model.setExtendParams(extendParams);
-
- RoyaltyInfo royaltyInfo = new RoyaltyInfo();
-// royaltyInfo.setRoyaltyType("transfer");
-
-
- RoyaltyDetailInfos royaltyDetailInfo1 = new RoyaltyDetailInfos();
- royaltyDetailInfo1.setTransOutType("userId");
- royaltyDetailInfo1.setTransOut(aliAppid);
- royaltyDetailInfo1.setTransInType("loginName");
- royaltyDetailInfo1.setTransIn("18398968484");
-
- royaltyDetailInfo1.setDesc("分账描述1");
- royaltyDetailInfo1.setAmountPercentage(alipayProportion);
- List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
-
-
-
- royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
- model.setRoyaltyInfo(royaltyInfo);
- System.err.println("=================="+royaltyInfo);
-
-
+// Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
+// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
+// Integer siteBookings = siteClient.queryByCode(outTradeNo);
+// List<Integer> stores = new ArrayList<>();
+// stores.add(coursePackagePayments);
+// stores.add(paymentCompetitions);
+// stores.add(siteBookings);
+//
+// OperatorUser operatorUser = siteClient.queryOperator(stores);
+//
+// String alipayProportion = operatorUser.getAlipayProportion();
+// String alipayNum = operatorUser.getAlipayNum();
+//
+// ExtendParams extendParams = new ExtendParams();
+//// extendParams.setSysServiceProviderId("YOUR_SERVICE_PROVIDER_ID");
+// model.setExtendParams(extendParams);
+//
+// RoyaltyInfo royaltyInfo = new RoyaltyInfo();
+//// royaltyInfo.setRoyaltyType("transfer");
+//
+//
+// RoyaltyDetailInfos royaltyDetailInfo1 = new RoyaltyDetailInfos();
+// royaltyDetailInfo1.setTransOutType("userId");
+// royaltyDetailInfo1.setTransOut(aliAppid);
+// royaltyDetailInfo1.setTransInType("loginName");
+// royaltyDetailInfo1.setTransIn("18398968484");
+//
+// royaltyDetailInfo1.setDesc("分账描述1");
+// royaltyDetailInfo1.setAmountPercentage(alipayProportion);
+// List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
+//
+//
+//
+// royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
+// model.setRoyaltyInfo(royaltyInfo);
+// System.err.println("=================="+royaltyInfo);
//
request.setBizModel(model);
request.setNotifyUrl(callbackPath + notifyUrl);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index c93933c..6c54b90 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -683,6 +683,9 @@
if(playPaiCoin1!=null || playPaiCoin1>0){
payType=2;
}
+ if((cashPayment!=null || cashPayment>0) &&(playPaiCoin1!=null || playPaiCoin1>0)){
+ payType=3;
+ }
if(cashPayment!=null && cashPayment>0 && playPaiCoin1 !=null && playPaiCoin1>0){
}else {
@@ -698,10 +701,10 @@
paymentPrice = new BigDecimal(students.length).multiply(new BigDecimal(paymentPrice)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
Double playPaiCoin = coursePackagePaymentConfigVo.getPlayPaiCoin().doubleValue();//支付币
playPaiCoin = new BigDecimal(students.length).multiply(new BigDecimal(playPaiCoin)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- if(payType == 1 && paymentPrice.compareTo(paymentCourseVo.getPrice()) != 0){
+ if(paymentCourseVo.getPayType() != 3 && paymentPrice.compareTo(paymentCourseVo.getPrice()) != 0){
return ResultUtil.error("支付金额异常，请刷新后重试");
}
- if(payType == 2 && playPaiCoin.compareTo(paymentCourseVo.getPrice()) != 0){
+ if(paymentCourseVo.getPayType() == 3 && playPaiCoin.compareTo(paymentCourseVo.getPrice()) != 0){
return ResultUtil.error("支付金额异常，请刷新后重试");
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteTypeController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteTypeController.java
index f057f07..673042d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteTypeController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteTypeController.java
@@ -58,6 +58,9 @@
@Autowired
private ITSiteTypeService siteTypeService;
+ @Autowired
+ private ITSiteService siteService;
+
/**
* 跳转到车辆管理首页
@@ -334,6 +337,10 @@
@ResponseBody
public Object delete(Integer id) {
try {
+ List<TSite> list = siteService.list(new LambdaQueryWrapper<TSite>().eq(TSite::getSiteTypeId, id));
+ if(list.size()>0){
+ return "5002";
+ }
TSiteType byId = siteTypeService.getById(id);
byId.setState(3);
siteTypeService.updateById(byId);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html
index 9ada062..7852f3e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html
@@ -77,14 +77,14 @@
<div class="form-group">
<label class="col-sm-3 control-label">发放数量：</label>
<div class="col-sm-9">
- <input class="form-control" id="quantityIssued" name="quantityIssued" type="text" value="${item.quantityIssued}">
+ <input class="form-control" id="quantityIssued" name="quantityIssued" type="number" value="${item.quantityIssued}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">限领数量：</label>
<div class="col-sm-9">
- <input class="form-control" id="pickUpQuantity" name="pickUpQuantity" type="text" value="${item.pickUpQuantity}">
+ <input class="form-control" id="pickUpQuantity" name="pickUpQuantity" type="number" value="${item.pickUpQuantity}">
</div>
</div>
@@ -98,7 +98,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-9">
- <input class="form-control" id="sort" name="sort" type="text" value="${item.sort}">
+ <input class="form-control" id="sort" name="sort" type="number" value="${item.sort}">
</div>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
index 850f5bd..e993123 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
@@ -50,7 +50,13 @@
<input type="radio" name="type" value="3" > 年卡
</div>
</div>
- <#input id="price" name="原价" type="text"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">原价：</label>
+ <div class="col-sm-9">
+ <input class="form-control" id="price" name="price" type="number">
+
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">兑换方式：</label>
<div class="col-sm-9">
@@ -62,14 +68,14 @@
<div class="form-group" id="y1" hidden>
<label class="col-sm-3 control-label">所需现金：</label>
<div class="col-sm-9">
- <input class="form-control" id="cash" name="cash" type="text">
+ <input class="form-control" id="cash" name="cash" type="number">
</div>
</div>
<div class="form-group" id="y2">
<label class="col-sm-3 control-label">所需积分：</label>
<div class="col-sm-9">
- <input class="form-control" id="integral" name="integral" type="text">
+ <input class="form-control" id="integral" name="integral" type="number">
</div>
</div>
@@ -112,14 +118,14 @@
<div class="form-group">
<label class="col-sm-3 control-label">发放数量：</label>
<div class="col-sm-9">
- <input class="form-control" id="quantityIssued" name="quantityIssued" type="text">
+ <input class="form-control" id="quantityIssued" name="quantityIssued" type="number">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">限领数量：</label>
<div class="col-sm-9">
- <input class="form-control" id="pickUpQuantity" name="pickUpQuantity" type="text">
+ <input class="form-control" id="pickUpQuantity" name="pickUpQuantity" type="number">
</div>
</div>
<#input id="startTime" name="有效期" type="text"/>
@@ -209,7 +215,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-9">
- <input class="form-control" id="sort" name="sort" type="text">
+ <input class="form-control" id="sort" name="sort" type="number">
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSiteType/tSiteType.js b/cloud-server-management/src/main/webapp/static/modular/system/tSiteType/tSiteType.js
index 797732a..66224e5 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSiteType/tSiteType.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSiteType/tSiteType.js
@@ -59,7 +59,12 @@
let id = this.seItem.id
var operation = function(){
var ajax = new $ax(Feng.ctxPath + "/tSiteType/delete", function (data) {
- Feng.success("删除成功!");
+ if(data=="5002"){
+ Feng.info("已有场地使用无法删除!");
+ }else {
+ Feng.success("删除成功!");
+ }
+
TSite.table.refresh();
}, function (data) {
Feng.error("删除失败!" + data.responseJSON.message + "!");
--
Gitblit v1.7.1