From 6a629499aeaa2d45a7c9b33b154b8995826d1c44 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 10:10:05 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 108 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 70 insertions(+), 38 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index 9f1c247..558be70 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -25,6 +25,7 @@
import com.ruoyi.order.mapper.TShoppingOrderMapper;
import com.ruoyi.order.service.TShoppingOrderRefundService;
import com.ruoyi.order.service.TShoppingOrderService;
+import com.ruoyi.order.util.RedisLock;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.feignClient.CouponClient;
@@ -37,6 +38,8 @@
import com.ruoyi.payment.api.vo.AliQueryOrder;
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
import io.seata.spring.annotation.GlobalTransactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -86,6 +89,9 @@
@Resource
private TShoppingOrderRefundService shoppingOrderRefundService;
+ @Autowired
+ public RedisTemplate redisTemplate;
+
@@ -121,15 +127,15 @@
coupon = coupon.add(tActivityStatisticslVO.getCouponDiscountAmount());
stringBuilder.append("优惠券抵扣").append("+");
}
- if (tActivityStatisticslVO.getVipDiscountAmount()!=null
- &&
- (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
+ if (tActivityStatisticslVO.getVipDiscountAmount()!=null &&(tActivityStatisticslVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
discount = discount.add(tActivityStatisticslVO.getVipDiscountAmount());
stringBuilder.append("会员抵扣").append("+");
}
- stringBuilder.deleteCharAt(stringBuilder.length()-1);
- tActivityStatisticslVO.setType(stringBuilder.toString());
- tActivityStatisticslVO.setTime(simpleDateFormat.format(tActivityStatisticslVO.getCreateTime()));
+ if (stringBuilder.length()>0){
+ stringBuilder.deleteCharAt(stringBuilder.length()-1);
+ tActivityStatisticslVO.setType(stringBuilder.toString());
+ }
+ tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
break;
case 2:
StringBuilder stringBuilder1 = new StringBuilder();
@@ -149,7 +155,7 @@
}
stringBuilder1.deleteCharAt(stringBuilder1.length()-1);
tActivityStatisticslVO.setType(stringBuilder1.toString());
- tActivityStatisticslVO.setTime(simpleDateFormat.format(tActivityStatisticslVO.getCreateTime()));
+ tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
break;
case 3:
// 会员订单 优惠金额大于0
@@ -159,19 +165,19 @@
vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount());
}
tActivityStatisticslVO.setType("会员活动");
- tActivityStatisticslVO.setTime(simpleDateFormat.format(tActivityStatisticslVO.getCreateTime()));
+ tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
break;
case 4:
// 赠送会员订单 如果支付金额为0 那么就是后台赠送的会员
if (tActivityStatisticslVO.getPaymentAmount().compareTo(BigDecimal.ZERO)==0){
grantVip = grantVip.add(tActivityStatisticslVO.getOrderAmount());
tActivityStatisticslVO.setType("赠送会员");
- tActivityStatisticslVO.setTime(simpleDateFormat.format(tActivityStatisticslVO.getCreateTime()));
+ tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}else{
// 赠送
grantVip = grantVip.add(tActivityStatisticslVO.getVipDiscountAmount());
tActivityStatisticslVO.setType("赠送会员");
- tActivityStatisticslVO.setTime(simpleDateFormat.format(tActivityStatisticslVO.getCreateTime()));
+ tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}
break;
}
@@ -196,12 +202,13 @@
public Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query) {
Long userId = tokenService.getLoginUserApplet().getUserId();
LambdaQueryWrapper<TShoppingOrder> wrapper = new LambdaQueryWrapper<TShoppingOrder>().eq(TShoppingOrder::getDelFlag, 0)
- .eq(TShoppingOrder::getAppUserId, userId);
+ .eq(TShoppingOrder::getAppUserId, userId).eq(TShoppingOrder::getPaymentStatus, 2).notIn(TShoppingOrder::getStatus, Arrays.asList(5));
if(query.getStatus() != 0){
wrapper.eq(TShoppingOrder::getStatus, query.getStatus());
}
long count = this.count(wrapper);
- List<TShoppingOrder> list = this.list(wrapper.orderByDesc(TShoppingOrder::getCreateTime).last(" limit " + query.getPageCurr() + ", " + query.getPageSize()));
+ Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();
+ List<TShoppingOrder> list = this.list(wrapper.orderByDesc(TShoppingOrder::getCreateTime).last(" limit " + pageCurr + ", " + query.getPageSize()));
List<MyShoppingOrderList> pageList = new ArrayList<>();
for (TShoppingOrder tShoppingOrder : list) {
MyShoppingOrderList myShoppingOrderList = new MyShoppingOrderList();
@@ -248,7 +255,7 @@
TAppUserAddress userAddress = appUserAddressClient.getAppUserAddressById(shoppingOrder.getAppUserAddressId()).getData();
info.setConsignee(userAddress.getName());
info.setPhone(userAddress.getPhone());
- info.setAddress(userAddress.getAddress());
+ info.setAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getAddress() + userAddress.getHouseNumber());
info.setExpressCompany(shoppingOrder.getExpressCompany());
info.setExpressNumber(shoppingOrder.getExpressNumber());
String name = "";
@@ -308,7 +315,7 @@
//退款金额
BigDecimal refundAmount = shoppingOrder.getPaymentAmount().subtract(bigDecimal);
-
+
//先查询第三方订单状态订单是否退款
//支付方式（1=微信，2=支付宝）
Integer paymentType = shoppingOrder.getPaymentType();
@@ -347,7 +354,7 @@
shoppingOrderRefund.setPayType(shoppingOrder.getPaymentType());
shoppingOrderRefund.setShoppingOrderId(shoppingOrder.getId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- shoppingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + (Math.random() * 1000));
+ shoppingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + Double.valueOf((Math.random() * 1000)).intValue());
shoppingOrderRefund.setRefundAmount(refundAmount);
shoppingOrderRefund.setRefundStatus(1);
shoppingOrderRefund.setCode(shoppingOrder.getCode());
@@ -357,13 +364,16 @@
shoppingOrderRefund.setRefundRemark("全额退款");
shoppingOrderRefund.setRefundTotalAmount(refundAmount.add(bigDecimal));
shoppingOrderRefund.setPayAmount(shoppingOrder.getPaymentAmount());
+
+ shoppingOrder.setCancellationTime(LocalDateTime.now());
+ shoppingOrder.setCancellationId(shoppingOrder.getAppUserId());
if(1 == paymentType){
WxPaymentRefundModel model = new WxPaymentRefundModel();
model.setOut_trade_no(shoppingOrder.getCode());
model.setTransaction_id(shoppingOrder.getSerialNumber());
model.setOut_refund_no(shoppingOrderRefund.getRefundCode());
- model.setReason("取消订单");
- model.setNotify_url("http://221.182.45.100:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
+ model.setReason("取消商城订单");
+ model.setNotify_url("/payment/wx/refund/notify");
WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
amount.setTotal(shoppingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
@@ -371,6 +381,7 @@
model.setAmount(amount);
R<String> orderR = wxPaymentClient.refundOrderR(model);
if(200 == orderR.getCode()){
+ this.updateById(shoppingOrder);
shoppingOrderRefundService.save(shoppingOrderRefund);
}
}
@@ -379,14 +390,12 @@
dto.setOutTradeNo(shoppingOrder.getCode());
dto.setOutRequestNo(shoppingOrderRefund.getCode());
dto.setRefundAmount(refundAmount.toString());
- dto.setRefundReason("取消订单");
+ dto.setRefundReason("取消商城订单");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
+ this.updateById(shoppingOrder);
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
AjaxResult success = cancelShoppingOrderWxRefund(resp.getOutTradeNo(), resp.getTradeNo(), "SUCCESS", sdf1.format(new Date()));
- if(success.isSuccess()){
- shoppingOrderRefundService.save(shoppingOrderRefund);
- }
}
}
return AjaxResult.success();
@@ -404,36 +413,56 @@
@Override
@GlobalTransactional(rollbackFor = Exception.class)//分布式事务
public AjaxResult cancelShoppingOrderWxRefund(String out_refund_no, String refund_id, String refund_status, String success_time) {
- if("SUCCESS".equals(refund_status)){
- TShoppingOrderRefund one = shoppingOrderRefundService.getOne(new LambdaQueryWrapper<TShoppingOrderRefund>().eq(TShoppingOrderRefund::getRefundCode, out_refund_no));
- one.setRefundStatus(2);
- one.setRefundSerialNumber(refund_id);
- one.setRefundTime(LocalDateTime.parse(success_time, DateTimeFormatter.ofPattern("yyyy-MM-DDTHH:mm:ss+TIMEZONE")));
- shoppingOrderRefundService.updateById(one);
- //判断是否需要回退库存
- TShoppingOrder shoppingOrder = this.getById(one.getShoppingOrderId());
- //商品
- if(shoppingOrder.getOrderType() == 1){
- // todo 需完善redis锁
- //redis锁 和支付使用同一个锁
+ TShoppingOrderRefund one = shoppingOrderRefundService.getOne(new LambdaQueryWrapper<TShoppingOrderRefund>().eq(TShoppingOrderRefund::getRefundCode, out_refund_no));
+ one.setRefundStatus(2);
+ one.setRefundSerialNumber(refund_id);
+ one.setRefundTime(LocalDateTime.now());
+ shoppingOrderRefundService.updateById(one);
+ //判断是否需要回退库存
+ TShoppingOrder shoppingOrder = this.getById(one.getShoppingOrderId());
+ shoppingOrder.setStatus(4);
+ shoppingOrder.setRefundCode(one.getRefundSerialNumber());
+ shoppingOrder.setRefundAmount(one.getRefundAmount());
+ shoppingOrder.setRefundStatus(2);
+ shoppingOrder.setRefundTime(one.getRefundTime());
+ this.updateById(shoppingOrder);
+
+ //商品
+ if(shoppingOrder.getOrderType() == 1){
+ //redis锁 和支付使用同一个锁
+ RedisLock redisLock = new RedisLock(redisTemplate, "SHOPPING_GOODS_LOCK", 5, 30000);
+ try {
+ redisLock.lock();
TGoods goods = goodsClient.getGoodsById(shoppingOrder.getGoodsId()).getData();
Integer inventory = goods.getInventory();
if(-1 != inventory){
goods.setInventory(inventory + shoppingOrder.getPurchaseQuantity());
goodsClient.updateGoods(goods);
}
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
//解锁
+ redisLock.unlock();
}
- //优惠券
- if(shoppingOrder.getOrderType() == 2){
- //redis锁
+ }
+ //优惠券
+ if(shoppingOrder.getOrderType() == 2){
+ //redis锁 和支付使用同一个锁
+ RedisLock redisLock = new RedisLock(redisTemplate, "SHOPPING_COUPON_LOCK", 5, 30000);
+ try {
+ redisLock.lock();
TCoupon coupon = couponClient.getCouponById1(shoppingOrder.getCouponId()).getData();
Integer inventory = coupon.getInventoryQuantity();
if(-1 != inventory){
coupon.setInventoryQuantity(inventory + shoppingOrder.getPurchaseQuantity());
couponClient.updateCoupon(coupon);
}
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
//解锁
+ redisLock.unlock();
}
}
return AjaxResult.success();
@@ -447,7 +476,8 @@
@Override
public List<MyShoppingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query) {
Long userId = tokenService.getLoginUserApplet().getUserId();
- List<TShoppingOrder> list = this.baseMapper.getNoInvoicedOrder(userId, query.getMonth(), query.getPageCurr(), query.getPageSize());
+ Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();
+ List<TShoppingOrder> list = this.baseMapper.getNoInvoicedOrder(userId, query.getMonth(), pageCurr, query.getPageSize());
List<MyShoppingOrderList> pageList = new ArrayList<>();
for (TShoppingOrder tShoppingOrder : list) {
MyShoppingOrderList myShoppingOrderList = new MyShoppingOrderList();
@@ -459,7 +489,7 @@
name = goods.getName();
imgUrl = goods.getCoverPicture();
}else{
- TCoupon coupon = couponClient.getCouponById1(tShoppingOrder.getGoodsId()).getData();
+ TCoupon coupon = couponClient.getCouponById1(tShoppingOrder.getCouponId()).getData();
name = coupon.getName();
imgUrl = coupon.getCoverPicture();
}
@@ -482,6 +512,7 @@
TShoppingOrder shoppingOrder = this.baseMapper.selectOne(Wrappers.lambdaQuery(TShoppingOrder.class).eq(TShoppingOrder::getCode, code));
shoppingOrder.setPaymentStatus(2);
shoppingOrder.setSerialNumber(outTradeNo);
+ shoppingOrder.setPayTime(LocalDateTime.now());
this.updateById(shoppingOrder);
//如果是优惠券，赠送优惠券
if (shoppingOrder.getOrderType()==2){
@@ -522,6 +553,7 @@
if (data1!=null){
tShoppingOrder.setName(data1.getName());
}
+ tShoppingOrder.setStatus(3);
break;
}
if (tShoppingOrder.getAppUserId() != null){
--
Gitblit v1.7.1