From 083bed1be51dc21792a245b035b50dfef0a24db3 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 19:07:18 +0800
Subject: [PATCH] update
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 2
cloud-server-management/src/main/java/com/dsh/course/util/ChineseMoneyUtils.java | 4 -
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 12 ++++
cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java | 5 +
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 4 -
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java | 4 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/BigDecimalToChineseAmountUtil.java | 5 -
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 23 +++++++
cloud-server-other/src/main/java/com/dsh/other/controller/TGameController.java | 6 --
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 3
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 30 ----------
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 5 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 1
cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/util/echo/NettyMsg.java | 37 ------------
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html | 1
16 files changed, 57 insertions(+), 87 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 3a1ec1d..39c9797 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
@@ -371,7 +371,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){
+ public synchronized ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index d3642d2..49341f6 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -556,6 +556,9 @@
return ResultUtil.error("验证码无效");
}
TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
+ if(tAppUser==null){
+ return ResultUtil.error("该账号未注册", "");
+ }
if(tAppUser.getState() == 2){
return ResultUtil.error("您的账号已被冻结", "");
}
@@ -1032,7 +1035,27 @@
if (ToolUtil.isEmpty(merchandise)){
return ResultUtil.error("商品不存在");
}
+
+
TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
+
+
+ if(merchandise.getUserPopulation()==2){
+ if(tAppUser.getIsVip()==0){
+ return ResultUtil.error("该商品只能年度会员购买");
+ }
+ }
+
+
+
+ if(merchandise.getUserPopulation()==3){
+ List<TStudent> students = tsmapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, userIdFormRedis));
+ if(students.size()==0){
+ return ResultUtil.error("该商品只能已有学员用户购买");
+ }
+ }
+
+
if (ToolUtil.isEmpty(tAppUser)){
return ResultUtil.error("用户不存在");
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
index b49a895..5d076e5 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -74,7 +74,7 @@
detail.setDetailsType(2);
break;
case 2:
- detail.setConsumeAmount("-"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("兑换商品");
detail.setDetailsType(1);
break;
@@ -119,6 +119,7 @@
userIntegralChanges.setOldIntegral(appUser.getIntegral());
userIntegralChanges.setType(vo.getType());
appUser.setIntegral(appUser.getIntegral() + vo.getIntegral());
+ tauMapper.updateById(appUser);
userIntegralChanges.setNewIntegral(appUser.getIntegral());
userIntegralChanges.setInsertTime(new Date());
userIntegralChanges.setCategory(1);
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 20ff43d..c959663 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
@@ -447,6 +447,16 @@
detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime()));
detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(merchandise.getType());
+ if(merchandise.getType()==3){
+ detailsResponse.setUserId(appUserId);
+ if(merchandise.getUseScope()==1){
+ detailsResponse.setSid(0);
+ }else if(merchandise.getUseScope()==2){
+
+ }else if(merchandise.getUseScope()==3){
+
+ }
+ }
responses.add(detailsResponse);
}
detailsVo.setDetailsResponses(responses);
@@ -712,6 +722,8 @@
vo.setSort(byId.getSort());
vo.setContent(byId.getRedemptionInstructions());
}
+ int count = userPointsMerchandiseService.count(new LambdaQueryWrapper<UserPointsMerchandise>().eq(UserPointsMerchandise::getPointsMerchandiseId, pointMercharsId));
+ vo.setNum(count);
return vo;
}
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 24e25a1..a2ac377 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
@@ -36,4 +36,9 @@
@ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
private Integer goodType;
+
+ private Integer userId;
+
+ private Integer sid;
+
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java
index e781c0e..c7ef156 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java
@@ -35,4 +35,6 @@
* 排序
*/
Integer sort;
+
+ private Integer num;
}
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 619ba42..d6c2200 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
@@ -1047,36 +1047,6 @@
return integers;
}
- public static void main(String[] args) {
- List<Integer> week = week("周一,周二");
- // 今天周几
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
-
- SimpleDateFormat format = new SimpleDateFormat("MM.dd");
-
- ArrayList<String> strings = new ArrayList<>();
- for (Integer integer : week) {
- if(integer<i){
- // 找下一周的时间
- Calendar instance = Calendar.getInstance();
- instance.add(Calendar.DATE,7-(i-integer));
- Date time = instance.getTime();
- strings.add(format.format(time));
-
- }else if(integer>i) {
- Calendar instance = Calendar.getInstance();
- instance.add(Calendar.DATE,integer-i);
- Date time = instance.getTime();
- strings.add(format.format(time));
- }else {
- Calendar instance = Calendar.getInstance();
- instance.add(Calendar.DATE,7);
- Date time = instance.getTime();
- strings.add(format.format(time));
- }
- }
- System.out.println(strings);
- }
@Override
@Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
public ResultUtil payCourse(PayCourseReq req,Integer userId){
diff --git a/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/util/echo/NettyMsg.java b/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/util/echo/NettyMsg.java
index 665fb61..fe0d62f 100644
--- a/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/util/echo/NettyMsg.java
+++ b/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/util/echo/NettyMsg.java
@@ -14,42 +14,7 @@
public class NettyMsg {
- public static void main(String[] args) {
- Map<String,Object> map = new HashMap<String, Object>();
- //用户信息
- map.put("imgUrl","1");
- map.put("nickName","1");
- map.put("licensePlate","1");
- map.put("phone",1);
- map.put("driverId",1);
- map.put("carColor","1");
- map.put("modelName","1");
- map.put("brandName","1");
- map.put("driverOrderNums",1);
- map.put("score",1);
-
-
- map.put("id",1);
- map.put("orderNum", "123456");
- map.put("startAddress", "测试");
- map.put("endAddress", "测试1");
- map.put("departureTime", 1533608196000L);
- map.put("type",1);
- map.put("mileage",1);
- map.put("mileageMoney",10);
- map.put("duration",10);
- map.put("durationMoney",10);
- map.put("nightMoney",1);
- map.put("serverMoney",1);
- map.put("nightMileage",10);
- map.put("longMileage",10);
- map.put("longDurationMoney",10);
- map.put("orderMoney",10);
- map.put("payMoney",10);
- map.put("couponsMoney",10);
- System.out.println(setMsg(Method.ping, new HashMap<String, Object>()));
- }
-
+
/**
* 返回一个正确数据
*
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java
index ab8d03b..0e2e4bd 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java
@@ -35,4 +35,8 @@
* 排序
*/
Integer sort;
+ /**
+ * 已换数量
+ */
+ private Integer num;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/util/ChineseMoneyUtils.java b/cloud-server-management/src/main/java/com/dsh/course/util/ChineseMoneyUtils.java
index 022557f..47a3f98 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/util/ChineseMoneyUtils.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/util/ChineseMoneyUtils.java
@@ -17,10 +17,6 @@
*/
final static private String[] CHINESE_MONEY_UNIT = { "圆", "角", "分" };
- public static void main(String[] args) {
- String chineseMoney = toChineseMoney(new BigDecimal("320"));
- System.out.println("chineseMoney = " + chineseMoney);
- }
/**
* @param sourceMoney 要转换的数值，最多支持到亿
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 4a72ddc..e5d375b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -571,6 +571,7 @@
public String tCityUpdate(@PathVariable Integer id, Model model) {
System.out.println("id:"+id);
PointMercharsVo pointMercharsVo = pointMercharsClient.queryPointMerchaseDetailOfId(id);
+
System.out.println("pointMercharsVo:"+pointMercharsVo);
String[] split = pointMercharsVo.getPics().split(",");
StringBuilder concatenatedString = new StringBuilder();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/BigDecimalToChineseAmountUtil.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/BigDecimalToChineseAmountUtil.java
index 1b267de..13479f6 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/BigDecimalToChineseAmountUtil.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/BigDecimalToChineseAmountUtil.java
@@ -72,9 +72,4 @@
return builder.toString();
}
- public static void main(String[] args) {
- BigDecimal number = new BigDecimal("12345.67");
- String chineseAmount = convertToChineseAmount(number);
- System.out.println(chineseAmount); // Output: 壹万贰仟叁佰肆拾伍元陆角柒分
- }
}
\ No newline at end of file
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 515ff7f..9ada062 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
@@ -44,6 +44,7 @@
<div class="form-horizontal" id="carInfoForm">
<div id="b1">
<input id="goodsId" value="${id}" hidden="hidden">
+ <input id="nums" value="${item.num}" hidden="hidden">
<#input id="name" name="商品名称" type="text" value="${item.name}" readonly="true" />
<#avatar id="cover" name="商品封面:" avatarImg="${item.cover}" />
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 fa5f676..0243903 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
@@ -851,6 +851,11 @@
if (quantityIssued <= quantityHas){
return Feng.error('发放数量小于已领数量!');
}
+ let nums = $("#nums").val();
+ if (quantityIssued <= nums){
+ return Feng.error('发放数量小于已领数量!');
+ }
+
if (editor === undefined || editor === null || editor === ''){
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 47e791e..147ab20 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
@@ -260,8 +260,4 @@
}
- public static void main(String[] args) {
- Integer integer = startGame(1, 13, 1001, 1001);
- System.out.println(integer);
- }
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/TGameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/TGameController.java
index 1fba71a..502e3f9 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/TGameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/TGameController.java
@@ -59,10 +59,4 @@
}
}
- public static void main(String[] args) {
- HttpRequest httpRequest = HttpRequest.get("https://try.daowepark.com/v7/user_api/general/space_list?page=1&page_num=100");
- HttpResponse execute = httpRequest.execute();
- String body = execute.body();
- System.out.println(body);
- }
}
--
Gitblit v1.7.1