From 0e71f0acc2d4ab86315ecda65d01918b257810d4 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 16:47:13 +0800
Subject: [PATCH] 11.9
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 8 ++------
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 3 ++-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
index 80753eb..017cd10 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -224,7 +224,8 @@
CouponStore couponStore = csMapper.selectOne(new QueryWrapper<CouponStore>()
.eq("couponId",coupon.getId()));
StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStore.getStoreId());
- packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
+// packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
+ packageResp.setCityOrStore(courseOfStore.getStoreName());
break;
default:
break;
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 c5579c2..fa18148 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
@@ -247,9 +247,7 @@
this.clearData();
this.collectData();
- if(!this.validate()){
- return ;
- }
+
const quantityIssuedInput = document.getElementById('quantityIssued');
const pickUpQuantityInput = document.getElementById('pickUpQuantity');
@@ -625,9 +623,7 @@
let company = 3;
this.clearData();
this.collectData();
- if(!this.validate()){
- return ;
- }
+
var cityIds = [];
var cts = "";
if (company === '2'){
--
Gitblit v1.7.1