From cdd29e40b2cd26c5a4b405adc25cfe3711794bf6 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期五, 14 七月 2023 18:29:29 +0800 Subject: [PATCH] 筛选出剩余未处理的接口 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 466 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 444 insertions(+), 22 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 474ce21..96b94e1 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 @@ -3,30 +3,25 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dsh.account.entity.RechargeRecords; -import com.dsh.account.entity.TAppUser; -import com.dsh.account.entity.TStudent; -import com.dsh.account.entity.VipPayment; +import com.dsh.account.entity.*; import com.dsh.account.enums.RechargeRecordEnum; 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.CommodityRequest; -import com.dsh.account.feignclient.activity.model.PointsMerchandise; +import com.dsh.account.feignclient.activity.model.*; +import com.dsh.account.feignclient.competition.DeductionCompetitionsClient; +import com.dsh.account.feignclient.competition.model.PaymentCompetition; 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.model.CourseOfStoreVo; -import com.dsh.account.feignclient.course.model.CoursePackage; -import com.dsh.account.feignclient.course.model.QueryStoreList; -import com.dsh.account.feignclient.course.model.StuCourseResp; +import com.dsh.account.feignclient.course.model.*; import com.dsh.account.feignclient.other.ImgConfigClient; import com.dsh.account.feignclient.other.RechargeConfigClient; import com.dsh.account.feignclient.other.StoreClient; import com.dsh.account.feignclient.other.model.Store; +import com.dsh.account.feignclient.other.model.StoreDetailOfCourse; import com.dsh.account.feignclient.other.model.TImgConfig; -import com.dsh.account.mapper.RechargeRecordsMapper; -import com.dsh.account.mapper.TAppUserMapper; -import com.dsh.account.mapper.TStudentMapper; -import com.dsh.account.mapper.VipPaymentMapper; +import com.dsh.account.mapper.*; import com.dsh.account.model.AddAppUserVo; import com.dsh.account.model.JoinPlayPaiVo; import com.dsh.account.model.LoginSMSCodeVo; @@ -45,8 +40,12 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -107,6 +106,21 @@ @Resource private CoursePackageClient cpageClient; + + @Resource + private DeductionCompetitionsClient deducClient; + + @Resource + private UserIntegralChangesMapper uicMapper; + + @Resource + private MerChandiseStoreClient mcsClient; + + @Resource + private CoursePackageConfigClient cpconClient; + + @Autowired + private PayMoneyUtil payMoneyUtil; @Override public ClassInfoVo queryUserOfStus(Integer id,String latitude,String longitude) { @@ -419,7 +433,7 @@ @Override public JoinPlayPaiVo queryJoinPlayPai(Integer uid, String lon, String lat) throws Exception { TAppUser appUser = this.getById(uid); - if(ToolUtil.isEmpty(appUser.getProvince()) && ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){ + if(ToolUtil.isEmpty(appUser.getProvince()) && ToolUtil.isNotEmpty(lon)){ Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat); if(null != geocode){ String province = geocode.get("province"); @@ -460,6 +474,7 @@ joinPlayPaiVo.setLon(s.getLon()); joinPlayPaiVo.setLat(s.getLat()); joinPlayPaiVo.setStoreId(s.getId()); + joinPlayPaiVo.setPhone(s.getPhone()); } return joinPlayPaiVo; } @@ -497,11 +512,43 @@ monthEnd = DateTimeHelper.getCurrentMouthEnd(); } // 1.赛事报名 -// 2.课包购买 + List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(appUserId); + if (allCompetitionPayRecord.size() > 0 ){ + for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) { + BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); + consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg()); + consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime())); + consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount()); + details.add(consumeDetail); + } + } +// 2.取消赛事报名 + List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(appUserId); + if (cancelOrderOfUserPayRecord.size() > 0 ){ + for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) { + BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); + consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg()); + consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime())); + consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount()); + details.add(consumeDetail); + } + } +// 3.课包购买 + List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(appUserId); + if (amountPayRecord.size() > 0 ){ + for (TCoursePackagePayment coursePackagePayment : amountPayRecord) { + BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); + consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg()); + consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime())); + consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment()); + details.add(consumeDetail); + } + } +// 4.场地预约 + // TODO: 2023/7/14 账单的场地预约查询 -// 3.场地预约 -// 4.智慧球场 -// 5.年度会员 +// 5.智慧球场 +// 6.年度会员 List<VipPayment> vipPayments = vipPaymentMapper.selectList(new QueryWrapper<VipPayment>() .eq("payStatus", 2) .eq("appUserId", appUserId) @@ -511,11 +558,10 @@ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg()); consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime())); - consumeDetail.setConsumeAmount("+" + vipPayment.getAmount()); + consumeDetail.setConsumeAmount("-" + vipPayment.getAmount()); details.add(consumeDetail); } } -// 6.续课 // 7.充值 List<RechargeRecords> rechargeRecords = rrMapper.selectList(new QueryWrapper<RechargeRecords>() .eq("payStatus", 2) @@ -526,7 +572,7 @@ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + ":" + rechargeRecord.getPlayPaiCoins()); consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime())); - consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount()); + consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount()); details.add(consumeDetail); } } @@ -690,4 +736,380 @@ return detailsResponse; } + @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(); + } + + @Override + public ProductDetailsVo productDetails(Integer goodId, Integer goodsType ) { + ProductDetailRequest detailsVo = new ProductDetailRequest(); + detailsVo.setGoodsType(goodsType); + detailsVo.setGoodId(goodId); + return mcClient.getGoodDetailsWithId(detailsVo); + } + + @Override + public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis,Integer pointsMerId, String lat, String lon,Integer isCourse) { + StuAndStoreResponse response = new StuAndStoreResponse(); + if (isCourse == 1){ + List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>() + .eq("appUserId",userIdFormRedis) + .eq("state",1) + .eq("isDefault",1)); + if (tStudents.size() > 0 ){ + response.setStuId(tStudents.get(0).getId()); + response.setStuName(tStudents.get(0).getName()); + response.setStuPhone(tStudents.get(0).getPhone()); + response.setStuAge(DateUtil.age(tStudents.get(0).getBirthday())); + } + return response; + }else { + PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerId); + if (pointsMerchandise.getType() == 4){ + List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId); + StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreIds.get(0)); + if(ToolUtil.isNotEmpty(courseOfStore)){ + response.setStoreId(couponStoreIds.get(0)); + response.setStoreName(courseOfStore.getStoreName()); + } + }else { + List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId); + StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integers.get(0)); + if(ToolUtil.isNotEmpty(courseOfStore)){ + response.setStoreId(integers.get(0)); + response.setStoreName(courseOfStore.getStoreName()); + } + } + return response; + } + } + + @Override + public ResultUtil productRedemptionOperation(Integer userIdFormRedis, Integer goodId, Integer goodsType,Integer nums,Integer exchangeType,Integer payType,List<Integer> stuIds) { + PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(goodId); + 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); + } + +// 扣减积分 + 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); + + 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; + } + } + 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; + } + + 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; + } + } + + return ResultUtil.success(); + } + + + private ResultUtil AlipayPayment(BigDecimal cash, String code) { + ResultUtil alipay = payMoneyUtil.alipay("课包续费", "", "", code, cash.toString(), + "/base/pointMer/exchangeGoodPaymentAliCallback"); + if(alipay.getCode() == 200){ + new Thread(new Runnable() { + @Override + public void run() { + try { + int num = 1; + int wait = 0; + while (num <= 10){ + int min = 5000; + wait += (min * num); + Thread.sleep(wait); + List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code); + if(userPointsMerchandises.get(0).getPayStatus() == 2){ + break; + } + ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code); + if(resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1){ + /** + * WAIT_BUYER_PAY(交易创建,等待买家付款)、 + * TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、 + * TRADE_SUCCESS(交易支付成功)、 + * TRADE_FINISHED(交易结束,不可退款) + */ + Map<String, String> data1 = resultUtil.getData(); + String s = data1.get("tradeStatus"); + String tradeNo = data1.get("tradeNo"); +// if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){ +// coursePackagePayment.setState(3); +// couPayClient.delPaymentCoursePackage(coursePackagePayment.getId()); +// break; +// } + if("TRADE_SUCCESS".equals(s)){ + for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) { + userPointsMerchandise.setPayStatus(2); + userPointsMerchandise.setOrderNumber(tradeNo); + userPointsMerchandise.setPayType(2); + mcClient.updateDetailsUserPointMercase(userPointsMerchandise); + } + break; + } + if("WAIT_BUYER_PAY".equals(s)){ + num++; + } + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + }).start(); + } + return alipay; + } + + private ResultUtil WechatPayment(BigDecimal cash, String code) throws Exception { + ResultUtil weixinpay = payMoneyUtil.weixinpay("课包", "", code, cash.toString(), + "/base/pointMer/exchangeGoodPaymentWeChatCallback", "APP", ""); + if(weixinpay.getCode() == 200){ + new Thread(new Runnable() { + @Override + public void run() { + try { + int num = 1; + int wait = 0; + while (num <= 10){ + int min = 5000; + wait += (min * num); + Thread.sleep(wait); + List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code); + if(userPointsMerchandises.get(0).getPayStatus() == 2){ + break; + } + ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, ""); + if(resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1){ + /** + * SUCCESS—支付成功, + * REFUND—转入退款, + * NOTPAY—未支付, + * CLOSED—已关闭, + * REVOKED—已撤销(刷卡支付), + * USERPAYING--用户支付中, + * PAYERROR--支付失败(其他原因,如银行返回失败) + */ + 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("SUCCESS".equals(s)){ + for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) { + userPointsMerchandise.setPayStatus(2); + userPointsMerchandise.setOrderNumber(transaction_id); + userPointsMerchandise.setPayType(1); + mcClient.updateDetailsUserPointMercase(userPointsMerchandise); + } + break; + } + if("USERPAYING".equals(s)){ + num++; + } + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + }).start(); + } + return weixinpay; + } + + @Override + public ResultUtil exchangeAddPaymentCallback(String code, String orderNumber,Integer payType) { + List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code); + if (userPointsMerchandises.size() > 1){ + for (int i = 0; i < userPointsMerchandises.size(); i++) { + userPointsMerchandises.get(i).setOrderNumber(orderNumber+ "-" + (i+1)); + userPointsMerchandises.get(i).setPayType(payType); + userPointsMerchandises.get(i).setPayStatus(2); + mcClient.updateDetailsUserPointMercase(userPointsMerchandises.get(i)); + + Integer pointsMerchandiseId = userPointsMerchandises.get(i).getPointsMerchandiseId(); + PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId); + switch (pointsMerchandise.getType()){ + case 2: + List<TCoursePackagePayment> coursePackagePaymentOfCode = paymentClient.getCoursePackagePaymentOfCode(code); + for (TCoursePackagePayment coursePackagePayment : coursePackagePaymentOfCode) { + coursePackagePayment.setPayStatus(2); + coursePackagePayment.setPayType(payType); + coursePackagePayment.setOrderNumber(orderNumber); + coursePackagePayment.setCashPayment(pointsMerchandise.getCash()); + paymentClient.updatePaymentCoursePackage(coursePackagePayment); + } + break; + case 4: + UserCoupon coupon = new UserCoupon(); + coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId()); + coupon.setUserId(userPointsMerchandises.get(0).getUserId()); + coupon.setStatus(1); + coupon.setInsertTime(new Date()); + ucponClient.insertToAppuserCoupon(coupon); + break; + default: + break; + } + } + }else { + userPointsMerchandises.get(0).setOrderNumber(orderNumber); + userPointsMerchandises.get(0).setPayType(payType); + userPointsMerchandises.get(0).setPayStatus(2); + mcClient.updateDetailsUserPointMercase(userPointsMerchandises.get(0)); + + Integer pointsMerchandiseId = userPointsMerchandises.get(0).getPointsMerchandiseId(); + PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId); + switch (pointsMerchandise.getType()){ + case 2: + List<TCoursePackagePayment> coursePackagePaymentOfCode = paymentClient.getCoursePackagePaymentOfCode(code); + + TCoursePackagePayment packagePayment =coursePackagePaymentOfCode.get(0); + packagePayment.setPayStatus(2); + packagePayment.setPayType(payType); + packagePayment.setOrderNumber(orderNumber); + packagePayment.setCashPayment(pointsMerchandise.getCash()); + paymentClient.updatePaymentCoursePackage(packagePayment); + break; + case 4: + UserCoupon coupon = new UserCoupon(); + coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId()); + coupon.setUserId(userPointsMerchandises.get(0).getUserId()); + coupon.setStatus(1); + coupon.setInsertTime(new Date()); + ucponClient.insertToAppuserCoupon(coupon); + break; + default: + break; + } + + } + return ResultUtil.success(); + } + + @Override + public List<StoreResponse> queryStoresOfExchange(Integer goodsType,Integer pointsMerId) { + 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); + } + } + }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); + } + } + } + return responses; + } + + } -- Gitblit v1.7.1