From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 929 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 683 insertions(+), 246 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 0202bb2..9b003a2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1,19 +1,36 @@
package com.dsh.account.service.impl;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradeOrderSettleModel;
+import com.alipay.api.domain.OpenApiRoyaltyDetailInfoPojo;
+import com.alipay.api.domain.RoyaltyDetailInfos;
+import com.alipay.api.request.AlipayTradeOrderSettleRequest;
+import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
+import com.alipay.api.response.AlipayTradeOrderSettleResponse;
+import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.dto.SelectDto;
+import com.dsh.account.dto.UserInfoQueryDTO;
import com.dsh.account.entity.*;
import com.dsh.account.enums.RechargeRecordEnum;
+import com.dsh.account.feignclient.activity.IntroduceRewardsClient;
import com.dsh.account.feignclient.activity.MerChandiseClient;
import com.dsh.account.feignclient.activity.MerChandiseStoreClient;
import com.dsh.account.feignclient.activity.UserConponClient;
import com.dsh.account.feignclient.activity.model.*;
import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
+import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.feignclient.competition.model.PaymentCompetition;
+import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import com.dsh.account.feignclient.course.CoursePackageClient;
import com.dsh.account.feignclient.course.CoursePackageConfigClient;
import com.dsh.account.feignclient.course.CoursePaymentClient;
+import com.dsh.account.feignclient.course.VideoOfCourseListClient;
import com.dsh.account.feignclient.course.model.*;
import com.dsh.account.feignclient.other.ImgConfigClient;
import com.dsh.account.feignclient.other.RechargeConfigClient;
@@ -24,22 +41,32 @@
import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.account.feignclient.other.model.TImgConfig;
import com.dsh.account.mapper.*;
-import com.dsh.account.model.AddAppUserVo;
-import com.dsh.account.model.JoinPlayPaiVo;
-import com.dsh.account.model.LoginSMSCodeVo;
-import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.model.*;
import com.dsh.account.model.dto.Coupon;
+import com.dsh.account.model.query.appUserQuery.QueryAppUser;
+import com.dsh.account.model.vo.DetailsListVo;
+import com.dsh.account.model.vo.QueryAppUserVO;
import com.dsh.account.model.vo.classDetails.CourseVenue;
import com.dsh.account.model.vo.classDetails.ExerciseVideo;
import com.dsh.account.model.vo.classDetails.RegisteredCourse;
-import com.dsh.account.model.vo.classDetails.WeekedCourse;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.account.model.vo.userBenefitDetail.*;
+import com.dsh.account.service.TAppGiftService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.*;
import com.dsh.account.util.akeylogin.Md5Util;
+import com.dsh.account.vo.GroupCityInfoVO;
+import com.dsh.account.vo.entity.DayData;
+import com.dsh.account.vo.entity.MonthData;
+import com.dsh.account.vo.entity.WeekData;
+import com.dsh.account.vo.entity.YearData;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -49,6 +76,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -94,6 +122,10 @@
@Resource
private ImgConfigClient icfgClient;
+
+ @Resource
+ private VideoOfCourseListClient voclClient;
+
@Resource
private VipPaymentMapper vipPaymentMapper;
@@ -126,7 +158,108 @@
@Resource
private SiteClient stClient;
+ @Autowired
+ private TAppUserMapper appUserMapper;
+ @Autowired
+ private TAppGiftService appGiftService;
+
+ @Autowired
+ private IntroduceRewardsClient introduceRewardsClient;
+
+ private String aliAppid = "2021004105665036";//支付宝appid
+
+ private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
+
+ private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥
+
+ private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
+
+
+ @Override
+ public List<QueryAppUserVO> listAll(QueryAppUser query) {
+ return appUserMapper.listAll(query);
+ }
+
+ @Override
+ public HashMap<String,Object> weeksOfCourseDetailsList(Integer appUserId, Integer stuId, String time, Integer storeId,String lon,String lat) {
+ // 门店id 查出所有课程
+ HashMap<String, Object> map = paymentClient.weeksOfCourseDetailsList(new CourseDetailReq(appUserId, stuId, time, storeId,lon,lat));
+
+ return map;
+ }
+
+
+ @Override
+ public List<SelectDto> getSelects(List<Integer> studentIds) {
+ return this.baseMapper.getSelects(studentIds);
+ }
+
+ @Override
+ public Object changeState(AdvertisementChangeStateDTO dto) {
+ return appUserMapper.changeState(dto.getIds(),dto.getState());
+ }
+
+ @Override
+ public List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto) {
+ return appUserMapper.queryAPPUserByNameAndPhone(dto);
+ }
+ @Override
+ public List<YearData> getYearUserCount(UserInfoQueryDTO dto) {
+ return appUserMapper.getYearUserCount(dto);
+ }
+
+ @Override
+ public List<MonthData> getMonthUserCount(UserInfoQueryDTO dto) {
+ List<MonthData> monthUserCount = appUserMapper.getMonthUserCount(dto);
+ for (int i = 1; i <= 12; i++) {
+ String time = String.valueOf(i);
+ if (i < 10) {
+ time = "0" + time;
+ }
+ monthUserCount.add(Optional.ofNullable(monthUserCount.get(i)).orElse(new MonthData(time, 0)));
+ }
+ return monthUserCount.stream().sorted(Comparator.comparing(MonthData::getMonth)).collect(Collectors.toList());
+ }
+
+ @Override
+ public WeekData getWeekUserCount4(UserInfoQueryDTO dto) {
+ return appUserMapper.getWeekUserCount4(dto);
+ }
+ @Override
+ public WeekData getWeekUserCount3(UserInfoQueryDTO dto) {
+ return appUserMapper.getWeekUserCount3(dto);
+ }
+ @Override
+ public WeekData getWeekUserCount2(UserInfoQueryDTO dto) {
+ return appUserMapper.getWeekUserCount2(dto);
+ }
+ @Override
+ public WeekData getWeekUserCount1(UserInfoQueryDTO dto) {
+ return appUserMapper.getWeekUserCount1(dto);
+ }
+
+ @Override
+ public List<DayData> getDayUserCount(UserInfoQueryDTO dto) {
+ List<DayData> dayUserCount = appUserMapper.getDayUserCount(dto);
+ if(dayUserCount.size()<7){
+ for (int i = 1; i <= 6; i++) {
+ String time = LocalDate.now().minusDays(i).toString();
+ for (DayData dayData : dayUserCount) {
+ if(!time.equals(dayData.getDay())){
+ dayUserCount.add(new DayData(time,0));
+ }
+ }
+ }
+ }
+ dayUserCount.forEach(dayData->dayData.setDay(dayData.getDay().split("-")[2]));
+ return dayUserCount.stream().sorted(Comparator.comparing(DayData::getDay)).collect(Collectors.toList());
+ }
+
+ @Override
+ public List<GroupCityInfoVO> groupCityInfo(UserInfoQueryDTO dto) {
+ return appUserMapper.groupCityInfo(dto);
+ }
@Override
public ClassInfoVo queryUserOfStus(Integer id) {
TAppUser tAppUser = this.baseMapper.selectById(id);
@@ -150,33 +283,28 @@
classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
List<RegisteredCourse> courseList = new ArrayList<>();
-// 总学时数
- int total = 0;
-// 已扣数
- int deduct = 0;
-// 剩余数
- int remain = 0;
- List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment();
+ List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
+ List<Integer> coursePackIds = new ArrayList<>();
if (stuCoursePayment.size() > 0){
+ coursePackIds = stuCoursePayment.stream().map(StuCourseResp::getCourseId).collect(Collectors.toList());
for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
RegisteredCourse course = new RegisteredCourse();
+ course.setId(tCoursePackagePayment.getId());
course.setCourseId(tCoursePackagePayment.getCourseId());
course.setCourseName(tCoursePackagePayment.getCourseName());
- total = total + (ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
- deduct = deduct + (ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
- remain = remain + (ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
+ course.setTotalNums(ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
+ course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
+ course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
+ course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
courseList.add(course);
}
+
}
classInfoVo.setCourseList(courseList);
-
- classInfoVo.setTotalNums(total);
- classInfoVo.setDeductedNums(deduct);
- classInfoVo.setRemainingNums(remain);
-
- List<ExerciseVideo> videos = new ArrayList<>();
-
- classInfoVo.setExerciseVideoList(videos);
+// List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
+ List<ExerciseVideo> query = voclClient.query(id);
+ System.out.println("======queryqueryqueryquery=================="+query);
+ classInfoVo.setExerciseVideoList(query);
}else {
classInfoVo.setIsThere(2);
List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
@@ -195,36 +323,39 @@
* @param latitude
* @return
*/
- public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses, String longitude , String latitude){
- List<WeekedCourse> weekedCourses = new ArrayList<>();
- for (int i = 1; i < 8; i++) {
- WeekedCourse weekedCourse = new WeekedCourse();
- List<CourseVenue> courseVenues = new ArrayList<>();
- Map<Integer, List<CourseOfStoreVo>> map = storeOfCourses.stream().collect(Collectors.groupingBy(CourseOfStoreVo::getStoreId));
- for (Map.Entry<Integer, List<CourseOfStoreVo>> integerListEntry : map.entrySet()) {
- List<CourseOfStoreVo> value = integerListEntry.getValue();
- CourseVenue courseVenue = new CourseVenue();
- courseVenue.setStoreId(value.get(0).getStoreId());
- courseVenue.setAreaName(value.get(0).getStoreName());
+ public List<CourseVenue> dealDatas(List<CourseOfStoreVo> storeOfCourses, String longitude , String latitude){
+ List<CourseVenue> courseVenues = new ArrayList<>();
+ Map<Integer, List<CourseOfStoreVo>> map = storeOfCourses.stream().collect(Collectors.groupingBy(CourseOfStoreVo::getStoreId));
+ for (Map.Entry<Integer, List<CourseOfStoreVo>> integerListEntry : map.entrySet()) {
+ Integer storeId = integerListEntry.getKey();
+ List<CourseOfStoreVo> value = integerListEntry.getValue();
+ CourseVenue courseVenue = new CourseVenue();
+ courseVenue.setStoreId(storeId);
+ courseVenue.setAreaName(value.get(0).getCourseName());
+ if (ToolUtil.isEmpty(longitude) && ToolUtil.isEmpty(latitude)){
+ courseVenue.setSiteDistance(0+"");
+ }else {
courseVenue.setSiteDistance(LonlatUtils.distance(Double.parseDouble(longitude), Double.parseDouble(latitude),
Double.parseDouble(value.get(0).getLon()), Double.parseDouble(value.get(0).getLat())) + "");
-
- List<CourseVenue.CouList> courses = new ArrayList<>();
- for (CourseOfStoreVo courseOfStoreVo : value) {
- CourseVenue.CouList couList = new CourseVenue.CouList();
- couList.setCourseID(courseOfStoreVo.getCourseId());
- couList.setCourseName(courseOfStoreVo.getCourseName());
- couList.setTimeStr(courseOfStoreVo.getClassStartTime() + "-" + courseOfStoreVo.getClassEndTime());
- couList.setDetail("");
- courses.add(couList);
- }
- courseVenue.setCourses(courses);
- courseVenues.add(courseVenue);
}
- weekedCourse.setDetails(courseVenues);
- weekedCourses.add(weekedCourse);
+ List<CourseVenue.CouList> courses = new ArrayList<>();
+ for (CourseOfStoreVo courseOfStoreVo : value) {
+ CourseVenue.CouList couList = new CourseVenue.CouList();
+ couList.setCourseID(courseOfStoreVo.getCourseId());
+ couList.setCourseName(courseOfStoreVo.getCourseName());
+ couList.setTimeStr(courseOfStoreVo.getClassStartTime() + "-" + courseOfStoreVo.getClassEndTime());
+ couList.setDetail("￥" + courseOfStoreVo.getCoursePrice() + "/会员扣2学时");
+ couList.setStatus(courseOfStoreVo.getStatus());
+
+ couList.setAllNum(courseOfStoreVo.getAllNum());
+ couList.setUseNum(courseOfStoreVo.getUseNum());
+ couList.setLastNum(courseOfStoreVo.getLastNum());
+ courses.add(couList);
+ }
+ courseVenue.setCourses(courses);
+ courseVenues.add(courseVenue);
}
- return weekedCourses;
+ return courseVenues;
}
@@ -276,11 +407,37 @@
tAppUser = new TAppUser();
tAppUser.setCode(UUIDUtil.getNumberRandom(16));
tAppUser.setPhone(addAppUserVo.getPhone());
- tAppUser.setPassword(Md5Util.MD5Encode(addAppUserVo.getPassword(), null));
+ tAppUser.setPassword(addAppUserVo.getPassword());
tAppUser.setIsVip(0);
tAppUser.setState(1);
tAppUser.setInsertTime(new Date());
this.baseMapper.insert(tAppUser);
+
+
+ // 介绍有礼
+ if(addAppUserVo.getReferralUserId()!=null){
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(addAppUserVo.getLon(), addAppUserVo.getLat());
+ Integer num=0;
+ if(null != geocode){
+ String province = geocode.get("province");
+ String provinceCode = geocode.get("provinceCode");
+ String city = geocode.get("city");
+ String cityCode = geocode.get("cityCode");
+ num = introduceRewardsClient.getGiftList(cityCode);
+ }
+ TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, addAppUserVo.getReferralUserId()));
+ if(one!=null){
+ one.setNum(one.getNum()+num);
+ appGiftService.updateById(one);
+ }else {
+ TAppGift tAppGift = new TAppGift();
+ tAppGift.setUserId(addAppUserVo.getReferralUserId());
+ tAppGift.setNum(num);
+ appGiftService.save(tAppGift);
+ }
+
+ }
+
return ResultUtil.success();
}
@@ -299,9 +456,9 @@
return ResultUtil.error("请先注册", "");
}
if(tAppUser.getState() == 2){
- return ResultUtil.error("您的账号已被冻结", "");
+ return ResultUtil.errorCode("您的账号已被冻结", "");
}
- password = Md5Util.MD5Encode(password, null);
+// password = Md5Util.MD5Encode(password, null);
if(!tAppUser.getPassword().equals(password)){
return ResultUtil.error("账号密码错误", "");
}
@@ -347,6 +504,7 @@
@Override
public ResultUtil loginWechat(LoginWeChatVo loginWechatVo) throws Exception {
TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("openid", loginWechatVo.getOpenId()).ne("state", 3));
+
if(null == tAppUser){
tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", loginWechatVo.getPhone()).ne("state", 3));
if(null == tAppUser){
@@ -356,6 +514,9 @@
tAppUser.setPhone(loginWechatVo.getPhone());
tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
tAppUser.setIsVip(0);
+ tAppUser.setName(loginWechatVo.getNickname());
+ tAppUser.setHeadImg(loginWechatVo.getHeadimgurl());
+ tAppUser.setGender(loginWechatVo.getSex());
tAppUser.setState(1);
tAppUser.setInsertTime(new Date());
this.baseMapper.insert(tAppUser);
@@ -374,7 +535,15 @@
this.updateById(tAppUser);
String token = getToken(tAppUser);
- return ResultUtil.success(token);
+
+ HashMap<String, String> map = new HashMap<>();
+ map.put("token",token);
+ if(ToolUtil.isEmpty(tAppUser.getPhone())){
+ map.put("isBind","0");
+ }else {
+ map.put("isBind","1");
+ }
+ return ResultUtil.success(map);
}
@@ -408,10 +577,13 @@
return ResultUtil.error("验证码无效");
}
TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
+ if(tAppUser==null){
+ return ResultUtil.error("该账号未注册", "");
+ }
if(tAppUser.getState() == 2){
return ResultUtil.error("您的账号已被冻结", "");
}
- tAppUser.setPassword(Md5Util.MD5Encode(password, null));
+ tAppUser.setPassword(password);
this.updateById(tAppUser);
return ResultUtil.success();
}
@@ -468,7 +640,7 @@
for (Store store : stores) {
Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
Double wgs84 = distance.get("WGS84");
- if(s == null || d.compareTo(wgs84) < 0){
+ if(s == null || d>wgs84){
s = store;
d = wgs84;
}
@@ -478,6 +650,10 @@
joinPlayPaiVo.setLat(s.getLat());
joinPlayPaiVo.setStoreId(s.getId());
joinPlayPaiVo.setPhone(s.getPhone());
+ joinPlayPaiVo.setProvince(s.getProvince());
+ joinPlayPaiVo.setProvinceCode(s.getProvinceCode());
+ joinPlayPaiVo.setCity(s.getCity());
+ joinPlayPaiVo.setCityCode(s.getCityCode());
}
return joinPlayPaiVo;
}
@@ -489,22 +665,25 @@
TAppUser appUser = this.getById(appUserId);
benefirVo.setUserHeadImg(appUser.getHeadImg());
benefirVo.setUserName(appUser.getName());
+ benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
+ benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
if (appUser.getIsVip() == 1){
benefirVo.setIsMember("年度会员");
}else {
benefirVo.setIsMember("普通用户");
}
- benefirVo.setCommodities(mcClient.getConvertibleGoods());
+ List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods();
+ benefirVo.setCommodities(convertibleGoods);
benefirVo.setImage(icfgClient.getImageConfig());
return benefirVo;
}
@Override
- public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
- BillingDetailsVo vo = new BillingDetailsVo();
- List<BillingDetailsVo.ConsumeDetail> details = new ArrayList<>();
+ public List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
+ List<ConsumeDetail> details = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
+ SimpleDateFormat result = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date monthStart = null;
Date monthEnd = null;
if (StringUtils.hasText(yearMonth)) {
@@ -514,52 +693,62 @@
monthStart = DateTimeHelper.getCurrentMouthStart();
monthEnd = DateTimeHelper.getCurrentMouthEnd();
}
+
+ BillingDataRequestVo requestVo = new BillingDataRequestVo();
+ requestVo.setMonthStart(result.format(monthStart));
+ requestVo.setMonthEnd(result.format(monthEnd));
+ requestVo.setAppUserId(appUserId);
// 1.赛事报名
- List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(appUserId);
- if (allCompetitionPayRecord.size() > 0 ){
- for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ BillingRequestVo allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(allCompetitionPayRecord.getRequests())){
+ for (BillingRequest paymentCompetition : allCompetitionPayRecord.getRequests()) {
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
details.add(consumeDetail);
+ consumeDetail.setType(1);
}
}
// 2.取消赛事报名
- List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(appUserId);
- if (cancelOrderOfUserPayRecord.size() > 0 ){
- for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ BillingRequestVo cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(cancelOrderOfUserPayRecord.getRequests())){
+ for (BillingRequest paymentCompetition : cancelOrderOfUserPayRecord.getRequests()) {
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount());
+ consumeDetail.setType(1);
details.add(consumeDetail);
}
}
// 3.课包购买
- List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(appUserId);
- if (amountPayRecord.size() > 0 ){
- for (TCoursePackagePayment coursePackagePayment : amountPayRecord) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ BillingRequestVo amountPayRecord = paymentClient.getAmountPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(amountPayRecord.getRequests())){
+ for (BillingRequest coursePackagePayment : amountPayRecord.getRequests()) {
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime()));
- consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment());
+ consumeDetail.setConsumeTime(coursePackagePayment.getTime());
+ consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
+ consumeDetail.setType(2);
details.add(consumeDetail);
}
}
// 4.场地预约
- List<SiteBooking> allSiteBookingList = stClient.getAllSiteBookingList(appUserId);
- if (allSiteBookingList.size() > 0){
- for (SiteBooking booking : allSiteBookingList) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ RequestOfTypeVo allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
+ if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())){
+ for (BillingRequestOfType booking : allSiteBookingList.getRequest()) {
+ ConsumeDetail consumeDetail = new ConsumeDetail();
if (booking.getStatus() != 5){
consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
- consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getPayTime()));
+ consumeDetail.setConsumeAmount("-" + booking.getAmount());
+ consumeDetail.setConsumeTime(booking.getTime());
+ consumeDetail.setType(2);
}else {
consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeAmount("+" + booking.getPayMoney());
- consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getCancelTime()));
+ consumeDetail.setConsumeAmount("+" + booking.getAmount());
+ consumeDetail.setConsumeTime(booking.getTime());
+ consumeDetail.setType(1);
}
details.add(consumeDetail);
}
@@ -573,10 +762,11 @@
.between("insertTime", monthStart, monthEnd));
if (vipPayments.size() > 0) {
for (VipPayment vipPayment : vipPayments) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime()));
consumeDetail.setConsumeAmount("-" + vipPayment.getAmount());
+ consumeDetail.setType(2);
details.add(consumeDetail);
}
}
@@ -587,17 +777,18 @@
.between("insertTime", monthStart, monthEnd));
if (rechargeRecords.size() > 0) {
for (RechargeRecords rechargeRecord : rechargeRecords) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins());
consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount());
+ consumeDetail.setType(2);
details.add(consumeDetail);
}
}
if (details.size() > 0 ){
- Collections.sort(details, new Comparator<BillingDetailsVo.ConsumeDetail>() {
+ Collections.sort(details, new Comparator<ConsumeDetail>() {
@Override
- public int compare(BillingDetailsVo.ConsumeDetail record1, BillingDetailsVo.ConsumeDetail record2) {
+ public int compare(ConsumeDetail record1, ConsumeDetail record2) {
SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");
Date date1 = null;
Date date2 = null;
@@ -611,9 +802,14 @@
return date2.compareTo(date1);
}
});
+
+ if (ToolUtil.isNotEmpty(recordId)){
+ details = details.stream()
+ .filter(response -> Objects.equals(response.getType(), recordId))
+ .collect(Collectors.toList());
+ }
}
- vo.setDetails(details);
- return vo;
+ return details;
}
@Override
@@ -630,14 +826,16 @@
List<RechargeCentVo> centVos = new ArrayList<>();
TAppUser tAppUser = this.baseMapper.selectById(appUserId);
List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig();
+ System.out.println(rechargeConfig);
if (rechargeConfig.size() > 0 ){
for (Map<String, Object> stringObjectMap : rechargeConfig) {
RechargeCentVo vo = new RechargeCentVo();
- vo.setAmount("¥ "+stringObjectMap.get("money"));
+ Double money = (Double) stringObjectMap.get("money");
+ vo.setAmount(BigDecimal.valueOf(money) );
if (tAppUser.getIsVip() == 1){
- vo.setWpGold(stringObjectMap.get("MemberCoins")+"币");
+ vo.setWpGold((Integer) stringObjectMap.get("MemberCoins"));
}else {
- vo.setWpGold(stringObjectMap.get("usersCoins")+"币");
+ vo.setWpGold((Integer) stringObjectMap.get("usersCoins"));
}
centVos.add(vo);
}
@@ -646,22 +844,16 @@
}
@Override
- public PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis) {
- PointMallDetailsResponse detailsResponse = new PointMallDetailsResponse();
- List<PointMallDetailsResponse.Goods> goods = new ArrayList<>();
-
- TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
- detailsResponse.setName(tAppUser.getName());
- detailsResponse.setIntegral(tAppUser.getIntegral());
- detailsResponse.setHeadImg(tAppUser.getHeadImg());
+ public List<Goods> queryAppUserIntegral(MallRequest request ) {
+ List<Goods> goods = new ArrayList<>();
CommodityRequest commodityRequest = new CommodityRequest();
commodityRequest.setLon(request.getLon());
commodityRequest.setLat(request.getLat());
- List<PointsMerchandise> vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
- if (vicinityGoods.size() > 0) {
- for (PointsMerchandise vicinityGood : vicinityGoods) {
- PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
+ PointMerchandiseVo vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
+ if (ToolUtil.isNotEmpty(vicinityGoods.getMerchandises())) {
+ for (PointsMerchandise vicinityGood : vicinityGoods.getMerchandises()) {
+ Goods commodity = new Goods();
switch (vicinityGood.getType()) {
case 1:
commodity.setGoodId(vicinityGood.getId());
@@ -671,12 +863,14 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
commodity.setGoodsType(1);
commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+ List<Integer> integers = mcsClient.queryPointMerStoreIds(vicinityGood.getId());
+ commodity.setShopIds(integers);
break;
case 2:
commodity.setGoodId(vicinityGood.getCoursePackageId());
@@ -693,6 +887,7 @@
commodity.setBelongsType(vicinityGood.getUserPopulation());
commodity.setGoodsType(2);
commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+ commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
break;
case 3:
commodity.setGoodId(vicinityGood.getId());
@@ -702,14 +897,16 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
commodity.setGoodsType(3);
commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+ commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
break;
default:
+
break;
}
goods.add(commodity);
@@ -718,7 +915,7 @@
List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest);
if (allCoupons.size() > 0) {
for (Coupon allCoupon : allCoupons) {
- PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
+ Goods commodity = new Goods();
commodity.setGoodId(allCoupon.getId());
commodity.setGoodName(allCoupon.getName());
commodity.setCondition(allCoupon.getRedemptionMethod());
@@ -731,31 +928,50 @@
}
commodity.setBelongsType(allCoupon.getUserPopulation());
commodity.setGoodsType(4);
+ commodity.setShopIds(ucponClient.getCouponStoreIds(allCoupon.getId()));
commodity.setNums(ucponClient.getRedeemedQuantity(allCoupon.getId()));
goods.add(commodity);
}
}
+
if (StringUtils.hasText(request.getSearch())){
- goods = goods.stream()
- .filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
+ .collect(Collectors.toList());
+ }
}
+ // 2.0 门店筛选
+ if (request.getShopId()!=null){
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .filter(merchandise -> merchandise.getShopIds().contains(request.getShopId()))
+ .collect(Collectors.toList());
+ }
+ }
+
if (null != request.getRank()){
switch (request.getRank()){
case 1:
- goods = goods.stream()
- .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral).reversed())
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .sorted(Comparator.comparing(Goods::getIntegral).reversed())
+ .collect(Collectors.toList());
+ }
break;
case 2:
- goods = goods.stream()
- .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral))
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .sorted(Comparator.comparing(Goods::getIntegral))
+ .collect(Collectors.toList());
+ }
break;
case 3:
- goods = goods.stream()
- .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getNums).reversed())
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .sorted(Comparator.comparing(Goods::getNums).reversed())
+ .collect(Collectors.toList());
+ }
break;
default:
break;
@@ -763,26 +979,29 @@
}
if (null != request.getGoodsType()){
- goods = goods.stream()
- .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
+ .collect(Collectors.toList());
+ }
}
- detailsResponse.setGoods(goods);
- return detailsResponse;
+
+ //当前第几页
+ int pageNo = request.getPageNum();
+ //一页五条
+ int size = request.getPageSize();
+
+ //分页
+ goods = goods.stream().skip((pageNo - 1) * size).limit(size).
+ collect(Collectors.toList());
+ return goods;
}
- @Override
- public ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request) {
- try {
- String filePath = OssUploadUtil.ossUpload(request,file);
- TAppUser tAppUser = this.baseMapper.selectById(appUserId);
- tAppUser.setHeadImg(filePath);
- this.baseMapper.updateById(tAppUser);
- } catch (IOException e) {
- ResultUtil.error("头像上传失败！");
- }
-
- return ResultUtil.success();
+ // 对数据进行分页处理的方法
+ private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) {
+ int start = (int) pageable.getOffset();
+ int end = Math.min((start + pageable.getPageSize()), dataList.size());
+ return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
}
@Override
@@ -791,6 +1010,10 @@
detailsVo.setGoodsType(goodsType);
detailsVo.setGoodId(goodId);
return mcClient.getGoodDetailsWithId(detailsVo);
+ }
+ @Override
+ public ProductDetailsVo goodsDetailsOne(Integer goodId ) {
+ return mcClient.getGoodDetailsWithIdOne(goodId);
}
@Override
@@ -830,105 +1053,210 @@
}
@Override
- public ResultUtil productRedemptionOperation(Integer userIdFormRedis, Integer goodId, Integer goodsType,Integer nums,Integer exchangeType,Integer payType,List<Integer> stuIds) {
- PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(goodId);
+ @Transactional
+ public ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
+ System.out.println("exchangeType:--->");
+ System.out.println(exchangeType);
+
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
- for (int i = 0; i < nums; i++) {
- UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
- pointsMerchandise.setPointsMerchandiseId(goodId);
- pointsMerchandise.setUserId(userIdFormRedis);
- pointsMerchandise.setCode(code);
- mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+ PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
+ if (ToolUtil.isEmpty(merchandise)){
+ return ResultUtil.error("商品不存在");
}
-// 扣减积分
+
TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
-// 积分变更记录
- UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
- userIntegralChanges.setAppUserId(userIdFormRedis);
- userIntegralChanges.setOldIntegral(tAppUser.getIntegral());
- userIntegralChanges.setType(2);
- tAppUser.setIntegral(null == tAppUser.getIntegral() ? merchandise.getIntegral() : tAppUser.getIntegral() +merchandise.getIntegral());
- userIntegralChanges.setNewIntegral(tAppUser.getIntegral());
- userIntegralChanges.setInsertTime(new Date());
- uicMapper.insert(userIntegralChanges);
+ if(merchandise.getUserPopulation()==2){
+ if(tAppUser.getIsVip()==0){
+ return ResultUtil.error("该商品只能年度会员购买");
+ }
+ }
- this.baseMapper.updateById(tAppUser);
-// 现金支付
- if (exchangeType == 2) {
- switch (goodsType) {
- case 2:
- for (int i = 0; i < stuIds.size(); i++) {
- List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
- TCoursePackagePayment packagePayment = new TCoursePackagePayment();
- packagePayment.setAppUserId(userIdFormRedis);
- packagePayment.setStudentId(stuIds.get(i));
- packagePayment.setCoursePackageId(merchandise.getCoursePackageId());
- for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
- if (Objects.equals(coursePackagePaymentConfig.getId(),merchandise.getCoursePackageConfigId())){
- packagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
- packagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
- packagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
- packagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
- break;
+
+ if(merchandise.getUserPopulation()==3){
+ List<TStudent> students = tsmapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, userIdFormRedis));
+ if(students.size()==0){
+ return ResultUtil.error("该商品只能已有学员用户购买");
+ }
+ }
+
+
+ if (ToolUtil.isEmpty(tAppUser)){
+ return ResultUtil.error("用户不存在");
+ }
+ int goodsNums = 0;
+ if (ToolUtil.isEmpty(exchangeType.getNums())){
+ goodsNums = 1;
+ }else {
+ goodsNums = exchangeType.getNums();
+ }
+ AppUserGoodResp goodResp = new AppUserGoodResp();
+ goodResp.setAppUserId(userIdFormRedis);
+ goodResp.setGoodId(merchandise.getId());
+ int count = mcClient.queryUserHasGoodsNums(goodResp);
+ if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
+ return ResultUtil.error("超过限领数量");
+ }
+ int count1 = mcClient.queryUserHasGoodsNums1(goodResp);
+ if (ToolUtil.isNotEmpty(count1) && count1 >= merchandise.getQuantityIssued()){
+ return ResultUtil.error("超过发放数量");
+ }
+
+
+
+ switch (exchangeType.getExchangeType()){
+// 积分
+ case 1:
+ boolean b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
+ if (b){
+ switch (exchangeType.getGoodsType()){
+ case 2:
+ Integer stuNums = 0;
+ if (ToolUtil.isNotEmpty(exchangeType.getStuIds())){
+ stuNums = exchangeType.getStuIds().size();
+ }else {
+ stuNums = 1;
}
+ for (int i = 0; i < stuNums; i++) {
+ List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
+ TCoursePackagePayment packagePayment = new TCoursePackagePayment();
+ packagePayment.setAppUserId(userIdFormRedis);
+ packagePayment.setStudentId(exchangeType.getStuIds().get(i));
+ packagePayment.setCoursePackageId(merchandise.getCoursePackageId());
+ for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
+ if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())) {
+ packagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
+ packagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
+ packagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
+ packagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
+ break;
+ }
+ }
+ packagePayment.setPlayPaiCoin(merchandise.getIntegral());
+ packagePayment.setAbsencesNumber(0);
+ packagePayment.setPayUserType(1);
+ packagePayment.setPayStatus(2);
+ packagePayment.setPayUserId(userIdFormRedis);
+ packagePayment.setStatus(1);
+ packagePayment.setState(1);
+ packagePayment.setCode(code);
+ paymentClient.savePaymentCoursePackage(packagePayment);
+ }
+ break;
+ case 4:
+ for (int i = 0; i < goodsNums; i++) {
+ UserCoupon coupon = new UserCoupon();
+ coupon.setCouponId(exchangeType.getGoodId());
+ coupon.setUserId(userIdFormRedis);
+ coupon.setStatus(1);
+ ucponClient.insertToAppuserCoupon(coupon);
+ }
+ break;
+ default:
+ break;
+ }
+ }else {
+ return ResultUtil.error("用户积分不足！");
+ }
+ break;
+ case 2:
+// 积分+现金
+ boolean dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
+ switch (exchangeType.getPayType()) {
+ case 1:
+ try {
+ if (merchandise.getType() == 2) {
+ return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ } else {
+ return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ }
+ } catch (Exception e) {
+ return ResultUtil.runErr();
}
- packagePayment.setPlayPaiCoin(merchandise.getIntegral());
- packagePayment.setAbsencesNumber(0);
- packagePayment.setPayUserType(1);
- packagePayment.setPayStatus(1);
- packagePayment.setPayUserId(userIdFormRedis);
- packagePayment.setStatus(1);
- packagePayment.setState(1);
- packagePayment.setInsertTime(new Date());
- packagePayment.setCode(code);
- paymentClient.savePaymentCoursePackage(packagePayment);
- }
- break;
- case 4:
- for (int i = 0; i < nums; i++) {
- UserCoupon coupon = new UserCoupon();
- coupon.setCouponId(goodId);
- coupon.setUserId(userIdFormRedis);
- coupon.setStatus(1);
- coupon.setInsertTime(new Date());
- ucponClient.insertToAppuserCoupon(coupon);
- }
- break;
- default:
- break;
- }
+ case 2:
+ if (merchandise.getType() == 2) {
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ } else {
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ }
+ default:
+ break;
+ }
+ break;
+ case 3:
+ switch (exchangeType.getPayType()) {
+ case 1:
+ try {
+ if (merchandise.getType() == 2) {
+ return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ } else {
+ return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ }
+ } catch (Exception e) {
+ return ResultUtil.runErr();
+ }
+ case 2:
+ if (merchandise.getType() == 2) {
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ } else {
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ }
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
- switch (payType){
- case 1:
- try {
- if (merchandise.getType() == 2){
- return WechatPayment(merchandise.getCash().multiply(new BigDecimal(stuIds.size())),code);
- }else {
- return WechatPayment(merchandise.getCash().multiply(new BigDecimal(nums)),code);
- }
- }catch (Exception e){
- return ResultUtil.runErr();
- }
- case 2:
- if (merchandise.getType() == 2){
- AlipayPayment(merchandise.getCash().multiply(new BigDecimal(stuIds.size())),code);
- }else {
- AlipayPayment(merchandise.getCash().multiply(new BigDecimal(nums)),code);
- }
- break;
- default:
- break;
+ for (int i = 0; i < goodsNums; i++) {
+// 新增积分商品兑换记录
+ UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
+ pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
+ pointsMerchandise.setUserId(userIdFormRedis);
+ pointsMerchandise.setStatus(1);
+ pointsMerchandise.setState(1);
+ if (merchandise.getUseScope() == 3){
+ if (exchangeType.getGoodsType() == 2){
+ CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
+ pointsMerchandise.setStoreId(coursePackage.getStoreId());
+ }else {
+ pointsMerchandise.setStoreId(exchangeType.getStoreId());
+ }
}
+ pointsMerchandise.setCode(code);
+ mcClient.saveDetailsUserPointMercase(pointsMerchandise);
}
return ResultUtil.success();
}
+ public boolean dealAppUserIntegral(Integer appUserId,TAppUser appUser,Integer points){
+ try {
+ if (ToolUtil.isEmpty(appUser.getIntegral()) || (ToolUtil.isNotEmpty(appUser.getIntegral()) && appUser.getIntegral() < points)){
+ return false;
+ }
+ // 积分变更记录
+ UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
+ userIntegralChanges.setAppUserId(appUserId);
+ userIntegralChanges.setOldIntegral(appUser.getIntegral());
+ userIntegralChanges.setType(2);
+ appUser.setIntegral(null == appUser.getIntegral() ? points : appUser.getIntegral() - points);
+ userIntegralChanges.setNewIntegral(appUser.getIntegral());
+ userIntegralChanges.setInsertTime(new Date());
+ userIntegralChanges.setCategory(2);
+ uicMapper.insert(userIntegralChanges);
+
+ this.baseMapper.updateById(appUser);
+ return true;
+ }catch (Exception e){
+ return false;
+ }
+ }
private ResultUtil AlipayPayment(BigDecimal cash, String code) {
ResultUtil alipay = payMoneyUtil.alipay("课包续费", "", "", code, cash.toString(),
@@ -959,11 +1287,10 @@
Map<String, String> data1 = resultUtil.getData();
String s = data1.get("tradeStatus");
String tradeNo = data1.get("tradeNo");
-// if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
-// coursePackagePayment.setState(3);
-// couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
-// break;
-// }
+ if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
+ mcClient.deletePaymentRecord(code);
+ break;
+ }
if("TRADE_SUCCESS".equals(s)){
for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
userPointsMerchandise.setPayStatus(2);
@@ -971,6 +1298,7 @@
userPointsMerchandise.setPayType(2);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
}
+ moneyOut(tradeNo,tradeNo);
break;
}
if("WAIT_BUYER_PAY".equals(s)){
@@ -979,6 +1307,7 @@
}
}
}catch (Exception e){
+ mcClient.deletePaymentRecord(code);
e.printStackTrace();
}
}
@@ -986,6 +1315,106 @@
}
return alipay;
}
+
+
+
+ @Resource
+ private MerChandiseClient merChandiseClient;
+
+
+ public void moneyOut(String outNum,String tradeNo) throws AlipayApiException {
+
+
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+ AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
+ AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
+ model.setOutRequestNo(outNum);
+ model.setTradeNo(tradeNo);
+ List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
+//
+
+ AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();
+
+
+ request1.setBizContent("{" +
+ " \"receiver_list\":[" +
+ " {" +
+ " \"type\":\"loginName\"," +
+ " \"account\":\"19522115070\"," +
+ " \"name\":\"罗易胜\"," +
+ " \"memo\":\"分账给测试商户\"," +
+ " }" +
+ " ]," +
+ " \"out_request_no\":\""+tradeNo+"\"" +
+ "}");
+ AlipayTradeRoyaltyRelationBindResponse response = alipayClient.execute(request1);
+ if(response.isSuccess()){
+ System.out.println("绑定调用成功");
+ } else {
+ System.out.println("调用失败");
+ }
+
+
+
+// RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
+// royaltyDetailInfos1.setTransOutType("loginName");
+// royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
+// royaltyDetailInfos1.setTransInType("loginName");
+// royaltyDetailInfos1.setTransIn("19522115070");
+//// royaltyDetailInfos1.setAmount("0.01");
+// royaltyDetailInfos1.setAmountPercentage("100");
+
+// royaltyDetailInfos.add(royaltyDetailInfos1);
+
+
+ List<UserPointsMerchandise> userPointsMerchandises = merChandiseClient.queryUserPointMerchaseByCode(outNum);
+// PaymentCompetition code = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", outNum));
+ Integer storeId = userPointsMerchandises.get(0).getStoreId();
+
+// Competition byId1 = competitionService.getById(code.getCompetitionId());
+
+
+// TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());
+
+
+
+ OperatorUser operatorUser = storeClient.queryByStoreId(storeId);
+
+
+
+// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
+// Integer siteBookings = siteClient.queryByCode(outTradeNo);
+// List<Integer> stores = new ArrayList<>();
+// stores.add(coursePackagePayments);
+// stores.add(paymentCompetitions);
+// stores.add(siteBookings);
+// OperatorUser operatorUser = siteClient.queryOperator(stores);
+
+
+
+
+ OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
+ op.setTransOutType("loginName");
+ op.setTransOut("happysports@weparklife.com");
+ op.setTransInType("userId");
+ op.setTransIn(operatorUser.getAlipayNum());
+ op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
+
+ List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
+ ops.add(op);
+ model.setRoyaltyParameters(ops);
+
+ request.setBizModel(model);
+
+
+ AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
+ if(response1.isSuccess()){
+ System.out.println("调用成功");
+ } else {
+ System.out.println("调用失败");
+ }
+ }
+
private ResultUtil WechatPayment(BigDecimal cash, String code) throws Exception {
ResultUtil weixinpay = payMoneyUtil.weixinpay("课包", "", code, cash.toString(),
@@ -1019,11 +1448,10 @@
Map<String, String> data1 = resultUtil.getData();
String s = data1.get("trade_state");
String transaction_id = data1.get("transaction_id");
-// if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
-// coursePackagePayment.setState(3);
-// couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
-// break;
-// }
+ if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
+ mcClient.deletePaymentRecord(code);
+ break;
+ }
if("SUCCESS".equals(s)){
for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
userPointsMerchandise.setPayStatus(2);
@@ -1075,7 +1503,6 @@
coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
coupon.setUserId(userPointsMerchandises.get(0).getUserId());
coupon.setStatus(1);
- coupon.setInsertTime(new Date());
ucponClient.insertToAppuserCoupon(coupon);
break;
default:
@@ -1106,7 +1533,6 @@
coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
coupon.setUserId(userPointsMerchandises.get(0).getUserId());
coupon.setStatus(1);
- coupon.setInsertTime(new Date());
ucponClient.insertToAppuserCoupon(coupon);
break;
default:
@@ -1122,24 +1548,29 @@
List<StoreResponse> responses = new ArrayList<>();
if (goodsType == 4){
List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId);
- for (Integer couponStoreId : couponStoreIds) {
- StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreId);
- if(ToolUtil.isNotEmpty(courseOfStore)){
- StoreResponse response = new StoreResponse();
- response.setStoreId(couponStoreId);
- response.setStoreName(courseOfStore.getStoreName());
- responses.add(response);
+ if (couponStoreIds.size() > 0 ){
+ for (Integer couponStoreId : couponStoreIds) {
+ StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreId);
+ if(ToolUtil.isNotEmpty(courseOfStore)){
+ StoreResponse response = new StoreResponse();
+ response.setStoreId(couponStoreId);
+ response.setStoreName(courseOfStore.getStoreName());
+ responses.add(response);
+ }
}
}
+
}else {
List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId);
- for (Integer integer : integers) {
- StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integer);
- if(ToolUtil.isNotEmpty(courseOfStore)){
- StoreResponse response = new StoreResponse();
- response.setStoreId(integer);
- response.setStoreName(courseOfStore.getStoreName());
- responses.add(response);
+ if (integers.size() > 0 ){
+ for (Integer integer : integers) {
+ StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integer);
+ if(ToolUtil.isNotEmpty(courseOfStore)){
+ StoreResponse response = new StoreResponse();
+ response.setStoreId(integer);
+ response.setStoreName(courseOfStore.getStoreName());
+ responses.add(response);
+ }
}
}
}
@@ -1149,14 +1580,20 @@
@Override
public List<CourseVenue> queryWeekOfCourseDetails(Integer appUserId ,Integer stuId, String time,String longitude,String latitude) {
+ List<CourseVenue> courseVenues = new ArrayList<>();
WeeksOfCourseRest weeksOfCourseRest = new WeeksOfCourseRest();
weeksOfCourseRest.setTime(time);
weeksOfCourseRest.setStuId(stuId);
weeksOfCourseRest.setAppUserId(appUserId);
- paymentClient.getStoreOfCourses(weeksOfCourseRest);
-// TODO: 2023/7/20 查询课包周课包列表
- return null;
+ List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses(weeksOfCourseRest);
+ System.out.println(storeOfCourses);
+ if (storeOfCourses.size() > 0 ){
+ courseVenues = dealDatas(storeOfCourses,longitude,latitude);
+ }
+ return courseVenues;
}
+
+
}
--
Gitblit v1.7.1