海恒-鸿瑞堂
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
jiangqs
2023-09-04 c97706c3cc213b7db3d381e8a0435ff0ef9a04d6 
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java


@@ -58,7 +58,8 @@


import com.ruoyi.system.api.domain.poji.sys.SysUser;


import com.ruoyi.system.api.domain.vo.*;


import com.ruoyi.system.api.service.*;


import lombok.extern.slf4j.Slf4j;


import io.seata.spring.annotation.GlobalTransactional;


import lombok.extern.log4j.Log4j2;


import org.redisson.api.RLock;


import org.redisson.api.RedissonClient;


import org.springframework.stereotype.Service;


@@ -84,7 +85,7 @@


 * @since 2023-04-25


 */


@Service


@Slf4j


@Log4j2


public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {




    @Resource


@@ -513,6 +514,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public AppPlaceOrderVo placeOrder(AppPlaceOrderDto appPlaceOrderDto) {


        // 获取用户ID


        Long userId = appPlaceOrderDto.getUserId();


@@ -912,6 +914,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public AppPlaceOrderVo placeActivityOrder(AppPlaceActivityDto appPlaceActivityDto) {


        Long userId = appPlaceActivityDto.getUserId();


        // 创建订单对象


@@ -1448,6 +1451,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto) {


        String orderId = merVerifyOrderDto.getOrderId();


        BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();


@@ -1696,6 +1700,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) {


        MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData();


        MemberCoupon memberCoupon = verifyCouponGetVo.getMemberCoupon();


@@ -1823,6 +1828,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto) {


        MerVerifyAwardVo merVerifyAwardVo = new MerVerifyAwardVo();


        MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrize(merVerifyPrizeDto.getPrizeId()).getData();


@@ -2287,6 +2293,7 @@


        }


        //更新会员消费记录


        MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();


        memberTotalChangeDto.setUserId(order.getUserId());


        memberTotalChangeDto.setConsumeTime(nowTime);


        remoteMemberService.changeMemberTotal(memberTotalChangeDto);


        //更新商户统计


@@ -4424,6 +4431,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public void autoCancelOrder(String orderId) {


        //更新订单信息


        Order order = this.getById(orderId);


@@ -4490,6 +4498,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public void payBack(PartnerTransactionsResult transaction) {


        log.info("订单支付回调---"+transaction.toString());


        // Order order = this.getById(orderId);


@@ -4656,6 +4665,7 @@


     */


    @Override


    @Transactional


    @GlobalTransactional(rollbackFor = Exception.class)


    public void refundOrder(String orderId) {


        // 更新订单信息


        Order order = this.getById(orderId);