From cc30fb569674fa8f82130253b68ac609ae5d8eb6 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 11:46:52 +0800
Subject: [PATCH] 10.27
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html | 4
cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java | 8
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 16 ++
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html | 16 ++
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 13 ++
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 57 ++++++++
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 13 +
cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 11 +
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/TStudent.java | 114 +++++++++++++++++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html | 15 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 3
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 27 +++-
cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java | 6
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java | 8 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java | 12 +-
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js | 4
cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java | 2
19 files changed, 287 insertions(+), 46 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 f49d537..e4d115e 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
@@ -269,6 +269,22 @@
@PostMapping("/base/coupon/queryCouponListSearch1")
public List<Map<String,Object>> getCouponListOfSearch1(@RequestBody CouponListOfSearch ofSearch){
List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch1(ofSearch);
+
+ Date currentDate = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String currentDateStr = sdf.format(currentDate);
+
+ // Iterate over the mapList and remove entries where endTime is less than the current date
+ Iterator<Map<String, Object>> iterator = mapList.iterator();
+ while (iterator.hasNext()) {
+ Map<String, Object> map = iterator.next();
+ String endTime = (String) map.get("endTime");
+ if (endTime.compareTo(currentDateStr) < 0) {
+ iterator.remove();
+ }
+ }
+
+
if (mapList.size() > 0){
for (Map<String, Object> stringObjectMap : mapList) {
Integer o = (Integer) stringObjectMap.get("id");
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
index e877de1..84ceda0 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
@@ -69,19 +69,19 @@
* 开始时间
*/
@TableField("startTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 结束时间
*/
@TableField("endTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date endTime;
/**
* 报名结束时间
*/
@TableField("registerEndTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date registerEndTime;
/**
* 报名条件（1=全部用户，2=仅限年度会员参与，3=仅限学员参与）
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java
index 9649557..5052d4a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java
@@ -1,8 +1,12 @@
package com.dsh.competition.feignclient.account;
import com.dsh.competition.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.account.model.TStudent;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -19,4 +23,8 @@
*/
@PostMapping("/student/queryStudentByPhone")
Student queryStudentByPhone(String phone);
+
+
+ @PostMapping("/student/queryStudentList")
+ List<TStudent> queryStudentList(@RequestBody Integer appUserId);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/TStudent.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/TStudent.java
new file mode 100644
index 0000000..4d298c7
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/TStudent.java
@@ -0,0 +1,114 @@
+package com.dsh.competition.feignclient.account.model;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 学员信息
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_student")
+public class TStudent{
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ @TableField("appUserId")
+ private Integer appUserId;
+ /**
+ * 学员姓名
+ */
+ @TableField("name")
+ private String name;
+ /**
+ * 学员电话
+ */
+ @TableField("phone")
+ private String phone;
+ /**
+ * 生日
+ */
+ @TableField("birthday")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+ /**
+ * 性别（1=男，2=女）
+ */
+ @TableField("sex")
+ private Integer sex;
+ /**
+ * 身高
+ */
+ @TableField("height")
+ private Double height;
+ /**
+ * 体重
+ */
+ @TableField("weight")
+ private Double weight;
+ /**
+ * bmi健康值
+ */
+ @TableField("bmi")
+ private Double bmi;
+ /**
+ * 身份证号
+ */
+ @TableField("idCard")
+ private String idCard;
+ /**
+ * 体侧表
+ */
+ @TableField("lateralSurface")
+ private String lateralSurface;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
+ /**
+ * 头像
+ */
+ @TableField("headImg")
+ private String headImg;
+ /**
+ * 是否默认 1默认 2不是默认
+ */
+ @TableField("isDefault")
+ private Integer isDefault;
+
+
+ private String image1;
+
+ private String image2;
+ private String image3;
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java
index 69ca744..8cad9e5 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java
@@ -31,4 +31,6 @@
private Integer gender;
@ApiModelProperty("剩余课时")
private Integer residueClassHour;
+ @ApiModelProperty("是否为学员")
+ private Integer isStudent;
}
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 385c6c4..16c106f 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
@@ -125,7 +125,18 @@
HashMap<String, Object> map = new HashMap<>();
Store store = storeClient.queryStoreById(Integer.valueOf(s));
map.put("name",store.getName());
- map.put("address",store.getAddress());
+
+
+ String str = store.getAddress();
+ str = str.substring(str.indexOf("省") + 1);
+
+ // 去掉第一个“市”及之前的字符串
+ str = str.substring(str.indexOf("市") + 1);
+
+ // 去掉第一个“区”及之前的字符串
+ str = str.substring(str.indexOf("区") + 1);
+
+ map.put("address",str);
map.put("storeLon",store.getLon());
map.put("storeLat",store.getLat());
map.put("storeCoverDrawing",store.getCoverDrawing());
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index f90ee7a..705a65c 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -7,6 +7,7 @@
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
import com.dsh.competition.feignclient.model.CompetitionUser;
import com.dsh.competition.mapper.ParticipantMapper;
@@ -23,9 +24,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* @author zhibing.pu
@@ -80,6 +79,9 @@
}
+
+
+
/**
* 获取参赛人员列表
* @param uid
@@ -88,9 +90,39 @@
*/
@Override
public List<ParticipantVo> queryParticipantList(Integer uid) throws Exception {
+ //拿到学员列表
+ List<TStudent> tStudents = studentClient.queryStudentList(uid);
+ //利用HashMap去重身份证
+ LinkedHashMap<String,ParticipantVo> linkedHashMap =new LinkedHashMap<>();
+ SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
+ for (TStudent tStudent : tStudents) {
+ ParticipantVo participantVo = new ParticipantVo();
+ participantVo.setId(tStudent.getId());
+ participantVo.setName(tStudent.getName());
+ participantVo.setIdcard(tStudent.getIdCard());
+ Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
+ participantVo.setAge(age);
+ Integer integer = coursePackagePaymentClient.queryResidueClassHour(tStudent.getId());
+ participantVo.setResidueClassHour(integer);
+ participantVo.setPhone(tStudent.getPhone());
+ participantVo.setHeight(tStudent.getHeight().intValue());
+ participantVo.setWeight(tStudent.getWeight());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if(null != tStudent.getBirthday()){
+ String format = sdf.format(tStudent.getBirthday());
+ participantVo.setBirthday(format);
+ }
+ participantVo.setGender(tStudent.getSex());
+ participantVo.setIsStudent(1);
+ linkedHashMap.put(tStudent.getIdCard(),participantVo);
+ }
+
+
+
+
+ //查出临时表里的数据，也去重
List<Participant> list = this.list(new QueryWrapper<Participant>().eq("appUserId", uid).eq("state", 1));
List<ParticipantVo> listVo = new ArrayList<>();
- SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
for (Participant participant : list) {
ParticipantVo participantVo = new ParticipantVo();
participantVo.setId(participant.getId());
@@ -99,9 +131,15 @@
Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
participantVo.setAge(age);
Student student = studentClient.queryStudentByPhone(participant.getPhone()==null?"0":participant.getPhone());
+
+ //设为不是学员
+ participantVo.setIsStudent(0);
+
if(null != student){
Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
participantVo.setResidueClassHour(integer);
+ participantVo.setIsStudent(1);
+
}else{
participantVo.setResidueClassHour(0);
}
@@ -114,9 +152,18 @@
participantVo.setBirthday(format);
}
participantVo.setGender(participant.getGender());
+
+ linkedHashMap.put(participant.getIdcard(),participantVo);
listVo.add(participantVo);
}
- return listVo;
+
+
+
+
+ List<ParticipantVo> listVo1 = new ArrayList<>(linkedHashMap.values());
+
+
+ return listVo1;
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
index 785d7c1..4386ba0 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
@@ -132,7 +132,7 @@
//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
- model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
+ model.setSubject("报名赛事");//商品的标题/交易标题/订单标题/订单关键字等。
model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
model.setTimeoutExpress("30m");
model.setTotalAmount(amount);//付款金额
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index 4b1bc79..da4b78a 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -148,7 +148,7 @@
FROM t_course_package_payment py
LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
GROUP BY studentId
- ORDER BY studentId, totalClassHours
+ ORDER BY studentId, length(name) desc ,totalClassHours
) subquery
) a
<where>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java
index 39c09f4..a17bd7c 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java
@@ -70,22 +70,22 @@
* 开始时间
*/
@TableField("startTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date startTime;
/**
* 结束时间
*/
@TableField("endTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date endTime;
/**
* 报名结束时间
*/
@TableField("registerEndTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date registerEndTime;
/**
* 报名条件（1=全部用户，2=仅限年度会员参与，3=仅限学员参与）
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 520b575..831f6d0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -96,7 +96,7 @@
model.addAttribute("objectType",objectType);
Competition competition = competitionClient.queryById(id);
System.out.println("======competition======"+competition);
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String startTime = formatter.format(competition.getStartTime());
model.addAttribute("startTime",startTime);
String endTime = formatter.format(competition.getEndTime());
@@ -106,7 +106,16 @@
+
model.addAttribute("item",competition);
+ String[] split = competition.getStoreId().split(",");
+ List<Integer> integers = new ArrayList<>();
+ for (String s : split) {
+ integers.add(Integer.valueOf(s));
+ }
+
+ model.addAttribute("storeIds",integers);
+
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index cb9f256..9bb8475 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -190,6 +190,9 @@
model.addAttribute("item", tCoursePackage);
model.addAttribute("type", tCoursePackage.getType());
+ Integer objectType = UserExt.getUser().getObjectType();
+ model.addAttribute("objectType",objectType);
+
String classStartTime = tCoursePackage.getClassStartTime();
String classEndTime = tCoursePackage.getClassEndTime();
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
index 257d9f2..7a7fc56 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
@@ -271,8 +271,8 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">*课时有效期：</label>
- <div class="col-sm-4">
+ <label class="col-sm-3 control-label" ${type == 2||type == 3 ? 'hidden=hidden' : ''}>*课时有效期：</label>
+ <div class="col-sm-4" ${type == 2||type == 3 ? 'hidden=hidden' : ''}>
购买后 <input id="validDays" name="validDays" type="number" value="${item.validDays}" min="0" placeholder="天数" style="width: 80px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 天内有效
</div>
</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 55f555e..9a840b2 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,11 +232,13 @@
laydate.render({
elem: '#startTime'
- ,type:"datetime"
+ ,type:"datetime",
+ format: "yyyy-MM-dd HH:mm"
});
laydate.render({
elem: '#endTime'
- ,type:"datetime"
+ ,type:"datetime",
+ format: "yyyy-MM-dd HH:mm"
});
@@ -280,16 +282,19 @@
laydate.render({
elem: '#endTime'
- ,type:"date"
+ ,type:"date",
+ format: "yyyy-MM-dd HH:mm"
});
laydate.render({
elem: '#startTime'
- ,type:"date"
+ ,type:"date",
+ format: "yyyy-MM-dd HH:mm"
});
laydate.render({
elem: '#registerEndTime'
- ,type:"datetime"
+ ,type:"datetime",
+ format: "yyyy-MM-dd HH:mm"
});
laydate.render({
elem: '#transDateStart'
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
index 2819bb5..c55380a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
@@ -86,6 +86,7 @@
<option value="${obj.id}" ${obj.id == item.storeId ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
+ <input id="storeIds" type="hidden" value="${storeIds}">
</div>
</div>
<#input id="name" name="赛事名称" type="text" value="${item.name}"/>
@@ -225,6 +226,13 @@
multiple: true,
closeOnSelect: false
});
+
+ console.log("===========storeIds="+$('#storeIds').val())
+ var selectedValues = JSON.parse($('#storeIds').val()); // Replace with the desired selected values
+
+ $('#shopId').val(selectedValues); // Set the selected values
+
+ $('#shopId').trigger('change')
});
let id = "${item.imgs}"
@@ -327,15 +335,17 @@
laydate.render({
elem: '#startTime'
,type:"datetime"
- ,format: 'yyyy-MM-dd HH:mm:ss'
+ ,format: 'yyyy-MM-dd HH:mm'
});
laydate.render({
elem: '#endTime'
- ,type:"datetime"
+ ,type:"datetime",
+ format: "yyyy-MM-dd HH:mm"
});
laydate.render({
elem: '#registerEndTime'
- ,type:"datetime"
+ ,type:"datetime",
+ format: "yyyy-MM-dd HH:mm"
});
laydate.render({
elem: '#transDateStart'
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
index 48f86db..8719ef5 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
@@ -152,12 +152,12 @@
if (this.check()) {
var nickname = TCompetition.seItem.carLicensePlate;
if (nickname == "" || nickname == null || nickname == undefined){
- nickname = "该车辆";
+ nickname = "该赛事";
}else{
nickname = "【"+nickname+"】";
}
swal({
- title: language==1?"您是否确认删除" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"),
+ title: language==1?"您是否确认取消" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"),
text: language==1?"请谨慎操作！":(language==2?' Please operate with caution!':'Harap beroperasi dengan hati -hati!'),
type: "warning",
showCancelButton: true,
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 5f5e79b..b7b81ff 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
@@ -2,6 +2,7 @@
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.TGame;
@@ -199,17 +200,19 @@
if(one.getStatus() == 1){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && one.getStatus() == 0){
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+ if(resultUtil.getCode().equals("10000") && one.getStatus() == 0){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
+// Map<String, String> data1 = resultUtil.getData();
+// String s = data1.get("tradeStatus");
+// String tradeNo = data1.get("tradeNo");
+ String tradeNo = resultUtil.getTradeNo();
+ String s = resultUtil.getTradeStatus();
if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
break;
}
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 041bb6b..b0a16b3 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -348,16 +349,21 @@
Double payMoney = 0D;
if(reservationSite.getPayType() == 3){
if(reservationSite.getIsHalf()==2){
- payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() ;
}else {
- payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() /2;
}
if(appUser.getPlayPaiCoins().compareTo(payMoney.intValue()) < 0){
return new ResultUtil(3,"玩湃币不足");
}
}else{
- payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ if(reservationSite.getIsHalf()==2){
+ payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() ;
+ }else {
+ payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() / 2;
+
+ }
}
//校验优惠券
@@ -427,6 +433,9 @@
siteBooking.setIsHalf(reservationSite.getIsHalf());
siteBooking.setHalfName(reservationSite.getHalfName());
siteBookingService.save(siteBooking);
+
+
+
if(reservationSite.getPayType() == 1){//微信支付
ResultUtil resultUtil = weChatPaymentSite(payMoney, siteBooking);
@@ -536,17 +545,18 @@
if(siteBooking.getStatus() != 0){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && siteBooking.getStatus() == 0){
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+ if(resultUtil.getCode().equals("10000") && siteBooking.getStatus() == 0){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
+// Map<String, String> data1 = resultUtil.getData();
+// String s = data1.get("tradeStatus");
+ String tradeNo = resultUtil.getTradeNo();
+ String s = resultUtil.getTradeStatus();
if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
break;
}
@@ -555,6 +565,7 @@
siteBooking.setStatus(1);
siteBooking.setPayOrderNo(tradeNo);
siteBookingService.updateById(siteBooking);
+ System.err.println("======完成支付");
break;
}
if("WAIT_BUYER_PAY".equals(s)){
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 915a855..e9a7ebc 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
@@ -306,18 +306,20 @@
* @return
* @throws Exception
*/
- public ResultUtil queryALIOrder(String out_trade_no) throws Exception{
+ public AlipayTradeQueryResponse queryALIOrder(String out_trade_no) throws Exception{
AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",aliAppid, appPrivateKey,"json","UTF-8",alipay_public_key,"RSA2");
AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
request.setBizContent("{" +
" \"out_trade_no\":\"" + out_trade_no + "\"" +
"}");
AlipayTradeQueryResponse response = alipayClient.execute(request);
+
if(response.isSuccess()){
String tradeStatus = response.getTradeStatus();//交易状态：WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款）
- return ResultUtil.success(tradeStatus);
+ return response;
} else {
- return ResultUtil.error(response.getMsg());
+// return ResultUtil.error(response.getMsg());
+ return response;
}
}
--
Gitblit v1.7.1