From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +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/service/impl/TAppUserServiceImpl.java | 358 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 257 insertions(+), 101 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 3c0b63d..a7d0bc2 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
@@ -16,10 +16,7 @@
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.BindDto;
-import com.dsh.account.dto.SelectDto;
-import com.dsh.account.dto.UpdateInfoDto;
-import com.dsh.account.dto.UserInfoQueryDTO;
+import com.dsh.account.dto.*;
import com.dsh.account.entity.*;
import com.dsh.account.enums.RechargeRecordEnum;
import com.dsh.account.feignclient.activity.IntroduceRewardsClient;
@@ -46,6 +43,7 @@
import com.dsh.account.feignclient.other.model.TImgConfig;
import com.dsh.account.mapper.*;
import com.dsh.account.model.*;
+import com.dsh.account.model.AppUserByNameAndPhoneDTO;
import com.dsh.account.model.dto.Coupon;
import com.dsh.account.model.query.appUserQuery.QueryAppUser;
import com.dsh.account.model.vo.DetailsListVo;
@@ -265,14 +263,35 @@
return appUserMapper.groupCityInfo(dto);
}
@Override
- public ClassInfoVo queryUserOfStus(Integer id) {
- TAppUser tAppUser = this.baseMapper.selectById(id);
+ public ClassInfoVo queryUserOfStus(Integer id,Integer uid) {
+ TAppUser tAppUser = this.baseMapper.selectById(uid);
ClassInfoVo classInfoVo = new ClassInfoVo();
- if (ToolUtil.isNotEmpty(tAppUser)){
- List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
+// if (ToolUtil.isNotEmpty(tAppUser)){
+
+//
+
+ List<TStudent> tStudents = new ArrayList<>();
+ if (id!=null) {
+ tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
+ .eq("id", id).eq("state", 1));
+
+ if (tStudents.size() == 0) {
+ tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
+ .eq("appUserId", tAppUser.getId())
+ .eq("state", 1));
+ }
+ }else {
+ tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
.eq("appUserId",tAppUser.getId())
.eq("state",1)
.eq("isDefault",1));
+ if (tStudents.isEmpty()){
+ tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
+ .eq("appUserId",tAppUser.getId())
+ .eq("state",1))
+ ;
+ }
+ }
if (tStudents.size() > 0 ){
TStudent tStudent = tStudents.get(0);
classInfoVo.setStuId(tStudent.getId());
@@ -284,8 +303,9 @@
classInfoVo.setHeight(tStudent.getHeight());
classInfoVo.setWeight(tStudent.getWeight());
classInfoVo.setBmi(tStudent.getBmi());
- classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
-
+ if (tStudent.getBmi()!=null) {
+ classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
+ }
List<RegisteredCourse> courseList = new ArrayList<>();
List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
List<Integer> coursePackIds = new ArrayList<>();
@@ -300,15 +320,16 @@
course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
+ course.setIsAble(tCoursePackagePayment.getIsAble());
+ course.setCourseType(tCoursePackagePayment.getCourseType());
courseList.add(course);
}
-
}
classInfoVo.setCourseList(courseList);
// List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
- List<ExerciseVideo> query = voclClient.query(id);
- System.out.println("======queryqueryqueryquery=================="+query);
- classInfoVo.setExerciseVideoList(query);
+ List<ExerciseVideo> query = voclClient.query(tStudent.getId());
+ classInfoVo.setExerciseVideoList(query);
+
}else {
classInfoVo.setIsThere(2);
List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
@@ -316,7 +337,7 @@
classInfoVo.setImgs(tImgConfigs.get(0).getContent());
}
}
- }
+// }
return classInfoVo;
}
@@ -399,7 +420,9 @@
*/
@Override
public ResultUtil addAppUser(AddAppUserVo addAppUserVo) throws Exception {
- TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", addAppUserVo.getPhone()).ne("state", 3));
+ TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>()
+ .eq("phone", addAppUserVo.getPhone())
+ .ne("state", 3));
if(null != tAppUser){
return ResultUtil.error("账号已存在");
}
@@ -415,42 +438,58 @@
tAppUser.setIsVip(0);
tAppUser.setState(1);
tAppUser.setInsertTime(new Date());
-
-
-
- // 介绍有礼
- if(addAppUserVo.getReferralUserId()!=null || ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
- if(ToolUtil.isEmpty(addAppUserVo.getLat()) || ToolUtil.isEmpty(addAppUserVo.getLon())){
- return ResultUtil.error("请先开启定位", "");
- }
- 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);
- }
- if(ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
- List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, addAppUserVo.getInvitePhone()));
- if(tAppUsers.size()>0){
- addAppUserVo.setReferralUserId(tAppUsers.get(0).getId());
+ // 注册用户
+ int insert = this.baseMapper.insert(tAppUser);
+ // 介绍有礼
+ if(addAppUserVo.getReferralUserId()!=null || ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
+ if(ToolUtil.isEmpty(addAppUserVo.getLat()) || ToolUtil.isEmpty(addAppUserVo.getLon())){
+ return ResultUtil.error("请先开启定位", "");
+ }
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(addAppUserVo.getLon(), addAppUserVo.getLat());
+ Integer num=0;
+ Integer activityId=null;
+ if(null != geocode){
+ String province = geocode.get("province");
+ String provinceCode = geocode.get("provinceCode");
+ String city = geocode.get("city");
+ String cityCode = geocode.get("cityCode");
+ // 根据所在市code 查询是否有介绍有礼活动
+ IntroduceRewards res = introduceRewardsClient.getGiftList(cityCode);
+ if (res!=null){
+ num = res.getGiveClass();
+ activityId = res.getId();
+ if(ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
+ List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getPhone, addAppUserVo.getInvitePhone()));
+ if(tAppUsers.size()>0){
+ addAppUserVo.setReferralUserId(tAppUsers.get(0).getId());
+ }
+ }
+ if (num!=0){
+ TAppGift tAppGift = new TAppGift();
+ TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>()
+ .eq("phone", addAppUserVo.getInvitePhone()));
+ if (phone == null){
+ return ResultUtil.error("推荐人手机号未注册玩湃会员！");
+ }else{
+ tAppGift.setUserName(phone.getName());
+ tAppGift.setUserPhone(phone.getPhone());
+ }
+ tAppGift.setUserId(addAppUserVo.getReferralUserId());
+ tAppGift.setNum(num);
+ tAppGift.setShareUserId(tAppUser.getId());
+ tAppGift.setShareUserName(tAppUser.getPhone());
+ tAppGift.setShareUserPhone(tAppUser.getPhone());
+ tAppGift.setActivityId(activityId);
+ tAppGift.setInsertTime(new Date());
+ appGiftService.save(tAppGift);
+ }
+ }
}
}
- 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);
- }
- }
- this.baseMapper.insert(tAppUser);
+
+
return ResultUtil.success();
}
@@ -597,6 +636,9 @@
if(tAppUser.getState() == 2){
return ResultUtil.error("您的账号已被冻结", "");
}
+ if (tAppUser.getCode()==null){
+ tAppUser.setCode(UUIDUtil.getNumberRandom(16));
+ }
tAppUser.setPassword(password);
this.updateById(tAppUser);
return ResultUtil.success();
@@ -673,7 +715,7 @@
}
@Override
- public IndexOfUserBenefirVo queryBenefitDetails(Integer appUserId) {
+ public IndexOfUserBenefirVo queryBenefitDetails(Integer appUserId,String lon,String lat) {
IndexOfUserBenefirVo benefirVo = new IndexOfUserBenefirVo();
TAppUser appUser = this.getById(appUserId);
@@ -686,7 +728,11 @@
}else {
benefirVo.setIsMember("普通用户");
}
- List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods();
+
+ Location location = new Location();
+ location.setLat(lat);
+ location.setLon(lon);
+ List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods(location);
benefirVo.setCommodities(convertibleGoods);
benefirVo.setImage(icfgClient.getImageConfig());
return benefirVo;
@@ -737,17 +783,37 @@
}
}
// 3.课包购买
- 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(coursePackagePayment.getTime());
- consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
+// 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(coursePackagePayment.getTime());
+// consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
+// consumeDetail.setType(2);
+// details.add(consumeDetail);
+// }
+// }
+
+ //2.0
+ List<CourseCounsum> courseCounsums = paymentClient.getConsumes(requestVo);
+
+ for (CourseCounsum courseCounsum : courseCounsums) {
+ ConsumeDetail consumeDetail = new ConsumeDetail();
+ String[] split = courseCounsum.getReason().split(";");
+ consumeDetail.setConsumeName(split[0]);
+ consumeDetail.setConsumeTime(simpleDateFormat.format(courseCounsum.getInsertTime()));
+// if (courseCounsum.getChangeType()==3){
+ consumeDetail.setConsumeAmount("-" + split[1]);
consumeDetail.setType(2);
- details.add(consumeDetail);
- }
+// }
+//
+// consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
+// consumeDetail.setType(2);
+ details.add(consumeDetail);
}
+
+
// 4.场地预约
RequestOfTypeVo allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())){
@@ -758,13 +824,23 @@
consumeDetail.setConsumeAmount("-" + booking.getAmount());
consumeDetail.setConsumeTime(booking.getTime());
consumeDetail.setType(2);
+ details.add(consumeDetail);
}else {
- consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeAmount("+" + booking.getAmount());
- consumeDetail.setConsumeTime(booking.getTime());
- consumeDetail.setType(1);
+ ConsumeDetail consumeDetail1 = new ConsumeDetail();
+ consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
+ consumeDetail1.setConsumeAmount("+" + booking.getAmount());
+ consumeDetail1.setConsumeTime(booking.getTime());
+ consumeDetail1.setType(1);
+ details.add(consumeDetail1);
+ ConsumeDetail consumeDetail2 = new ConsumeDetail();
+ consumeDetail2.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
+ consumeDetail2.setConsumeAmount("-" + booking.getAmount());
+ consumeDetail2.setConsumeTime(booking.getTime1());
+ consumeDetail2.setType(2);
+ details.add(consumeDetail2);
+
}
- details.add(consumeDetail);
+// details.add(consumeDetail);
}
}
@@ -792,13 +868,20 @@
if (rechargeRecords.size() > 0) {
for (RechargeRecords rechargeRecord : rechargeRecords) {
ConsumeDetail consumeDetail = new ConsumeDetail();
- consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins());
+ consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins()+"币");
consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount());
consumeDetail.setType(2);
details.add(consumeDetail);
}
}
+
+ //8.积分商场
+
+ List<ConsumeDetail> consumeDetails = mcClient.getConsumeDetails(requestVo);
+ details.addAll(consumeDetails);
+
+
if (details.size() > 0 ){
Collections.sort(details, new Comparator<ConsumeDetail>() {
@Override
@@ -882,6 +965,7 @@
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
commodity.setGoodsType(1);
+ commodity.setUseScope(vicinityGood.getUseScope());
commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
List<Integer> integers = mcsClient.queryPointMerStoreIds(vicinityGood.getId());
commodity.setShopIds(integers);
@@ -889,7 +973,8 @@
case 2:
commodity.setGoodId(vicinityGood.getId());
CoursePackage coursePackage = cpageClient.queryCoursePackageById(vicinityGood.getCoursePackageId());
- commodity.setGoodImg(coursePackage.getCoverDrawing());
+// commodity.setGoodImg(coursePackage.getCoverDrawing());
+ commodity.setGoodImg(vicinityGood.getCover());
commodity.setGoodName(coursePackage.getName());
commodity.setCondition(vicinityGood.getRedemptionMethod());
if (vicinityGood.getRedemptionMethod() == 1) {
@@ -900,6 +985,8 @@
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
commodity.setGoodsType(2);
+ commodity.setUseScope(vicinityGood.getUseScope());
+
commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
break;
@@ -907,6 +994,8 @@
commodity.setGoodId(vicinityGood.getId());
commodity.setGoodName(vicinityGood.getName());
commodity.setGoodImg(vicinityGood.getCover());
+ commodity.setUseScope(vicinityGood.getUseScope());
+
commodity.setCondition(vicinityGood.getRedemptionMethod());
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
@@ -937,7 +1026,9 @@
if (allCoupon.getRedemptionMethod() == 1) {
commodity.setIntegral(allCoupon.getIntegral().intValue());
} else {
- commodity.setIntegral(allCoupon.getIntegral().intValue());
+ if (allCoupon.getIntegral()!=null) {
+ commodity.setIntegral(allCoupon.getIntegral().intValue());
+ }
commodity.setAmount(allCoupon.getCash());
}
commodity.setBelongsType(allCoupon.getUserPopulation());
@@ -960,7 +1051,7 @@
if (request.getShopId()!=null){
if (goods.size() > 0 ){
goods = goods.stream()
- .filter( merchandise ->(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 1)||merchandise.getShopIds().contains(request.getShopId()))
+ .filter( merchandise ->(merchandise.getGoodsType() == 1&&merchandise.getUseScope() == 2)||(merchandise.getGoodsType() == 1&&merchandise.getUseScope() == 1)||(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 2)||(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 1)||merchandise.getShopIds().contains(request.getShopId()))
.collect(Collectors.toList());
}
}
@@ -1089,7 +1180,8 @@
String provinceCode = geocode.get("provinceCode");
String city = geocode.get("city");
String cityCode = geocode.get("cityCode");
- num = introduceRewardsClient.getGiftList(cityCode);
+ IntroduceRewards giftList = introduceRewardsClient.getGiftList(cityCode);
+ num = giftList.getGiveClass();
}
Integer userId=null;
if(ToolUtil.isNotEmpty(dto.getInvitePhone())){
@@ -1142,6 +1234,11 @@
}
@Override
+ public List<QueryAppUserVO> listAll1(QueryAppUser query) {
+ return appUserMapper.listAll1(query);
+ }
+
+ @Override
public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis,Integer pointsMerId, String lat, String lon,Integer isCourse) {
StuAndStoreResponse response = new StuAndStoreResponse();
if (isCourse == 1){
@@ -1190,9 +1287,13 @@
@Override
@Transactional
- public ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
+ public synchronized ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
System.out.println("exchangeType:--->");
+
+
+ ReturnModel returnModel = new ReturnModel();
+ Long returnId = null;
//如果是兑换优惠卷
if (exchangeType.getGoodsType()==4){
//查询优惠卷
@@ -1211,10 +1312,6 @@
if (usercounts == coupon.getPickUpQuantity()){
return new ResultUtil<>(0,"限领数量已达最大");
}
-
-
-
-
// userConponClient.queryCouponById(exchangeType.getGoodId());
UserCoupon userCoupon = new UserCoupon();
userCoupon.setCouponId(exchangeType.getGoodId());
@@ -1222,19 +1319,33 @@
userCoupon.setStatus(1);
userCoupon.setInsertTime(new Date());
userConponClient.insertToAppuserCoupon(userCoupon);
-
-
//扣积分
TAppUser user = appUserService.getById(userIdFormRedis);
if (user.getIntegral()<coupon.getIntegral().intValue()){
return new ResultUtil<>(0,"当前用户积分不足");
}
-
user.setIntegral(user.getIntegral()-coupon.getIntegral().intValue());
-
appUserService.updateById(user);
- return ResultUtil.success();
+ //记录
+// UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
+// pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
+// pointsMerchandise.setUserId(userIdFormRedis);
+// pointsMerchandise.setStatus(1);
+// pointsMerchandise.setState(1);
+// pointsMerchandise.setPayStatus(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);
+// returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+
+ return ResultUtil.success(returnId);
}
@@ -1245,6 +1356,10 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
+
+
+
+
if (ToolUtil.isEmpty(merchandise)){
return ResultUtil.error("商品不存在");
}
@@ -1273,11 +1388,20 @@
}else {
goodsNums = exchangeType.getNums();
}
+
+ TAppUser user = appUserService.getById(userIdFormRedis);
+ if (merchandise.getIntegral()!=null) {
+ if (user.getIntegral() < merchandise.getIntegral().intValue() * goodsNums) {
+ return new ResultUtil<>(0, "当前用户积分不足");
+ }
+
+ }
+
AppUserGoodResp goodResp = new AppUserGoodResp();
goodResp.setAppUserId(userIdFormRedis);
goodResp.setGoodId(merchandise.getId());
int count = mcClient.queryUserHasGoodsNums(goodResp);
- if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
+ if (ToolUtil.isNotEmpty(count) && count+exchangeType.getNums() > merchandise.getPickUpQuantity()){
return ResultUtil.error("超过限领数量");
}
int count1 = mcClient.queryUserHasGoodsNums1(goodResp);
@@ -1285,14 +1409,26 @@
return ResultUtil.error("超过发放数量");
}
+
+
+
for (int i = 0; i < goodsNums; i++) {
// 新增积分商品兑换记录
UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
pointsMerchandise.setUserId(userIdFormRedis);
- pointsMerchandise.setStatus(1);
+ if (exchangeType.getGoodsType()==2){
+ pointsMerchandise.setStatus(2);
+ pointsMerchandise.setVerificationTime(new Date());
+ }else {
+ pointsMerchandise.setStatus(1);
+ }
pointsMerchandise.setState(1);
- pointsMerchandise.setPayStatus(1);
+ if (exchangeType.getExchangeType()==1) {
+ pointsMerchandise.setPayStatus(2);
+ }else {
+ pointsMerchandise.setPayStatus(1);
+ }
if (merchandise.getUseScope() == 3){
if (exchangeType.getGoodsType() == 2){
CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
@@ -1302,13 +1438,16 @@
}
}
pointsMerchandise.setCode(code);
- mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+ returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
}
switch (exchangeType.getExchangeType()){
// 积分
case 1:
- boolean b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
+ boolean b =true;
+ for (int i = 0; i < goodsNums; i++) {
+ b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
+ }
if (b){
switch (exchangeType.getGoodsType()){
case 2:
@@ -1341,7 +1480,17 @@
packagePayment.setStatus(1);
packagePayment.setState(1);
packagePayment.setCode(code);
- paymentClient.savePaymentCoursePackage(packagePayment);
+// paymentClient.savePaymentCoursePackage(packagePayment);
+
+ OrderDto orderDto = new OrderDto();
+ orderDto.setAppUserId(userIdFormRedis);
+ String joinedString = String.join(",", exchangeType.getStuIds().stream().map(Object::toString).collect(Collectors.toList()));
+ orderDto.setStuIds(joinedString);
+ orderDto.setClassId(merchandise.getCoursePackageId());
+ orderDto.setClassHours(packagePayment.getClassHours());
+ paymentClient.orderClass(orderDto);
+
+
}
break;
case 4:
@@ -1362,7 +1511,11 @@
break;
case 2:
// 积分+现金
- boolean dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
+ boolean dealt =true;
+ for (int i = 0; i < goodsNums; i++) {
+ dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
+ }
+
switch (exchangeType.getPayType()) {
case 1:
try {
@@ -1376,9 +1529,9 @@
}
case 2:
if (merchandise.getType() == 2) {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,returnId);
} else {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,returnId);
}
default:
break;
@@ -1398,9 +1551,9 @@
}
case 2:
if (merchandise.getType() == 2) {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,returnId);
} else {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,returnId);
}
default:
break;
@@ -1410,9 +1563,8 @@
break;
}
-
-
- return ResultUtil.success();
+ returnModel.setReturnId(returnId);
+ return ResultUtil.success(returnModel);
}catch (Exception e){
e.printStackTrace();
return null;
@@ -1429,7 +1581,7 @@
UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
userIntegralChanges.setAppUserId(appUserId);
userIntegralChanges.setOldIntegral(appUser.getIntegral());
- userIntegralChanges.setType(2);
+ userIntegralChanges.setType(5);
appUser.setIntegral(null == appUser.getIntegral() ? points : appUser.getIntegral() - points);
userIntegralChanges.setNewIntegral(appUser.getIntegral());
userIntegralChanges.setInsertTime(new Date());
@@ -1443,9 +1595,9 @@
}
}
- private ResultUtil AlipayPayment(BigDecimal cash, String code) {
+ private ResultUtil AlipayPayment(BigDecimal cash, String code,Long returnId) {
System.out.println("金额："+cash);
- ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, cash.toString(),
+ ResultUtil alipay = payMoneyUtil.alipay("优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
"/base/pointMer/exchangeGoodPaymentAliCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
@@ -1480,20 +1632,24 @@
String tradeNo = resultUtil.getTradeNo();
String tradeStatus = resultUtil.getTradeStatus();
System.out.println("ssssss"+tradeStatus);
- if("REFUND".equals(tradeStatus) || "NOTPAY".equals(tradeStatus) || "CLOSED".equals(tradeStatus) || "REVOKED".equals(tradeStatus) || "PAYERROR".equals(tradeStatus) || num == 10){
- mcClient.deletePaymentRecord(code);
- break;
- }
+
if("TRADE_SUCCESS".equals(tradeStatus)){
for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
userPointsMerchandise.setPayStatus(2);
userPointsMerchandise.setOrderNumber(tradeNo);
userPointsMerchandise.setPayType(2);
+ userPointsMerchandise.setInsertTime(null);
+ userPointsMerchandise.setUserId(null);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
}
moneyOut(tradeNo,tradeNo);
break;
}
+// if("REFUND".equals(tradeStatus) || "NOTPAY".equals(tradeStatus) || "CLOSED".equals(tradeStatus) || "REVOKED".equals(tradeStatus) || "PAYERROR".equals(tradeStatus) || num == 10){
+// mcClient.deletePaymentRecord(code);
+// break;
+// }
+
if("WAIT_BUYER_PAY".equals(tradeStatus)){
num++;
}
--
Gitblit v1.7.1