From ecc4e57b4f7c6ecfd6823704688ee786b3350b1f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 02 十二月 2024 11:06:13 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 3 -
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 12 ++++--
cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 4 +-
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 3 +
cloud-server-management/src/main/webapp/WEB-INF/view/password.html | 11 ++++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 3 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html | 3 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html | 2
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 2
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 4 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 10 ++++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java | 9 +++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 10 ++++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 2
17 files changed, 56 insertions(+), 27 deletions(-)
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 0e39c85..02c7717 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
@@ -1523,7 +1523,7 @@
if(null != merchandise.getIntegral()){
pointsMerchandise.setIntegral(merchandise.getIntegral() * goodsNums);
}
- if(exchangeType.getExchangeType() == 2){
+ if(exchangeType.getExchangeType() == 2 || exchangeType.getExchangeType() == 3){
pointsMerchandise.setCash(merchandise.getCash());
pointsMerchandise.setCashPayType(exchangeType.getPayType());
}
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 39b6df5..606f194 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
@@ -807,8 +807,7 @@
@PostMapping("/base/coupon/listRecord")
@ResponseBody
public List<Map<String, Object>> listRecord(@RequestBody CouponRecordQuery ofSearch) {
- Page<Object> objectPage = new Page<>(ofSearch.getOffset(), ofSearch.getLimit());
- return couponService.listRecord(objectPage, ofSearch.getId(), ofSearch.getIds(), ofSearch.getType());
+ return couponService.listRecord(ofSearch.getId(), ofSearch.getIds(), ofSearch.getType());
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
index d84efa5..581d869 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
@@ -53,7 +53,7 @@
@Param("page") Page<Map<String, Object>> page);
- List<Map<String, Object>> listRecord(@Param("objectPage") Page<Object> objectPage, @Param("id") Integer id, @Param("ids") List<Integer> ids, @Param("type") Integer type);
+ List<Map<String, Object>> listRecord(@Param("id") Integer id, @Param("ids") List<Integer> ids, @Param("type") Integer type);
void updateType(@Param("id") Long id);
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
index f5274a1..d363e3f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
@@ -37,7 +37,7 @@
List<Map<String, Object>> queryCouponExamineList(CouponExamineListSearch ofSearch);
- List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type);
+ List<Map<String, Object>> listRecord(Integer id, List<Integer> ids, Integer type);
void updateType(Long id);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index a8cb69a..24c8dc4 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -141,8 +141,8 @@
}
@Override
- public List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type) {
- return this.baseMapper.listRecord(objectPage, id, ids, type);
+ public List<Map<String, Object>> listRecord(Integer id, List<Integer> ids, Integer type) {
+ return this.baseMapper.listRecord(id, ids, type);
}
@Override
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index 271976a..301d0d0 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -459,10 +459,12 @@
public List<String> queryPackageById(@RequestBody Integer coursePackageId) {
ArrayList<String> strings = new ArrayList<>();
TCoursePackage byId = coursePackageService.getById(coursePackageId);
+ if(null == byId){
+ return null;
+ }
Integer coursePackageTypeId = byId.getCoursePackageTypeId();
strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName());
strings.add(byId.getName());
-
return strings;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index d18b5ab..d2cef33 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -2431,7 +2431,8 @@
// 找出门店的所有课程 排出体验
List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>()
.eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3)
- .eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week));
+ .eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week)
+ .eq(TCoursePackage::getAuditStatus, 2));
List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
if (collect.size() == 0) {
collect.add(-1);
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 2404704..fca703b 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
@@ -1342,7 +1342,7 @@
public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws Exception {
CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
.eq("code", code).eq("state", 1));
- if (coursePackageOrder1.getPayStatus() == 2) {
+ if (null == coursePackageOrder1 || coursePackageOrder1.getPayStatus() == 2) {
return ResultUtil.success();
}
coursePackageOrder1.setPayStatus(2);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 138b203..c468218 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -325,15 +325,12 @@
@RequestMapping(value = "/listRecord")
@ResponseBody
public Object listRecord(Integer id,String name, Integer type, String phone) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<TAppUser> tAppUsers = appUserClient.queryByNamePhone(new QueryByNamePhone(name, phone));
if(tAppUsers.size()==0){
return new ArrayList<>();
}
CouponRecordQuery ofSearch = new CouponRecordQuery();
ofSearch.setId(id);
- ofSearch.setLimit(page.getSize());
- ofSearch.setOffset(page.getCurrent());
ofSearch.setIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
ofSearch.setType(type);
List<Map<String, Object>> maps = client.listRecord(ofSearch);
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 410d9cc..cb753c5 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
@@ -145,10 +145,16 @@
model.addAttribute("shopName",byId.getName());
Integer coursePackageId = pointMercharsVo.getCoursePackageId();
List<String> name = courseClient.queryPackageById(coursePackageId);
+ if(null != name){
+ model.addAttribute("typeName",name.get(0));
+ model.addAttribute("pageName",name.get(1));
+ }else{
+ model.addAttribute("typeName", "");
+ model.addAttribute("pageName", "");
+ }
Integer coursePackageId1 = pointMercharsVo.getCoursePackageId();
List<CoursePackagePaymentConfig> hoursByPackageId = courseClient.getHoursByPackageId(coursePackageId1);
- model.addAttribute("typeName",name.get(0));
- model.addAttribute("pageName",name.get(1));
+
model.addAttribute("classHours",hoursByPackageId);
String productImages = pointMercharsVo.getProductImages();
ArrayList<String> strings = new ArrayList<>();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
index b2ed1d4..effa3e3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
@@ -176,6 +176,7 @@
courseByCourseId.setIntegral(benefitsVideos.getIntegral());
courseByCourseId.setBenefitsVideosId(benefitsVideos.getId());
courseByCourseId.setState(benefitsVideos.getState());
+ courseByCourseId.setInsertTime(benefitsVideos.getInsertTime());
}
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java
index 2110f79..a2efca3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java
@@ -1,5 +1,6 @@
package com.dsh.guns.modular.system.controller.system;
+import com.dsh.course.util.RedisUtil;
import com.dsh.guns.config.properties.GunsProperties;
import com.dsh.guns.core.util.FileUtil;
import com.google.code.kaptcha.Constants;
@@ -34,6 +35,9 @@
@Autowired
private Producer producer;
+ @Autowired
+ private RedisUtil redisUtil;
+
/**
* 生成验证码
*/
@@ -57,10 +61,11 @@
// create the text for the image
String capText = producer.createText();
-
+ String cookie = request.getHeader("cookie");
+ System.err.println("cookie：" + cookie);
+ redisUtil.setStrValue(cookie, capText, 300);
// store the text in the session
session.setAttribute(Constants.KAPTCHA_SESSION_KEY, capText);
-
// create the image with the text
BufferedImage bi = producer.createImage(capText);
ServletOutputStream out = null;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
index 3fcec3f..4471cd3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
@@ -38,6 +38,7 @@
import javax.annotation.Resource;
import javax.jws.soap.SOAPBinding;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.awt.image.BufferedImage;
import java.util.*;
@@ -301,6 +302,14 @@
if (password.equals("38B8/EBdihRzcFNtJYSH+g==")){
return "/password.html";
}
+
+ //验证验证码是否正确
+ String kaptcha = super.getPara("kaptcha").trim();
+ String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
+ if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
+ throw new InvalidKaptchaException();
+ }
+
User user = userService.getByAccount(username);
password = AESUtils.decrypt(password);
String s = MD5.md5(password);
@@ -315,7 +324,6 @@
model.addAttribute("tips", "该账号不存在");
return "/login.html";
}
-
GetTokenRequest tokenRequest = new GetTokenRequest();
tokenRequest.setUsername(username);
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 6272ff1..619eaba 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
@@ -126,9 +126,11 @@
}
assertAuth(userId);
User user = this.userService.getById(userId);
+ Role role = roleService.getById(user.getId());
+ Dept dept = deptService.getById(user.getDeptid());
model.addAttribute(user);
- model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
- model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid()));
+ model.addAttribute("roleName", role.getName());
+ model.addAttribute("deptName", dept.getFullname());
LogObjectHolder.me().set(user);
LambdaQueryWrapper<Role> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(UserExt.getUser().getObjectType()!=1){
@@ -155,9 +157,11 @@
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
User user = this.userService.getById(userId);
+ Role role = roleService.getById(user.getId());
+ Dept dept = deptService.getById(user.getDeptid());
model.addAttribute(user);
- model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
- model.addAttribute("deptName", user.getDeptid()==0?"顶级":ConstantFactory.me().getDeptName(user.getDeptid()));
+ model.addAttribute("roleName", role.getName());
+ model.addAttribute("deptName", user.getDeptid()==0?"顶级":dept.getFullname());
LogObjectHolder.me().set(user);
return PREFIX + "user_view.html";
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/password.html b/cloud-server-management/src/main/webapp/WEB-INF/view/password.html
index 6c554ec..28ef077 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/password.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/password.html
@@ -80,7 +80,7 @@
</div>
<button onclick="update()" class="btn full-width m-b" style="background-color: #0573EA;color: white;">保存</button>
- <button class="btn full-width m-b" style="background-color: #0573EA;color: white;">关闭</button>
+ <button class="btn full-width m-b" style="background-color: #0573EA;color: white;" onclick="getBack()">关闭</button>
<button type="submit" id="submit" style="display: none;"></button>
</p>
</form>
@@ -103,8 +103,8 @@
function sendSMSCode() {
var phone = $("#username").val()
var ajax = new $ax(Feng.ctxPath + "/getSMSCode", function(data){
- if(data!=null){
-
+ if(data!=null && data.code != 200){
+ alert(data.msg);
}
});
ajax.set("phone",phone);
@@ -160,6 +160,11 @@
});
}
+
+ function getBack() {
+ history.go(-1);
+ }
+
window.addEventListener(
"mousewheel",
function(event) {
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 045de00..3c96ae1 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
@@ -63,7 +63,7 @@
<div class="col-sm-9">
<input type="radio" name="redemptionMethod" value="1" onclick="updateMethod(3)" checked> 积分
<input type="radio" name="redemptionMethod" value="2" onclick="updateMethod(4)"> 现金+积分
- <input type="radio" name="redemptionMethod" value="3" onclick="updateMethod(5)"> 现金
+ <!--<input type="radio" name="redemptionMethod" value="3" onclick="updateMethod(5)"> 现金-->
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html
index 45d82c6..20b3b9e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html
@@ -25,7 +25,8 @@
<option value="2">女</option>
</#select>
- <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
+ <input type="hidden" id="roleid" value="${user.roleid}">
+ <#input id="roleName" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
<#input id="email" name="邮箱" type="email" value="${user.email}"/>
</div>
--
Gitblit v1.7.1