From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 189 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 145 insertions(+), 44 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 b1a0865..44f4d18 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;
@@ -284,8 +282,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<>();
@@ -302,7 +301,6 @@
course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
courseList.add(course);
}
-
}
classInfoVo.setCourseList(courseList);
// List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
@@ -597,6 +595,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 +674,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 +687,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;
@@ -748,6 +753,26 @@
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);
+// }
+//
+// consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
+// consumeDetail.setType(2);
+ details.add(consumeDetail);
+ }
+
+
// 4.场地预约
RequestOfTypeVo allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())){
@@ -758,13 +783,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(1);
+ details.add(consumeDetail2);
+
}
- details.add(consumeDetail);
+// details.add(consumeDetail);
}
}
@@ -799,6 +834,13 @@
details.add(consumeDetail);
}
}
+
+ //8.积分商场
+
+ List<ConsumeDetail> consumeDetails = mcClient.getConsumeDetails(requestVo);
+ details.addAll(consumeDetails);
+
+
if (details.size() > 0 ){
Collections.sort(details, new Comparator<ConsumeDetail>() {
@Override
@@ -889,7 +931,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) {
@@ -1142,6 +1185,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 +1238,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 +1263,6 @@
if (usercounts == coupon.getPickUpQuantity()){
return new ResultUtil<>(0,"限领数量已达最大");
}
-
-
-
-
// userConponClient.queryCouponById(exchangeType.getGoodId());
UserCoupon userCoupon = new UserCoupon();
userCoupon.setCouponId(exchangeType.getGoodId());
@@ -1222,19 +1270,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 +1307,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,17 +1339,27 @@
}else {
goodsNums = exchangeType.getNums();
}
+
+ TAppUser user = appUserService.getById(userIdFormRedis);
+ 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);
if (ToolUtil.isNotEmpty(count1) && count1 >= merchandise.getQuantityIssued()){
return ResultUtil.error("超过发放数量");
}
+
+
+
for (int i = 0; i < goodsNums; i++) {
// 新增积分商品兑换记录
@@ -1292,7 +1368,11 @@
pointsMerchandise.setUserId(userIdFormRedis);
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 +1382,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 +1424,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 +1455,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 +1473,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 +1495,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,8 +1507,8 @@
break;
}
-
- return ResultUtil.success();
+ returnModel.setReturnId(returnId);
+ return ResultUtil.success(returnModel);
}catch (Exception e){
e.printStackTrace();
return null;
@@ -1428,7 +1525,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());
@@ -1442,9 +1539,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() {
@@ -1479,20 +1576,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