From 820724a76b4db9ea0eeb14049473ad56ebfb6d45 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 27 十月 2023 13:19:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 3
cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java | 8
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/ParticipantServiceImpl.java | 57 ++++++
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 9 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/RecordAppoint.java | 5
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 19 ++
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/TShopController.java | 22 ++
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 3
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 5
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/StoreClient.java | 3
cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 2
cloud-server-other/src/main/resources/mapper/SiteMapper.xml | 5
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-course/src/main/java/com/dsh/course/feignclient/model/RecordAppoint.java | 5
cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java | 2
cloud-server-activity/src/main/resources/mapper/CouponMapper.xml | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html | 4
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 20 ++
cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 6
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 13 +
cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java | 5
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 13 +
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 | 13 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java | 1
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-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 4
40 files changed, 407 insertions(+), 57 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/RecordAppoint.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/RecordAppoint.java
index 1cdf5c9..a16353a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/RecordAppoint.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/RecordAppoint.java
@@ -36,4 +36,9 @@
private List<Integer> ids;
+
+ private List<Integer> sid;
+
+ private List<Integer> rid;
+
}
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 3c05509..940e033 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
@@ -39,6 +39,8 @@
private Integer userId;
+ private List<Integer> rid;
+
private List<Integer> sid;
@ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
private Integer cardType;
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 27970bc..4a16c13 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");
@@ -515,6 +531,10 @@
}else{
coupon.setAuditStatus(1);
}
+ if(dataVo.getObjType()!=1){
+ coupon.setAuditStatus(1);
+ }
+
boolean save = couponService.save(coupon);
if (save){
if (dataVo.getCompany() == 3){
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 fad57a0..2f7a131 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
@@ -695,6 +695,7 @@
if(merchandise.getUseScope()==1){
sids.add(0);
detailsResponse.setSid(sids);
+ detailsResponse.setRid(new ArrayList<>());
}else if(merchandise.getUseScope()==2){
// 指定城市
List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>().eq(PointsMerchandiseCity::getPointsMerchandiseId, merchandise.getId()));
@@ -704,13 +705,23 @@
}
List<Integer> storeIds = stoClient.queryStoreIdByCityCode(collect);
detailsResponse.setSid(storeIds);
+ if(storeIds.size()>0){
+ // 获取rid
+ List<Integer> rid= stoClient.querySiteIdById(storeIds);
+ detailsResponse.setRid(rid);
+ }
+
}else if(merchandise.getUseScope()==3){
// 指定门店
List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
detailsResponse.setSid(collect);
-
+ if(collect.size()>0){
+ // 获取rid
+ List<Integer> rid= stoClient.querySiteIdById(collect);
+ detailsResponse.setRid(rid);
+ }
}
}
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 3500554..a940cd8 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
@@ -40,6 +40,11 @@
private Integer userId;
+
+
+
+ private List<Integer> rid;
+
private List<Integer> sid;
@ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/StoreClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/StoreClient.java
index 4ccbaa1..f605aa3 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/StoreClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/StoreClient.java
@@ -23,5 +23,8 @@
@PostMapping("/store/queryStoreIdByCityCode")
List<Integer> queryStoreIdByCityCode(@RequestBody List<String> collect);
+ @PostMapping("/store/querySiteIdById")
+ List<Integer> querySiteIdById(@RequestBody List<Integer> storeIds);
+
}
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 8356286..0e1e64b 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
@@ -33,6 +33,8 @@
@Param("storeId")Integer storeId,
@Param("operatorId")Integer operatorId,
@Param("objType")Integer objType
+ @Param("storeId")Integer storeId,
+ @Param("objType")Integer objType
);
List<Map<String, Object>> queryCouponListOfSearch1(@Param("name")String name,
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 b0d1ab2..c32da70 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
@@ -105,11 +105,7 @@
@Override
public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) {
- return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),
- ofSearch.getType(),ofSearch.getDistributionMethod(),
- ofSearch.getUserPopulation(),ofSearch.getStatus(),
- ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),
- ofSearch.getStoreId(),ofSearch.getObjType(),ofSearch.getOperatorId());
+ return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId(),ofSearch.getObjType());
}
@Override
diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
index 3fcc044..7ecd817 100644
--- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
@@ -32,6 +32,10 @@
auditStatus
from t_coupon
where 1=1
+ <if test="objType == 1">
+ and auditStatus =2
+ </if>
+ where 1=1
<if test="operatorId != null">
and cityManagerId = #{operatorId}
</if>
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/java/com/dsh/course/feignclient/model/RecordAppoint.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/RecordAppoint.java
index c7d3f49..433c296 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/RecordAppoint.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/RecordAppoint.java
@@ -35,4 +35,9 @@
private List<Integer> ids;
+
+ private List<Integer> sid;
+
+ private List<Integer> rid;
+
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java
index a271eb9..8bd3329 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java
@@ -43,4 +43,8 @@
//查询运营商
@PostMapping("/store/queryByStoreId")
OperatorUser queryByStoreId(Integer storeId);
+
+ @PostMapping("/store/querySiteId")
+ List<Integer> querySiteId(Integer storeId);
+
}
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 1a70bab..12e9cf9 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
@@ -782,6 +782,10 @@
coursePackage = tcpmapper.selectById(coursePackageStudent.getCoursePackageId());
coursePackageId = coursePackageStudent.getCoursePackageId();
}
+
+ recordVo.setSid(Arrays.asList(coursePackage.getStoreId()));
+ List<Integer> rid = stoClient.querySiteId(coursePackage.getStoreId());
+ recordVo.setRid(rid);
recordVo.setUserId(appUserId);
recordVo.setSiteId(coursePackage.getSiteId());
List<Integer> ids1 = getIds(coursePackage.getSiteId());
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/activity/model/CouponListOfSearch.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java
index f2d3b21..eb63ef4 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java
@@ -27,4 +27,5 @@
private Integer operatorId;
private Integer objType;
+
}
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/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index e5a03ce..b6fd68a 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
@@ -357,6 +357,11 @@
dataVo.setCompany(3);
}
dataVo.setObjType(UserExt.getUser().getObjectType());
+ if(UserExt.getUser().getObjectType()==3){
+ dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
+ dataVo.setCompany(3);
+ }
+ dataVo.setObjType(UserExt.getUser().getObjectType());
client.insertIntoData(dataVo);
return new SuccessTip<>();
}
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/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index b0b0443..4cba4fd 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -10,6 +10,7 @@
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.competition.CompetitionClient;
+import com.dsh.course.feignClient.other.model.Site;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
@@ -77,6 +78,9 @@
@Autowired
private TOperatorService tOperatorService;
+
+ @Autowired
+ private ITSiteService siteService;
/**
@@ -411,6 +415,22 @@
user.setObjectId(tStore.getId());
+
+
+ // 添加场地
+ TSite tSite = new TSite();
+ tSite.setName(tStore.getName());
+ tSite.setStoreId(tStore.getId());
+ tSite.setSign(1);
+ siteService.save(tSite);
+
+ HashMap<String, String> mapSite = new HashMap<>();
+ mapSite.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ mapSite.put("name",tStore.getName());
+ mapSite.put("space_id",tStore.getId().toString());
+ mapSite.put("area_id",tSite.getId().toString());
+ HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
+
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
StoreConfig storeConfig = new StoreConfig();
@@ -448,7 +468,7 @@
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("space_id",tStore.getId()+"");
map.put("device_id",s);
- map.put("region_id","");
+ map.put("region_id",tSite.getId().toString());
// 添加门禁
String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
System.out.println(s1);
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 65d3de6..f1ac631 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
@@ -477,7 +477,8 @@
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("name",site.getName());
- map.put("space_id",integer1.toString());
+ map.put("space_id",site.getStoreId().toString());
+ map.put("area_id",integer1.toString());
String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
// 添加门禁
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
index 6c398b4..d6249d0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
@@ -129,4 +129,6 @@
private String imgs;
@TableField("ids")
private String ids;
+ @TableField("sign")
+ private Integer sign;
}
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/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 46a38e2..a04ed24 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -4,6 +4,7 @@
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.account.CityManagerClient;
@@ -35,6 +36,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -402,7 +404,14 @@
List<Integer> ids = getIds(byId.getSiteId());
byId.setStorePhone(byId1.getPhone());
+
+ byId.setSid(Arrays.asList(storeId));
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
+ List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ byId.setRid(collect);
map.put("data",byId);
+
+
map.put("ids",ids);
return ResultUtil.success(map);
}catch (Exception e){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 375d74c..2170111 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -246,6 +246,14 @@
}
}
+ @ResponseBody
+ @PostMapping("/store/querySiteIdById")
+ public List<Integer> querySiteIdById(@RequestBody List<Integer> storeIds){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().in(Site::getStoreId, storeIds));
+ List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ return collect;
+ }
+
@ResponseBody
@@ -313,6 +321,17 @@
}
+ @Autowired
+ private ISiteService siteService;
+ @ResponseBody
+ @PostMapping("/store/querySiteId")
+ public List<Integer> querySiteId(@RequestBody Integer storeId){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
+ List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ return collect;
+ }
+
+
@PostMapping("/store/addBackRecord")
public void addBackRecord(@RequestBody String s){
TBackRecord tBackRecord = new TBackRecord();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
index fa6f186..46d4e4a 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -128,5 +128,6 @@
private Double playPaiCoinOne;
@TableField("ids")
private String ids;
-
+ @TableField("sign")
+ private Integer sign;
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java
index 1890dd3..ab1717b 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java
@@ -9,6 +9,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @author zhibing.pu
@@ -180,4 +181,8 @@
private String money;
@TableField(exist = false)
private String storePhone;
+ @TableField(exist = false)
+ private List<Integer> sid;
+ @TableField(exist = false)
+ private List<Integer> rid;
}
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;
}
}
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index 69d747e..ea05b70 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -76,7 +76,8 @@
select t1.*,t2.name storeName,t3.name siteTypeName from t_site t1
inner join t_store t2 on t1.storeId = t2.id
left join t_site_type t3 on t1.siteTypeId = t3.id
- <where>
+ where
+ t1.sign=0
<if test="query.objectType == 2">
and t1.cityManagerId = #{query.objectId}
</if>
@@ -99,7 +100,7 @@
and t1.name like concat('%',#{query.name},'%')
</if>
and t1.state != 3
- </where>
+
</select>
<select id="listExipre" resultType="com.dsh.other.model.dto.siteDto.TSiteDTO">
select t1.*,t2.name storeName,t3.name siteTypeName ,t4.name operator from t_site t1
--
Gitblit v1.7.1