Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java

@@ -1,9 +1,18 @@
//package com.ruoyi.order;
//
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import com.ruoyi.common.security.utils.SecurityUtils;
//import com.ruoyi.order.domain.dto.AppBuyGoodsDto;
//import com.ruoyi.order.domain.dto.AppSureOrderDto;
//import com.ruoyi.order.domain.dto.MerVerifyOrderDto;
//import com.ruoyi.order.domain.dto.MgtShopOrderPageDto;
//import com.ruoyi.order.domain.vo.AppSureOrderVo;
//import com.ruoyi.order.domain.vo.MerVerifyOrderVo;
//import com.ruoyi.order.domain.vo.MgtActivityOrderPageVo;
//import com.ruoyi.order.service.order.OrderService;
//import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
//import com.ruoyi.system.api.domain.poji.member.Member;
//import com.ruoyi.system.api.service.RemoteMemberService;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.boot.test.context.SpringBootTest;
@@ -11,6 +20,8 @@
//
//import javax.annotation.Resource;
//import java.math.BigDecimal;
//import java.util.ArrayList;
//import java.util.List;
//
///**
// * @ClassName orderTest
@@ -27,15 +38,28 @@
//    @Resource
//    private OrderService orderService;
//
//   @Resource
//   private RemoteMemberService memberService;
//
//    @Test
//    public void main() {
//        MerVerifyOrderDto merVerifyOrderDto = new MerVerifyOrderDto();
//        merVerifyOrderDto.setOrderId("ca505a758e0743af83a34a17481a093f");
//        merVerifyOrderDto.setShopId(52L);
//        merVerifyOrderDto.setRelReceiveMoney(new BigDecimal(0.100000000001));
//        merVerifyOrderDto.setRelPayMoney(new BigDecimal(0));
//        merVerifyOrderDto.setUserId(164L);
//        MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
//       AppSureOrderDto appSureOrderDto = new AppSureOrderDto();
//       Long userId = 1496L;
//       if (userId != null) {
//          Member member = memberService.getMember(userId).getData();
//          appSureOrderDto.setUserId(userId);
//          if (member != null && member.getRelationShopId() != null) {
//             appSureOrderDto.setShopId(member.getRelationShopId());
//          }
//       }
//       List<AppBuyGoodsDto> appBuyGoodsDtoList = new ArrayList<>();
//       AppBuyGoodsDto appBuyGoodsDto = new AppBuyGoodsDto();
//       appBuyGoodsDto.setBuyNum(1);
//       appBuyGoodsDto.setGoodsId("4476c539ccc54f95a1416f79a067073a");
//       appBuyGoodsDto.setMemberCouponId(1766020668811378689L);
//       appBuyGoodsDtoList.add(appBuyGoodsDto);
//       appSureOrderDto.setAppBuyGoodsDtoList(appBuyGoodsDtoList);
//       AppSureOrderVo appSureOrderVo = orderService.buyGoods(appSureOrderDto);
//
//    }
//