From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +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 | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 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 a025fe7..85d053b 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
@@ -546,6 +546,7 @@
tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
tAppUser.setIsVip(0);
tAppUser.setState(1);
+ tAppUser.setInsertTime(new Date());
this.baseMapper.insert(tAppUser);
}
if (tAppUser.getState() == 2) {
@@ -632,6 +633,27 @@
*/
@Override
public ResultUtil updatePassword(String phone, String code, String password) throws Exception {
+ String value = redisUtil.getValue(phone);
+ if (!"123456".equals(code) && (ToolUtil.isEmpty(value) || !value.equals(code))) {
+ 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("您的账号已被冻结", "");
+ }
+ if (tAppUser.getCode() == null) {
+ tAppUser.setCode(UUIDUtil.getNumberRandom(16));
+ }
+ tAppUser.setPassword(password);
+ this.updateById(tAppUser);
+ return ResultUtil.success();
+ }
+
+ @Override
+ public ResultUtil updatePassword1(String phone, String code, String password) throws Exception {
String value = redisUtil.getValue(phone);
if (!"123456".equals(code) && (ToolUtil.isEmpty(value) || !value.equals(code))) {
return ResultUtil.error("验证码无效");
@@ -1025,6 +1047,7 @@
goods.add(commodity);
}
}
+
List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest);
if (allCoupons.size() > 0) {
for (Coupon allCoupon : allCoupons) {
@@ -1312,7 +1335,7 @@
userCouponPayment.setCode(code);
userCouponPayment.setPayType(coupon.getRedemptionMethod());
userCouponPayment.setIntegral(coupon.getIntegral().intValue());
- userCouponPayment.setCash(coupon.getCash().doubleValue());
+ userCouponPayment.setCash(null == coupon.getCash() ? 0D : coupon.getCash().doubleValue());
userCouponPayment.setCashPayType(exchangeType.getPayType());
userCouponPayment.setInsertTime(new Date());
@@ -1358,7 +1381,20 @@
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
- PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
+ PointsMerchandise merchandise = new PointsMerchandise();
+ if(exchangeType.getGoodsType() != 4){
+ merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
+ }else{
+ Coupon coupon = ucponClient.queryCouponById(exchangeType.getGoodId());
+ merchandise.setId(coupon.getId());
+ merchandise.setUserPopulation(coupon.getUserPopulation());
+ merchandise.setIntegral(coupon.getIntegral().intValue());
+ merchandise.setQuantityIssued(coupon.getQuantityIssued());
+ merchandise.setPickUpQuantity(coupon.getPickUpQuantity());
+ merchandise.setUseScope(coupon.getUseScope());
+ merchandise.setCash(coupon.getCash());
+ merchandise.setType(4);
+ }
if (ToolUtil.isEmpty(merchandise)) {
@@ -1437,6 +1473,7 @@
}
}
pointsMerchandise.setCode(code);
+ pointsMerchandise.setInsertTime(new Date());
returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
}
@@ -1479,6 +1516,7 @@
packagePayment.setStatus(1);
packagePayment.setState(1);
packagePayment.setCode(code);
+ packagePayment.setInsertTime(new Date());
// paymentClient.savePaymentCoursePackage(packagePayment);
OrderDto orderDto = new OrderDto();
@@ -1498,6 +1536,7 @@
coupon.setCouponId(exchangeType.getGoodId());
coupon.setUserId(userIdFormRedis);
coupon.setStatus(1);
+ coupon.setInsertTime(new Date());
ucponClient.insertToAppuserCoupon(coupon);
}
break;
@@ -1657,9 +1696,6 @@
/**
* 优惠券支付宝支付
*
- * @param uid
- * @param paymentPrice
- * @param paymentCourseVo
* @return
* @throws Exception
*/
@@ -1794,7 +1830,6 @@
}
private ResultUtil AlipayPayment(BigDecimal cash, String code, Long returnId) {
- System.out.println("金额：" + cash);
ResultUtil alipay = payMoneyUtil.alipay("优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
"/base/pointMer/exchangeGoodPaymentAliCallback");
if (alipay.getCode() == 200) {
@@ -1909,7 +1944,8 @@
List<UserPointsMerchandise> userPointsMerchandises = merChandiseClient.queryUserPointMerchaseByCode(outNum);
// PaymentCompetition code = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", outNum));
- Integer storeId = userPointsMerchandises.get(0).getStoreId();
+ if(userPointsMerchandises.size() > 0){
+ Integer storeId = userPointsMerchandises.get(0).getStoreId();
// Competition byId1 = competitionService.getById(code.getCompetitionId());
@@ -1917,7 +1953,7 @@
// TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());
- OperatorUser operatorUser = storeClient.queryByStoreId(storeId);
+ OperatorUser operatorUser = storeClient.queryByStoreId(storeId);
// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
@@ -1929,26 +1965,28 @@
// 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()));
+ 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);
+ List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
+ ops.add(op);
+ model.setRoyaltyParameters(ops);
- request.setBizModel(model);
+ request.setBizModel(model);
- AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
- if (response1.isSuccess()) {
- System.out.println("调用成功");
- } else {
- System.out.println("调用失败");
+ AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
+ if (response1.isSuccess()) {
+ System.out.println("调用成功");
+ } else {
+ System.out.println("调用失败");
+ }
}
+
}
@@ -2042,6 +2080,7 @@
coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
coupon.setUserId(userPointsMerchandises.get(0).getUserId());
coupon.setStatus(1);
+ coupon.setInsertTime(new Date());
ucponClient.insertToAppuserCoupon(coupon);
break;
default:
@@ -2072,6 +2111,7 @@
coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
coupon.setUserId(userPointsMerchandises.get(0).getUserId());
coupon.setStatus(1);
+ coupon.setInsertTime(new Date());
ucponClient.insertToAppuserCoupon(coupon);
break;
default:
--
Gitblit v1.7.1