From c16becdd1bf5197fbe9dab3a6a8f440f79b938af Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 十一月 2025 20:56:40 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html | 6 +-
cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java | 8 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BlackboardController.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_three.html | 2
cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoods_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html | 4
cloud-server-management/src/main/webapp/WEB-INF/view/blackboardBlank.html | 1
cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java | 12 ++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html | 2
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html | 22 +++---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_img.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_imgAll.html | 6 +-
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java | 21 +++++++
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 24 +++++--
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 7 +
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java | 2
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 15 +++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_imgAll.html | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 7 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html | 4
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_img.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html | 2
29 files changed, 113 insertions(+), 58 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index c8b23de..e89fe07 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -332,6 +332,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
public ResultUtil<List<Goods>> pointsMallList(MallRequest request) {
+ System.err.println( "积分商城"+request);
return ResultUtil.success(tauService.queryAppUserIntegral(request));
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
index 3cbe585..626b95d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
@@ -12,7 +12,7 @@
@ApiModelProperty(value = "2.0新增字段二维码类型 1订场 2散客 3门票 4惠民卡")
private Integer codeType;
@ApiModelProperty(value = "2.0新增字段数据id")
- private Integer dataId;
+ private String dataId;
@ApiModelProperty(value = "记录id")
private Long detailsId;
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
index b7fa997..bc203b1 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
@@ -2,6 +2,7 @@
import com.dsh.activity.entity.THuiminRecord;
import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.entity.UserPointsMerchandise;
import com.dsh.activity.entity.VipDetail;
import com.dsh.activity.feignclient.other.SiteClient;
import com.dsh.activity.feignclient.other.StoreClient;
@@ -9,6 +10,8 @@
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.service.*;
import com.dsh.activity.util.ResultUtil;
+import com.dsh.activity.util.UUIDUtil;
+import io.swagger.models.auth.In;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +42,24 @@
private SiteClient siteClient;
@Resource
private StoreClient storeClient;
+ @Resource
+ private UserPointsMerchandiseService userPointsMerchandiseService;
+// @GetMapping("/grantTicket")
+// public void grantTicket(Integer userId, Integer id) throws Exception {
+// UserPointsMerchandise userPointsMerchandise = new UserPointsMerchandise();
+// userPointsMerchandise.setPointsMerchandiseId(id);
+// userPointsMerchandise.setUserId(userId);
+// userPointsMerchandise.setStatus(1);
+// userPointsMerchandise.setInsertTime(new Date());
+// 947024 userPointsMerchandise.setPayType(1);
+// userPointsMerchandise.setGoodsNumber(1);
+// userPointsMerchandise.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
+// userPointsMerchandise.setPayStatus(2);
+// userPointsMerchandise.setState(1);
+// userPointsMerchandise.setCashPayType(1);
+// userPointsMerchandise.setPaymentTime(new Date());
+// userPointsMerchandiseService.save(userPointsMerchandise);
+// }
/**
* 硬件开门后回调 存储玩湃惠民卡使用记录
*/
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 774b374..c7bf95c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -912,7 +912,7 @@
detailsResponse.setGoodType(merchandise.getType());
if (merchandise.getType() == 3) {
detailsResponse.setCodeType(3);
- detailsResponse.setDataId(pointsMerchandise.getPointsMerchandiseId());
+ detailsResponse.setDataId(pointsMerchandise.getId()+"");
detailsResponse.setCardType(merchandise.getCardType());
List<Integer> sids = new ArrayList<>();
detailsResponse.setUserId(appUserId);
@@ -1033,7 +1033,7 @@
String format = simpleDateFormat1.format(pointsMerchandise.getInsertTime());
detailsResponse.setStartTime(format + " " + startTime + ":00");
detailsResponse.setEndTime(format + " " + endTime + ":00");
- if (simpleDateFormat.parse(format + " " + endTime + ":00").before(new Date())) {
+ if (simpleDateFormat.parse(format + " " + endTime + ":00").before(new Date()) &&detailsResponse.getUseStatus()==2) {
System.err.println("过期了，当前门店中最晚营业时间为" + format + " " + endTime + ":00");
detailsResponse.setUseStatus(3);
}
@@ -1049,7 +1049,7 @@
detailsResponse.setEndTime(endDate);
Date now = new Date();
- if (now.after(end)) {
+ if (now.after(end)&&detailsResponse.getUseStatus()==2) {
detailsResponse.setUseStatus(3);
}
@@ -1057,7 +1057,7 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance();
calendar.setTime(pointsMerchandise.getInsertTime());
- calendar.add(Calendar.DAY_OF_MONTH, 93);
+ calendar.add(Calendar.DAY_OF_MONTH, 90);
Date end = calendar.getTime();
String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
String endDate = dateFormat.format(end);
@@ -1065,7 +1065,7 @@
detailsResponse.setEndTime(endDate);
Date now = new Date();
- if (now.after(end)) {
+ if (now.after(end)&&detailsResponse.getUseStatus()==2) {
detailsResponse.setUseStatus(3);
}
@@ -1073,7 +1073,7 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance();
calendar.setTime(pointsMerchandise.getInsertTime());
- calendar.add(Calendar.DAY_OF_MONTH, 372);
+ calendar.add(Calendar.DAY_OF_MONTH, 365);
Date end = calendar.getTime();
String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
String endDate = dateFormat.format(end);
@@ -1081,7 +1081,7 @@
detailsResponse.setEndTime(endDate);
Date now = new Date();
- if (now.after(end)) {
+ if (now.after(end)&&detailsResponse.getUseStatus()==2) {
detailsResponse.setUseStatus(3);
}
@@ -1107,12 +1107,16 @@
detailsResponse.setUseStatus(vipDetail.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(3);
detailsResponse.setCardType(3);
+ detailsResponse.setDataId(vipDetail.getId()+"");
// 表明是会员赠送的门票
detailsResponse.setExchangeType(4);
// 全国通用
detailsResponse.setRid(Collections.singletonList(0));
detailsResponse.setSid(Collections.singletonList(0));
-
+ Date now = new Date();
+ if (now.after(vipDetail.getEndTime())&&detailsResponse.getUseStatus()==2) {
+ detailsResponse.setUseStatus(3);
+ }
responses.add(detailsResponse);
}
if (userCoupons.size() > 0) {
@@ -1141,6 +1145,10 @@
detailsResponse.setEndTime(simpleDateFormat.format(c.getEndTime()));
detailsResponse.setUseStatus(userCoupon.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(4);
+ Date now = new Date();
+ if (now.after(c.getEndTime())&&detailsResponse.getUseStatus()==2) {
+ detailsResponse.setUseStatus(3);
+ }
responses.add(detailsResponse);
}
Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index d475fb7..96d1e55 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -211,8 +211,8 @@
* @param id
* @return
*/
- @GetMapping("/userCoupon/changeTicketStatus/{id}")
- public void changeTicketStatus(@PathVariable("id") String id){
+ @GetMapping("/userCoupon/changeTicketStatus/{id}/{storeId}/{siteId}")
+ public void changeTicketStatus(@PathVariable("id") String id,@PathVariable("storeId") Integer storeId,@PathVariable("siteId") Integer siteId){
System.err.println("数据id"+id);
if (id.length()<=11){
// 购买会员赠送的门票
@@ -222,6 +222,8 @@
if (vipDetail!=null){
System.err.println("修改使用状态");
vipDetail.setStatus(2);
+ vipDetail.setUseStoreId(storeId);
+ vipDetail.setUseSiteId(siteId);
vipDetailService.updateById(vipDetail);
}else{
System.err.println("未查询到会员权益门票数据"+ id);
@@ -235,6 +237,7 @@
System.err.println("修改使用状态");
userPointsMerchandise.setUserId(null);
userPointsMerchandise.setVerificationTime(new Date());
+ userPointsMerchandise.setVerifiStoreId(storeId);
userPointsMerchandise.setStatus(2);
userPointsMerchandiseService.updateById(userPointsMerchandise);
}else{
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
index 1cabf70..c89e49b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
@@ -13,7 +13,7 @@
@ApiModelProperty(value = "2.0新增字段二维码类型 1订场 2散客 3门票 4惠民卡")
private Integer codeType;
@ApiModelProperty(value = "2.0新增字段数据id")
- private Integer dataId;
+ private String dataId;
@ApiModelProperty(value = "记录id")
private Long detailsId;
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index 0a35d62..ce57566 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -292,11 +292,14 @@
Integer id = jsonObject.getInteger("id");
TStudent tStudent = studentClient.queryById(id);
- if(tStudent==null || tStudent.getIdCard()==null || "".equals(tStudent.getIdCard())){
- return ResultUtil.error("选择人员未进行实名认证!");
+ if( competition.getRealName()==1){
+ if(tStudent==null || tStudent.getIdCard()==null || "".equals(tStudent.getIdCard()) ){
+ return ResultUtil.error("选择人员未进行实名认证!");
+ }
}
+
if (competition.getStartAge() > (Integer.valueOf(sdf1.format(new Date())) - Integer.valueOf(sdf1.format(tStudent.getBirthday())))) {
return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BlackboardController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BlackboardController.java
index e55b3c9..7a919bf 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BlackboardController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BlackboardController.java
@@ -51,7 +51,7 @@
public String blackboard(Model model,Integer type) {
//查询当前用户是否有"首页"菜单的权限
//Check if the current user has permission to access the "home page" menu.
- Integer id = 1;
+ Integer id = UserExt.getUser().getId();
User user = userService.getById(id);
Integer menuNum = userService.getMenuNumByRole(user.getRoleid());
model.addAttribute("language", UserExt.getLanguage());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 619eaba..6244806 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -157,7 +157,7 @@
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
User user = this.userService.getById(userId);
- Role role = roleService.getById(user.getId());
+ Role role = roleService.getById(user.getRoleid());
Dept dept = deptService.getById(user.getDeptid());
model.addAttribute(user);
model.addAttribute("roleName", role.getName());
@@ -352,10 +352,10 @@
}
oldUser.setName(user.getName());
oldUser.setBirthday(user.getBirthday());
- oldUser.setRoleid(user.getRoleid());
oldUser.setDeptid(user.getDeptid());
oldUser.setIdCard(user.getIdCard());
oldUser.setSex(user.getSex());
+ oldUser.setEmail(user.getEmail());
if (user.getAvatar()!=null && (!user.getAvatar().equals("")))
oldUser.setAvatar(user.getAvatar());
this.userService.updateById(oldUser);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/blackboardBlank.html b/cloud-server-management/src/main/webapp/WEB-INF/view/blackboardBlank.html
index 4f758da..c962c2e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/blackboardBlank.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -31,7 +31,6 @@
<address>
<strong>E-mail:${user.email}</strong><br>
<strong>Tel:${user.phone}</strong><br>
- <strong>登录次数：${loginNum}次</strong><br>
<strong>登录时间：${date}</strong><br>
</address>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
index 025eb76..19f0de5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -232,7 +232,7 @@
</div>
</div>
- <#avatar id="coverDrawing" name="赛事封面(推荐像素：210*280px)：" />
+ <#avatar id="coverDrawing" name="赛事封面(推荐像素：210*280px)" avatarImg=""/>
<div class="row" id="app1">
<div class="form-group">
<label class="col-sm-3 control-label head-scu-label">*赛事活动图片(请上传不超过五张图片): </label>
@@ -253,7 +253,7 @@
</div>
</div>
</div>
- <#avatar id="registrationNotes" name="报名须知(推荐像素：宽780px)：" />
+ <#avatar id="registrationNotes" name="报名须知(推荐像素：宽780px)：" avatarImg="" />
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html
index 3c96ae1..88b95fe 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html
@@ -83,7 +83,7 @@
</div>
</div>
- <#avatar id="cover" name="商品封面" />
+ <#avatar id="cover" name="商品封面" avatarImg=""/>
<div class="row" id="app" >
<div class="col-sm-6" style="width: 100%">
@@ -313,7 +313,7 @@
</div>
- <#avatar id="cover1" name="*商品封面" />
+ <#avatar id="cover1" name="*商品封面" avatarImg="" />
<div class="row" id="app1" >
<div class="col-sm-6" style="width: 100%">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoods_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoods_add.html
index e64b2c4..aff6eb3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoods_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoods_add.html
@@ -84,7 +84,7 @@
</div>
</div>
- <#avatar id="cover" name="商品封面" />
+ <#avatar id="cover" name="商品封面" avatarImg="" />
<div class="row" id="app" >
<div class="col-sm-6" style="width: 100%">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_img.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_img.html
index 1cff518..0b1640d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_img.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_img.html
@@ -5,7 +5,7 @@
<div class="form-horizontal" id="carInfoForm">
<input hidden id="id" value="${id}">
@if(welfarePicture==null){
- <#avatar id="welfarePicture" name="福利图片"/>
+ <#avatar id="welfarePicture" name="福利图片" avatarImg="" />
@}
@if(welfarePicture!=null){
<#avatar id="welfarePicture" name="福利图片" avatarImg="${welfarePicture}"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_imgAll.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_imgAll.html
index 9a40637..ff14c65 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_imgAll.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TShop_imgAll.html
@@ -26,7 +26,7 @@
</div>
</div>
@if(c1==null){
- <#avatar id="c1" name="背景图" />
+ <#avatar id="c1" name="背景图" avatarImg="" />
@}
@if(c1!=null){
<#avatar id="c1" name="背景图" avatarImg="${c1.backgroundImage}"/>
@@ -45,7 +45,7 @@
</div>
</div>
@if(c2==null){
- <#avatar id="c2" name="背景图" />
+ <#avatar id="c2" name="背景图" avatarImg="" />
@}
@if(c2!=null){
<#avatar id="c2" name="背景图" avatarImg="${c2.backgroundImage}"/>
@@ -69,7 +69,7 @@
</div>
</div>
@if(c3==null){
- <#avatar id="c3" name="背景图" />
+ <#avatar id="c3" name="背景图" avatarImg="" />
@}
@if(c3!=null){
<#avatar id="c3" name="背景图" avatarImg="${c3.backgroundImage}"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
index 9ff0a19..59fe8c0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
@@ -49,13 +49,13 @@
</div>
@if(language==1){
- <#avatar id="imgUrl" name="封面：" />
+ <#avatar id="imgUrl" name="封面：" avatarImg="" />
@}
@if(language==2){
- <#avatar id="imgUrl" name="Cover：" />
+ <#avatar id="imgUrl" name="Cover：" avatarImg="" />
@}
@if(language==3){
- <#avatar id="imgUrl" name="Menutupi：" />
+ <#avatar id="imgUrl" name="Menutupi：" avatarImg="" />
@}
@if(language==1){
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 ca1483a..921cb91 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
@@ -131,7 +131,7 @@
</div>
<#input id="userName" name="*店长姓名" placeholder= "请输入店长姓名" type="text"/>
<#input id="userPhone" name="*店长手机号" placeholder= "请输入店长手机号" type="text"/>
- <#avatar id="img" name="*门店封面(推荐像素722*360px)" />
+ <#avatar id="img" name="*门店封面(推荐像素722*360px)" avatarImg="" />
<div class="row" id="app1">
<div class="col-sm-6" style="width: 100%;margin-left: 103px;">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_three.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_three.html
index ebdf427..ee4da00 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_three.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_three.html
@@ -4,7 +4,7 @@
<div class="form-horizontal" id="carInfoForm">
<input id="id" value="${id}" hidden>
- <#avatar id="url" name="图片(推荐像素宽度316px)"/>
+ <#avatar id="url" name="图片(推荐像素宽度316px)" avatarImg="" />
<div class="input-group" style="margin-left: 342px;">
<div class="input-group-btn">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
index 4027bc3..18d7d59 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
@@ -5,7 +5,7 @@
<div class="form-horizontal" id="carInfoForm">
<input hidden id="id" value="${id}">
@if(welfarePicture==null){
- <#avatar id="welfarePicture" name="福利图片(推荐像素宽度:780px)"/>
+ <#avatar id="welfarePicture" name="福利图片(推荐像素宽度:780px)" avatarImg="" />
@}
@if(welfarePicture!=null){
<#avatar id="welfarePicture" name="福利图片(推荐像素宽度:780px)" avatarImg="${welfarePicture}"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html
index 2b3ca1f..5e97d9a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html
@@ -56,7 +56,7 @@
</div>
</div>
@if(c1==null){
- <#avatar id="c1" name="背景图" />
+ <#avatar id="c1" name="背景图" avatarImg="" />
@}
@if(c1!=null){
<#avatar id="c1" name="背景图" avatarImg="${c1.backgroundImage}"/>
@@ -80,7 +80,7 @@
</div>
</div>
@if(c2==null){
- <#avatar id="c2" name="背景图" />
+ <#avatar id="c2" name="背景图" avatarImg="" />
@}
@if(c2!=null){
<#avatar id="c2" name="背景图" avatarImg="${c2.backgroundImage}"/>
@@ -109,7 +109,7 @@
</div>
</div>
@if(c3==null){
- <#avatar id="c3" name="背景图" />
+ <#avatar id="c3" name="背景图" avatarImg="" />
@}
@if(c3!=null){
<#avatar id="c3" name="背景图" avatarImg="${c3.backgroundImage}"/>
@@ -133,7 +133,7 @@
</div>
</div>
@if(c4==null){
- <#avatar id="c4" name="背景图" />
+ <#avatar id="c4" name="背景图" avatarImg="" />
@}
@if(c4!=null){
<#avatar id="c4" name="背景图" avatarImg="${c4.backgroundImage}"/>
@@ -162,7 +162,7 @@
</div>
</div>
@if(c5==null){
- <#avatar id="c5" name="背景图" />
+ <#avatar id="c5" name="背景图" avatarImg="" />
@}
@if(c5!=null){
<#avatar id="c5" name="背景图" avatarImg="${c5.backgroundImage}"/>
@@ -186,7 +186,7 @@
</div>
</div>
@if(c6==null){
- <#avatar id="c6" name="背景图" />
+ <#avatar id="c6" name="背景图" avatarImg="" />
@}
@if(c6!=null){
<#avatar id="c6" name="背景图" avatarImg="${c6.backgroundImage}"/>
@@ -214,7 +214,7 @@
</div>
</div>
@if(c7==null){
- <#avatar id="c7" name="背景图" />
+ <#avatar id="c7" name="背景图" avatarImg="" />
@}
@if(c7!=null){
<#avatar id="c7" name="背景图" avatarImg="${c7.backgroundImage}"/>
@@ -238,7 +238,7 @@
</div>
</div>
@if(c8==null){
- <#avatar id="c8" name="背景图" />
+ <#avatar id="c8" name="背景图" avatarImg="" />
@}
@if(c8!=null){
<#avatar id="c8" name="背景图" avatarImg="${c8.backgroundImage}"/>
@@ -291,7 +291,7 @@
</div>
</div>
@if(obj==null){
- <#avatar id="${obj.id}" name="背景图" />
+ <#avatar id="${obj.id}" name="背景图" avatarImg="" />
@}
@if(obj!=null){
<#avatar id="${obj.id}" name="背景图" avatarImg="${obj.backgroundImage}"/>
@@ -319,7 +319,7 @@
</div>
</div>
@if(c10==null){
- <#avatar id="c10" name="背景图" />
+ <#avatar id="c10" name="背景图" avatarImg="" />
@}
@if(c10!=null){
<#avatar id="c10" name="背景图" avatarImg="${c10.backgroundImage}"/>
@@ -346,7 +346,7 @@
</div>
</div>
@if(c11==null){
- <#avatar id="c111" name="背景图" />
+ <#avatar id="c111" name="背景图" avatarImg="" />
@}
@if(c11!=null){
<#avatar id="c111" name="背景图" avatarImg="${c11.backgroundImage}"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_add.html
index 5677e41..48b53c5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_add.html
@@ -94,7 +94,7 @@
</div>
<#input id="userName" name="店长姓名" type="text"/>
<#input id="userPhone" name="店长手机号" type="text"/>
- <#avatar id="img" name="门店封面(推荐像素722*360px)" />
+ <#avatar id="img" name="门店封面(推荐像素722*360px)" avatarImg="" />
<div class="row" id="app1">
<div class="col-sm-6" style="width: 100%">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_img.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_img.html
index 1cff518..e52607b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_img.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_img.html
@@ -5,7 +5,7 @@
<div class="form-horizontal" id="carInfoForm">
<input hidden id="id" value="${id}">
@if(welfarePicture==null){
- <#avatar id="welfarePicture" name="福利图片"/>
+ <#avatar id="welfarePicture" name="福利图片" avatarImg=""/>
@}
@if(welfarePicture!=null){
<#avatar id="welfarePicture" name="福利图片" avatarImg="${welfarePicture}"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_imgAll.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_imgAll.html
index 9a40637..300d900 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_imgAll.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSiteType/TShop_imgAll.html
@@ -26,7 +26,7 @@
</div>
</div>
@if(c1==null){
- <#avatar id="c1" name="背景图" />
+ <#avatar id="c1" name="背景图" avatarImg="" />
@}
@if(c1!=null){
<#avatar id="c1" name="背景图" avatarImg="${c1.backgroundImage}"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
index 4591282..f7997c3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
@@ -9,7 +9,7 @@
<div id="driverInfoContent">
<#input id="name" name="*员工姓名" underline="true"/>
<#input id="phone" name="*联系电话" underline="true"/>
- <#avatar id="avatar" name="*照片" underline="true"/>
+ <#avatar id="avatar" name="*照片" avatarImg="" underline="true"/>
<#input id="birthday" name="*生日" underline="true" type="text"/>
<#select id="sex" name="*性别" underline="true" >
<option value="1" selected>男</option>
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
index a2e66ca..fd18f40 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
@@ -50,6 +50,9 @@
System.err.println("dataId:"+dataId);
System.err.println("rid:"+rid);
System.err.println("sid:"+sid);
+ if (rid==32){
+ rid= 27;
+ }
Date date = new Date();
// codeType二维码类型1=订场 2=散客，3=门票,玩湃惠民卡codeType=4 234需要校验能否进场
@@ -84,16 +87,15 @@
return ResultUtil.error("该时间段已无空位");
}else{
// 远程调用 将门票设置为已使用
- userCouponClient.changeTicketStatus(dataId);
+ userCouponClient.changeTicketStatus(dataId,sid,rid);
return ResultUtil.success();
}
}
if (codeType==4){
- // 判断是否能入场 远程调用将门票设置为已使用
- LocalDate now = LocalDate.now();
+ // 判断是否能入场
Date date1 = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
- String day = simpleDateFormat.format(now);
+ String day = simpleDateFormat.format(date1);
List<QuerySiteTimes> querySiteTimes = siteService.querySiteTimes(rid, day, null, null, 2);
Integer flag =0;
for (QuerySiteTimes querySiteTime : querySiteTimes) {
@@ -112,4 +114,6 @@
return ResultUtil.success();
}
+
+
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index b0c335e..47aea72 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -227,8 +227,16 @@
System.err.println("启动游戏支付");
if (type == 1) {
+
tGameRecord.setMoney(config.getCash());
gameRecordService.updateById(tGameRecord);
+ if(config.getCash().compareTo(BigDecimal.ZERO)==0){
+ // 零元不获取支付
+ tGameRecord.setStatus(1);
+ gameRecordService.updateById(tGameRecord);
+ startGame(uid, gameType, gameId, spaceId, sutuId);
+ return ResultUtil.success();
+ }
String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType;
// ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付-"+isFenZhang, params, code, config.getCash().toString(),
// "/base/game/wechatPaymentGameCallback", "APP", "");
@@ -254,6 +262,13 @@
} else if (type == 2) {
tGameRecord.setMoney(config.getCash());
gameRecordService.updateById(tGameRecord);
+ if(config.getCash().compareTo(BigDecimal.ZERO)==0){
+ // 零元不获取支付
+ tGameRecord.setStatus(1);
+ gameRecordService.updateById(tGameRecord);
+ startGame(uid, gameType, gameId, spaceId, sutuId);
+ return ResultUtil.success();
+ }
String smid1="";
String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+ configId + "_" + gameType;
// 判断属于哪个运营商 根据运营商 id 获取对应的商户号
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java
index f2aa039..3be6554 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java
@@ -21,8 +21,8 @@
* @param id
* @return
*/
- @GetMapping("/userCoupon/changeTicketStatus/{id}")
- void changeTicketStatus(@PathVariable("id") String id);
+ @GetMapping("/userCoupon/changeTicketStatus/{id}/{storeId}/{siteId}")
+ void changeTicketStatus(@PathVariable("id") String id,@PathVariable("storeId") Integer storeId,@PathVariable("siteId") Integer siteId);
/**
* 根据id获取用户优惠券数据
*
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index 966f980..437d8c6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -104,6 +104,7 @@
querySiteList.setPageNum((querySiteList.getPageNum() - 1) * querySiteList.getPageSize());
DayOfWeek dayOfWeek = LocalDate.now().getDayOfWeek();
Map<Integer, List<TSitePrice>> priceMap = sitePriceService.lambdaQuery().eq(TSitePrice::getDayOfWeek, dayOfWeek.getValue())
+ .eq(querySiteList.getTargetAudience()!=null,TSitePrice::getTargetAudience, querySiteList.getTargetAudience())
.list()
.stream().collect(Collectors.groupingBy(TSitePrice::getSiteId));
List<QuerySiteListVo> querySiteListVos = this.baseMapper.querySiteList(querySiteList);
diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
index edffd36..c2a69a6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
@@ -54,8 +54,8 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
-// private String callbackPath = "https://online.daowepark.com:443/other";//支付回调网关地址
- private String callbackPath = "https://y6cgd7wo3ooa.guyubao.com/other";//支付回调网关地址
+ private String callbackPath = "https://online.daowepark.com:443/other";//支付回调网关地址
+// private String callbackPath = "https://y6cgd7wo3ooa.guyubao.com/other";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
@@ -63,8 +63,8 @@
private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
-// private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
- private String certPath = "E:\\apiclient_cert.p12";//微信证书
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
+// private String certPath = "E:\\apiclient_cert.p12";//微信证书
public ResultUtil confirm(String smid1,String code, String outTradeNo, String amount) throws AlipayApiException {
--
Gitblit v1.7.1