From c97706c3cc213b7db3d381e8a0435ff0ef9a04d6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 04 九月 2023 18:53:40 +0800
Subject: [PATCH] seata 同步 支付调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 41 +++++++++--------------------------------
1 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
index 1eb127a..71fb6c3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -1,23 +1,16 @@
package com.ruoyi.order.controller.miniapp;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
-import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.system.api.constant.DelayTaskEnum;
-import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -48,11 +41,6 @@
@Resource
private OrderService orderService;
- @Resource
- private RedisService redisService;
-
- @Resource
- private RemoteConfigService remoteConfigService;
@RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
@@ -109,6 +97,7 @@
appMemberBindingDto.setBindingFlag(1);
appMemberBindingDto.setBindingType(1);
memberService.updateMemberBinding(appMemberBindingDto);
+ appPlaceOrderDto.setNewMemberFlag(1);
}
}
}
@@ -119,11 +108,14 @@
@RequestMapping(value = "/placeActivityOrder", method = RequestMethod.POST)
@ApiOperation(value = "创建活动订单")
public R<AppPlaceOrderVo> placeActivityOrder(@Validated @RequestBody AppPlaceActivityDto appPlaceActivityDto) {
- Long userId = SecurityUtils.getUserId();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userId = loginUser.getUserid();
+ appPlaceActivityDto.setSpbillCreateIp(loginUser.getIpaddr());
if (userId != null) {
Member member = memberService.getMember(userId).getData();
appPlaceActivityDto.setUserId(userId);
if (member != null && member.getRelationShopId() != null) {
+ appPlaceActivityDto.setOpenid(member.getMiniOpenid());
appPlaceActivityDto.setShopId(member.getRelationShopId());
}
if (member.getBindingFlag() != 1) {
@@ -134,6 +126,7 @@
appMemberBindingDto.setBindingFlag(1);
appMemberBindingDto.setBindingType(2);
memberService.updateMemberBinding(appMemberBindingDto);
+ appPlaceActivityDto.setNewMemberFlag(1);
}
}
AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
@@ -181,26 +174,10 @@
}
@RequestMapping(value = "/payOrder", method = RequestMethod.POST)
- @ApiOperation(value = "支付订单(临时)")
- public R<AppPlaceOrderVo> placeOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
+ @ApiOperation(value = "支付订单")
+ public R<AppPlaceOrderVo> payOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
- AppPlaceOrderVo appPlaceOrderVo = new AppPlaceOrderVo();
- Order order = orderService.getById(appBaseGetDto.getId());
- PartnerTransactionsResult transaction = new PartnerTransactionsResult();
- transaction.setOutTradeNo(appBaseGetDto.getId());
- orderService.payBack(transaction);
- appPlaceOrderVo.setOrderId(order.getOrderId());
- appPlaceOrderVo.setOrderNo(order.getOrderNo());
- appPlaceOrderVo.setPayType(order.getPayType());
- appPlaceOrderVo.setPayMoney(order.getPayMoney());
- appPlaceOrderVo.setUnpaidMoney(order.getPayMoney());
- Integer delayTime = 30;
- if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
- delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
- }
- redisService.deleteObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId());
- remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId());
- appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));
+ AppPlaceOrderVo appPlaceOrderVo = orderService.payOrder(appBaseGetDto.getId());
return R.ok(appPlaceOrderVo);
}
--
Gitblit v1.7.1