From 1a3801b7316b0a23b6d3924eb4fbb023b1edef83 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 07 十一月 2023 10:30:14 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 4 +
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 29 ++++++++------
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 15 +++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 12 +++---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 4 ++
cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml | 10 ++++-
cloud-server-management/src/main/resources/mapper/TEvaluationMapper.xml | 4 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java | 9 +++-
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js | 4 -
cloud-server-management/src/main/webapp/static/modular/system/tCouponExamine/TCouponExamine.js | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 10 ++++
cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml | 1
12 files changed, 74 insertions(+), 30 deletions(-)
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 cbdcf9a..7b459a7 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
@@ -627,6 +627,21 @@
}
boolean save = couponService.save(coupon);
+ // 自动发券
+ if (dataVo.getDistributionMethod() == 3){
+ // 判断用户人群 再判断限领数量
+ switch (dataVo.getUserGroup()){
+ case 1:
+
+ break;
+ case 2:
+
+ break;
+ case 3:
+
+ break;
+ }
+ }
if (save){
if (dataVo.getCompany() == 3){
String[] split = dataVo.getStoreIds().split(",");
diff --git a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
index e58d540..8754c60 100644
--- a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
@@ -107,6 +107,7 @@
<if test="query.state != null">
and `state` = #{query.state}
</if>
+ AND endTime >= NOW()
and `type` = 3
order by sort desc
</select>
diff --git a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
index 4483e47..3ea04a5 100644
--- a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
@@ -13,7 +13,8 @@
aa.introduction,
aa.registerEndTime,
aa.age,
- (aa.baseNumber+aa.userCompetitionCount) as heat
+ (aa.baseNumber+aa.userCompetitionCount) as heat,
+ aa.status
from (
SELECT
a.id,
@@ -25,7 +26,12 @@
DATE_FORMAT(a.registerEndTime, '%Y-%m-%d %H:%i') AS registerEndTime,
CONCAT(a.startAge, '-', a.endAge) AS age,
a.baseNumber,
- COUNT(uc.competitionId) AS userCompetitionCount
+ COUNT(uc.competitionId) AS userCompetitionCount,
+ CASE
+ WHEN NOW() < a.startTime THEN 1 -- 未开始
+ WHEN now() between a.startTime and a.endTime THEN 2 -- 进行中
+ ELSE 3 -- 已结束
+ END AS status
FROM
t_competition a
LEFT JOIN
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index af1f839..ad3be09 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -508,19 +508,19 @@
*/
@ResponseBody
@RequestMapping(value = "/updateOperator")
- public ResultUtil updateOperator(Integer id,String name,String userName,String phone,Integer type ,@RequestParam String comArr) {
+ public ResultUtil updateOperator(Integer id,String name,String userName
+ ,String phone,Integer type ,@RequestParam String comArr) {
User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
if (one!=null){
return ResultUtil.error("当前管理员名称和电话已存在!");
}
operatorCityService.remove(new QueryWrapper<TOperatorCity>().eq("operatorId",id));
- User user = new User();
+ User user = userService.getOne(new QueryWrapper<User>().eq("objectId", id).
+ eq("objectType", 2));
user.setName(userName);
+ user.setAccount(phone);
user.setPhone(phone);
- user.setObjectType(2);
- String a123456 = SecureUtil.md5("a123456");
- user.setPassword(a123456);
- userService.save(user);
+ userService.updateById(user);
TOperator data = new TOperator();
data.setId(id);
data.setUserId(user.getId());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index 4a3ec65..fe5bfdf 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -280,6 +280,10 @@
@RequestMapping("/addAppUserStudent")
@ResponseBody
public Object addAppUser(@RequestBody TStudent student){
+ Double height = student.getHeight();
+ Double weight = student.getWeight();
+ double v = weight / (height * height);
+ student.setBmi(v);
return studentClient.addStudent(student);
}
/**
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 2a18760..78850fe 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -713,7 +713,9 @@
@ResponseBody
public Object getChangeOne(Integer oneId) {
try {
- return storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId,oneId).eq(TStore::getState,1));
+ return storeService.list(new QueryWrapper<TStore>()
+ .eq("operatorId",oneId)
+ .eq("state",1));
}catch (Exception e){
e.printStackTrace();
return ERROR;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 3505c13..e09a22b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -183,6 +183,13 @@
@ResponseBody
public ResultUtil confirm(@PathVariable("id") Integer id) {
+ SiteBooking byId = iSiteBookingService.getById(id);
+ String money = byId.getMoney();
+ // todo 这里手动支付 默认按照现金当作支付金额 后续可能要问下产品
+ String[] split = money.split(",");
+ BigDecimal bigDecimal = new BigDecimal(split[0]);
+
+
System.out.println("============"+id);
SiteBooking siteBooking = new SiteBooking();
siteBooking.setId(id);
@@ -1201,7 +1208,8 @@
tAppUser.setInsertTime(new Date());
tAppUser.setPassword(MD5.md5("111111"));
appUserClient.addAppUser1(tAppUser);
- siteBooking.setAppUserId(tAppUser.getId());
+ TAppUser appUserByPhone1 = appUserClient.getAppUserByPhone(phone);
+ siteBooking.setAppUserId(appUserByPhone1.getId());
}else{
siteBooking.setAppUserId(appUserByPhone.getId());
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java
index 1eeeed6..b103c04 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluationServiceImpl.java
@@ -34,16 +34,21 @@
return new ArrayList<>();
}
- List<TEvaluationListVo> tEvaluationListVos = this.baseMapper.listAll(page, provinceCode, cityCode, name, phone, shopName,operatorId);
+ ArrayList<TEvaluationListVo> res = new ArrayList<>();
+
+ List<TEvaluationListVo> tEvaluationListVos = this.baseMapper.listAll(page, provinceCode, cityCode,
+ shopName, phone, shopName,operatorId);
for (TEvaluationListVo tEvaluationListVo : tEvaluationListVos) {
for (TAppUser tAppUser : list) {
if(tEvaluationListVo.getAppUserId().equals(tAppUser.getId())){
tEvaluationListVo.setName(tAppUser.getName());
tEvaluationListVo.setPhone(tAppUser.getPhone());
+ res.add(tEvaluationListVo);
+ break;
}
}
}
- return tEvaluationListVos;
+ return res;
}
@Override
diff --git a/cloud-server-management/src/main/resources/mapper/TEvaluationMapper.xml b/cloud-server-management/src/main/resources/mapper/TEvaluationMapper.xml
index 6fafc71..d989c61 100644
--- a/cloud-server-management/src/main/resources/mapper/TEvaluationMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TEvaluationMapper.xml
@@ -3,7 +3,9 @@
<mapper namespace="com.dsh.course.mapper.EvaluationMapper">
<select id="listAll" resultType="com.dsh.guns.modular.system.model.TEvaluationListVo">
- select t1.id,t1.appUserId,t1.score,t1.insertTime time,t2.name shopName,t2.province pName,t2.city cName from t_store_evaluation t1 left join t_store t2 on t1.storeId =t2.id
+ select t1.id,t1.appUserId,t1.score,t1.insertTime time,
+ t2.name shopName,t2.province pName,t2.city cName
+ from t_store_evaluation t1 left join t_store t2 on t1.storeId =t2.id
where t1.state !=3
<if test="provinceCode!=null and provinceCode !=''">
and t2.provinceCode =#{provinceCode}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
index 4e6252d..abd3a9f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
@@ -39,9 +39,7 @@
else {
if (row.payType === 4){
- var moneyValues = value.split(',');
- var moneyText = moneyValues[0] + '元/' + moneyValues[1] + '玩湃币';
- return moneyText;
+ return row.payMoney+'元'
}else if (row.payType === 3){
return row.payMoney+'玩湃币' }else {
return row.payMoney+'元'
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCouponExamine/TCouponExamine.js b/cloud-server-management/src/main/webapp/static/modular/system/tCouponExamine/TCouponExamine.js
index a988cde..a64cccd 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCouponExamine/TCouponExamine.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCouponExamine/TCouponExamine.js
@@ -37,7 +37,7 @@
{title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle'},
{title: '审核状态', field: 'auditStatus', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row, index) {
- return {1: "上架", 2: "下架"}[value]
+ return {1: "待审核", 3: "未通过"}[value]
}}
];
};
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index e4172b0..5251cd8 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -171,26 +171,29 @@
};
TSite.oneChangeYys = function(e){
- var oneId= $("input[name='pt']:checked").val()
+ var oneId;
- console.log("===========oneId=========="+oneId)
- var SelectValue="";
- var getSelectValueMenbers = $("input[name='pt']:checked").each(function(j) {
- if (j >= 0) {
- SelectValue += $(this).val()
- }
- });
- if(SelectValue=='0' ){
- oneId=0
+ var checkbox = document.querySelector('input[name="pt"]');
+ if (checkbox.checked) {
+ oneId=0;
+ console.log("选中是平台");
+ } else {
+ oneId = $("#yys").val();
+ console.log("运营商");
}
var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
if(data!=null){
// var content1 = '<option value="0">平台</option>';
- if (typeof(oneId) != "undefined") {
+ if (oneId == 0) {
+ console.log("锁住")
$("#yys").prop('disabled', true);
+ }else{
+ console.log("放开")
+ $("#yys").prop('disabled', false);
}
-
+ console.log("看看返回数据")
+ console.log(data)
var content='<option value="">选择门店</option>';
$.each(data, function(k,v) {
content += "<option value='"+v.id+"'>"+v.name+"</option>";
@@ -201,7 +204,7 @@
if (typeof(oneId) == "undefined"){
console.log("===============")
-
+ oneId = $("#yys").val()
var button = document.getElementById("yys");
button.removeAttribute("disabled");
--
Gitblit v1.7.1