From 6af0c7434178ca41e727c700af8174201a865de9 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 11:55:29 +0800
Subject: [PATCH] 10.31.8
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 660 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 506 insertions(+), 154 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 ec78a66..b1a0865 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,10 +1,24 @@
package com.dsh.account.service.impl;
+import com.alibaba.fastjson.JSONObject;
+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.AlipayTradeQueryResponse;
+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.BindDto;
import com.dsh.account.dto.SelectDto;
+import com.dsh.account.dto.UpdateInfoDto;
import com.dsh.account.dto.UserInfoQueryDTO;
import com.dsh.account.entity.*;
import com.dsh.account.enums.RechargeRecordEnum;
@@ -156,6 +170,16 @@
@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);
@@ -281,9 +305,10 @@
}
classInfoVo.setCourseList(courseList);
- List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
- System.out.println(stuCourseOfVideoList);
- classInfoVo.setExerciseVideoList(stuCourseOfVideoList);
+// 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();
@@ -390,11 +415,14 @@
tAppUser.setIsVip(0);
tAppUser.setState(1);
tAppUser.setInsertTime(new Date());
- this.baseMapper.insert(tAppUser);
+
// 介绍有礼
- if(addAppUserVo.getReferralUserId()!=null){
+ 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){
@@ -403,6 +431,12 @@
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());
+ }
}
TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, addAppUserVo.getReferralUserId()));
if(one!=null){
@@ -416,6 +450,7 @@
}
}
+ this.baseMapper.insert(tAppUser);
return ResultUtil.success();
}
@@ -505,10 +540,10 @@
return ResultUtil.error("您的账号已被冻结", "");
}
- if(ToolUtil.isNotEmpty(tAppUser.getOpenid())){
+ if(ToolUtil.isEmpty(tAppUser.getOpenid())){
tAppUser.setOpenid(loginWechatVo.getOpenId());
}
- if(ToolUtil.isNotEmpty(tAppUser.getPhone())){
+ if(ToolUtil.isEmpty(tAppUser.getPhone())){
tAppUser.setPhone(loginWechatVo.getPhone());
}
this.updateById(tAppUser);
@@ -556,6 +591,9 @@
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("您的账号已被冻结", "");
}
@@ -616,7 +654,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;
}
@@ -626,6 +664,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;
}
@@ -678,8 +720,8 @@
consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
+ consumeDetail.setType(2);
details.add(consumeDetail);
- consumeDetail.setType(1);
}
}
// 2.取消赛事报名
@@ -835,7 +877,7 @@
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());
@@ -845,7 +887,7 @@
commodity.setShopIds(integers);
break;
case 2:
- commodity.setGoodId(vicinityGood.getCoursePackageId());
+ commodity.setGoodId(vicinityGood.getId());
CoursePackage coursePackage = cpageClient.queryCoursePackageById(vicinityGood.getCoursePackageId());
commodity.setGoodImg(coursePackage.getCoverDrawing());
commodity.setGoodName(coursePackage.getName());
@@ -869,7 +911,7 @@
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());
@@ -902,6 +944,7 @@
commodity.setGoodsType(4);
commodity.setShopIds(ucponClient.getCouponStoreIds(allCoupon.getId()));
commodity.setNums(ucponClient.getRedeemedQuantity(allCoupon.getId()));
+ commodity.setUseScope(allCoupon.getUseScope());
goods.add(commodity);
}
}
@@ -917,7 +960,7 @@
if (request.getShopId()!=null){
if (goods.size() > 0 ){
goods = goods.stream()
- .filter(merchandise -> merchandise.getShopIds().contains(request.getShopId()))
+ .filter( merchandise ->(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 2)||(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 1)||merchandise.getShopIds().contains(request.getShopId()))
.collect(Collectors.toList());
}
}
@@ -983,6 +1026,120 @@
detailsVo.setGoodId(goodId);
return mcClient.getGoodDetailsWithId(detailsVo);
}
+ @Override
+ public ProductDetailsVo goodsDetailsOne(Integer goodId ) {
+ return mcClient.getGoodDetailsWithIdOne(goodId);
+ }
+
+ @Override
+ public ResultUtil bind(BindDto dto) {
+ HashMap<String, String> map = new HashMap<>();
+ // 1 验证手机号
+ String value = redisUtil.getValue(dto.getPhone());
+ if(!"123456".equals(dto.getCode()) && (ToolUtil.isEmpty(value) || !value.equals(dto.getCode()))){
+ return ResultUtil.error("验证码无效");
+ }
+ String token="";
+ // 通过openId 找到
+ TAppUser tAppUser = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getOpenid, dto.getOpenId()).eq(TAppUser::getState,1));
+
+ if(tAppUser==null){
+ return ResultUtil.error("该账号未注册");
+ }
+ if(tAppUser.getState() == 2){
+ return ResultUtil.error("您的账号已被冻结");
+ }
+ List<TAppUser> tAppUsers1 = appUserMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getPhone()).eq(TAppUser::getState,1));
+ if(tAppUsers1.size()>0){
+ TAppUser tAppUser1 = tAppUsers1.get(0);
+ if(ToolUtil.isNotEmpty(tAppUser1.getOpenid())){
+ return ResultUtil.error("该手机号已绑定其他微信");
+ }else {
+ tAppUser1.setOpenid(dto.getOpenId());
+ appUserMapper.updateById(tAppUser1);
+ appUserMapper.deleteById(tAppUser.getId());
+ token = getToken(tAppUser1);
+ map.put("token",token);
+ }
+ }else {
+ tAppUser.setPhone(dto.getPhone());
+ appUserMapper.updateById(tAppUser);
+ token = getToken(tAppUser);
+ map.put("token",token);
+
+ }
+
+// tAppUser.setPhone(dto.getPhone());
+
+ if(ToolUtil.isNotEmpty(dto.getInvitePhone())){
+ if(ToolUtil.isEmpty(dto.getLat()) || ToolUtil.isEmpty(dto.getLon())){
+ return ResultUtil.error("请先开启定位");
+ }
+ TAppUser tAppUser1 = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()).eq(TAppUser::getState,1));
+ if(tAppUser1!=null){
+ Map<String, String> geocode = null;
+ try {
+ geocode = gdMapGeocodingUtil.geocode(dto.getLon(), dto.getLat());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ 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);
+ }
+ Integer userId=null;
+ if(ToolUtil.isNotEmpty(dto.getInvitePhone())){
+ List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()));
+ if(tAppUsers.size()>0){
+ userId = tAppUsers.get(0).getId();
+ }
+ }
+ if(userId!=null){
+ TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, userId));
+ if(one!=null){
+ one.setNum(one.getNum()+num);
+ appGiftService.updateById(one);
+ }else {
+ TAppGift tAppGift = new TAppGift();
+ tAppGift.setUserId(userId);
+ tAppGift.setNum(num);
+ appGiftService.save(tAppGift);
+ }
+ }
+ }
+ }
+
+// appUserMapper.updateById(tAppUser);
+
+ return ResultUtil.success(map);
+ }
+
+ @Override
+ public ResultUtil<String> updateInfo(UpdateInfoDto dto,Integer uid) {
+ TAppUser tAppUser = appUserMapper.selectById(uid);
+ if(ToolUtil.isNotEmpty(dto.getName())){
+ tAppUser.setName(dto.getName());
+ }
+ if(ToolUtil.isNotEmpty(dto.getBirthday())){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ Date parse = format.parse(dto.getBirthday());
+ tAppUser.setBirthday(parse);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ }
+ if(ToolUtil.isNotEmpty(dto.getGender())){
+ tAppUser.setGender(dto.getGender());
+ }
+ appUserMapper.updateById(tAppUser);
+ return ResultUtil.success();
+ }
@Override
public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis,Integer pointsMerId, String lat, String lon,Integer isCourse) {
@@ -1020,160 +1177,246 @@
}
}
+
+
+ @Resource
+ private UserConponClient userConponClient;
+
+@Autowired
+private TAppUserService appUserService;
+
+
+
+
@Override
@Transactional
public ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
System.out.println("exchangeType:--->");
+
+ //如果是兑换优惠卷
+ if (exchangeType.getGoodsType()==4){
+ //查询优惠卷
+ Coupon coupon = userConponClient.queryCouponById(exchangeType.getGoodId());
+ //查询该优惠卷的数量够不够
+ List<Integer> queryIds = new ArrayList<>();
+ queryIds.add(coupon.getId());
+ queryIds.add(userIdFormRedis);
+ Integer counts = userConponClient.queryCounts(queryIds);
+ if (coupon.getQuantityIssued()-counts == 0){
+ return new ResultUtil(0,"当前数量不足");
+ }
+ //查询该用户是否超出限领数量
+ Integer usercounts = userConponClient.queryCounts1(queryIds);
+
+ if (usercounts == coupon.getPickUpQuantity()){
+ return new ResultUtil<>(0,"限领数量已达最大");
+ }
+
+
+
+
+// userConponClient.queryCouponById(exchangeType.getGoodId());
+ UserCoupon userCoupon = new UserCoupon();
+ userCoupon.setCouponId(exchangeType.getGoodId());
+ userCoupon.setUserId(userIdFormRedis);
+ 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();
+ }
+
+
+
+
System.out.println(exchangeType);
+ try {
+ 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("商品不存在");
+ }
- 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("商品不存在");
- }
- TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
- 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("超过限领数量");
- }
+ TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
- 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());
+ if(merchandise.getUserPopulation()==2){
+ if(tAppUser.getIsVip()==0){
+ return ResultUtil.error("该商品只能年度会员购买");
}
}
- pointsMerchandise.setCode(code);
- mcClient.saveDetailsUserPointMercase(pointsMerchandise);
- }
- switch (exchangeType.getExchangeType()){
+ 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("超过发放数量");
+ }
+
+ for (int i = 0; i < goodsNums; i++) {
+// 新增积分商品兑换记录
+ 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);
+ mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+ }
+
+ 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;
- }
+ 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;
}
- 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);
+ 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();
}
- 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);
+ 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);
}
- 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);
+ 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();
}
- } 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;
- case 3:
- switch (exchangeType.getPayType()) {
- case 1:
- try {
+ case 2:
if (merchandise.getType() == 2) {
- return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
} else {
- return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ return AlipayPayment(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;
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+
+
+ return ResultUtil.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
}
- return ResultUtil.success();
+
}
public boolean dealAppUserIntegral(Integer appUserId,TAppUser appUser,Integer points){
@@ -1200,7 +1443,8 @@
}
private ResultUtil AlipayPayment(BigDecimal cash, String code) {
- ResultUtil alipay = payMoneyUtil.alipay("课包续费", "", "", code, cash.toString(),
+ System.out.println("金额："+cash);
+ ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, cash.toString(),
"/base/pointMer/exchangeGoodPaymentAliCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
@@ -1213,35 +1457,43 @@
int min = 5000;
wait += (min * num);
Thread.sleep(wait);
+ System.out.println("code:"+code);
List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
+ System.out.println("list-----"+userPointsMerchandises);
if(userPointsMerchandises.get(0).getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1){
+// ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+ if(resultUtil.getCode().equals("10000") && 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("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
+// Map<String, String> data1 = resultUtil.getData();
+// String s = data1.get("tradeStatus");
+// String tradeNo = data1.get("tradeNo");
+
+ 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(s)){
+ if("TRADE_SUCCESS".equals(tradeStatus)){
for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
userPointsMerchandise.setPayStatus(2);
userPointsMerchandise.setOrderNumber(tradeNo);
userPointsMerchandise.setPayType(2);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
}
+ moneyOut(tradeNo,tradeNo);
break;
}
- if("WAIT_BUYER_PAY".equals(s)){
+ if("WAIT_BUYER_PAY".equals(tradeStatus)){
num++;
}
}
@@ -1256,6 +1508,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(),
"/base/pointMer/exchangeGoodPaymentWeChatCallback", "APP", "");
--
Gitblit v1.7.1