From d7f01edd56f2f8a822ceffa9240fa22e4763d7e4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 22 Jan 2025 15:42:40 +0800
Subject: [PATCH] refactor(mall): 重构订单发货相关代码
---
src/test/java/cc/mrbird/febs/AgentTest.java | 143 +++++++++++++----------------------------------
1 files changed, 40 insertions(+), 103 deletions(-)
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 79cca72..d419d83 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -1,105 +1,42 @@
-//package cc.mrbird.febs;
-//
-//import cc.mrbird.febs.common.entity.FebsResponse;
-//import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-//import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-//import cc.mrbird.febs.common.exception.FebsException;
-//import cc.mrbird.febs.common.utils.LoginUserUtil;
-//import cc.mrbird.febs.common.utils.RedisUtils;
-//import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
-//import cc.mrbird.febs.mall.dto.*;
-//import cc.mrbird.febs.mall.entity.*;
-//import cc.mrbird.febs.mall.mapper.*;
-//import cc.mrbird.febs.mall.quartz.ProfitJob;
-//import cc.mrbird.febs.mall.service.IAgentService;
-//import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
-//import cc.mrbird.febs.mall.vo.*;
-//import cc.mrbird.febs.pay.util.WechatConfigure;
-//import cc.mrbird.febs.rabbit.consumer.AgentConsumer;
-//import cc.mrbird.febs.rabbit.producter.AgentProducer;
-//import cn.hutool.core.collection.CollUtil;
-//import cn.hutool.core.util.ObjectUtil;
-//import cn.hutool.core.util.RandomUtil;
-//import cn.hutool.core.util.StrUtil;
-//import cn.hutool.json.JSONObject;
-//import cn.hutool.json.JSONUtil;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.baomidou.mybatisplus.extension.exceptions.ApiException;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import lombok.extern.slf4j.Slf4j;
-//import okhttp3.*;
-//import org.aspectj.weaver.loadtime.Agent;
-//import org.junit.jupiter.api.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.web.client.RestTemplate;
-//
-//import javax.annotation.Resource;
-//import java.io.IOException;
-//import java.math.BigDecimal;
-//import java.math.RoundingMode;
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @author wzy
-// * @date 2021-09-25
-// **/
-//@Slf4j
-//@SpringBootTest
-//public class AgentTest {
-//
-// @Autowired
-// private AgentProducer agentProducer;
-//
-// @Autowired
-// private DataDictionaryCustomMapper dataDictionaryCustomMapper;
-//
-// @Autowired
-// private IAgentService agentService;
-//
-// @Autowired
-// private MallGoodsStyleMapper mallGoodsStyleMapper;
-//
-// @Autowired
-// private MallActAwardSetMapper mallActAwardSetMapper;
-// @Autowired
-// private MallMemberMapper mallMemberMapper;
-// @Autowired
-// private MallActWinRecordMapper mallActWinRecordMapper;
-// @Autowired
-// private MallActLuckdrawRecordMapper mallActLuckdrawRecordMapper;
-// @Autowired
-// private MallMemberWalletMapper mallMemberWalletMapper;
-// @Autowired
-// private MallActSetMapper mallActSetMapper;
-// @Autowired
-// private MallGoodsSkuMapper mallGoodsSkuMapper;
-// @Autowired
-// private MallOrderItemMapper mallOrderItemMapper;
-// @Autowired
-// private MallGoodsMapper mallGoodsMapper;
-// @Autowired
-// private MallGoodsImagesMapper goodsImagesMapper;
-// @Autowired
-// private IApiMallOrderInfoService iApiMallOrderInfoService;
-// @Test
-// public void getCouponAmountMap(){
-// Long memberCouponId = 139L;
-// List<AddOrderItemDto> items = new ArrayList<>();
-// AddOrderItemDto addOrderItemDto = new AddOrderItemDto();
-// addOrderItemDto.setSkuId(185L);
-// addOrderItemDto.setCnt(2);
-// items.add(addOrderItemDto);
-// Map<Long, BigDecimal> couponAmountMap = iApiMallOrderInfoService.getCouponAmountMap(memberCouponId, items);
-// for (Map.Entry<Long, BigDecimal> entry : couponAmountMap.entrySet()) {
-// System.out.println("Key: " + entry.getKey() + ", Value: " + entry.getValue());
-// }
-// }
-//
-//
+package cc.mrbird.febs;
+
+import cc.mrbird.febs.common.utils.ValidateEntityUtils;
+import cc.mrbird.febs.mall.entity.MallMemberCoupon;
+import cc.mrbird.febs.mall.mapper.MallMemberCouponMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author wzy
+ * @date 2021-09-25
+ **/
+@Slf4j
+@SpringBootTest
+public class AgentTest {
+ @Resource
+ RestTemplate restTemplate;
+ @Resource
+ MallMemberCouponMapper mallMemberCouponMapper;
+ @Test
+ public void getCouponAmountMap() {
+ MallMemberCoupon mallMemberCoupon = ValidateEntityUtils.ensureColumnReturnEntity(209L, MallMemberCoupon::getId, mallMemberCouponMapper::selectOne, "id{}不存在");
+ List<MallMemberCoupon> mallMemberCoupons = ValidateEntityUtils.ensureColumnReturnEntityList(209L, MallMemberCoupon::getId, mallMemberCouponMapper::selectList, "id{}不存在");
+ ValidateEntityUtils.ensureColumnValid(205L, MallMemberCoupon::getId, mallMemberCouponMapper::selectOne, "id{}不存在");
+ ValidateEntityUtils.ensureUnique(205L, MallMemberCoupon::getId, mallMemberCouponMapper::selectCount, "id{}已存在");
+ ValidateEntityUtils.ensureEqual(205L, 206L, "{}，{}，值不相等");
+
+// // 使用未编码的经纬度字符串
+// String url = "https://revgeocode.search.hereapi.com/v1/revgeocode?at=48.2181679,16.3899064&lang=en-US&apiKey=21tSClSPVotUklhRA4GIgECwZ0S6MmJ73TJ8v8ojDuo";
+// String jsonStr = restTemplate.getForObject(url, String.class);
+// log.info("Response: {}", jsonStr);
+ }
+
+
// @Autowired
// private RedisUtils redisUtils;
// @Resource
@@ -812,4 +749,4 @@
// public void orderReturnTest() {
// agentConsumer.getScoreMsg(215L);
// }
-//}
+}
--
Gitblit v1.9.1