Skip to content

Commit db28fd3

Browse files
YunaiVYunaiV
committed
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts: # pom.xml # yudao-dependencies/pom.xml # yudao-module-bpm/yudao-module-bpm-server/src/test/java/cn/iocoder/yudao/module/bpm/service/category/BpmCategoryServiceImplTest.java
2 parents c2cf376 + 6161166 commit db28fd3

File tree

3 files changed

+42
-38
lines changed

3 files changed

+42
-38
lines changed

‎yudao-module-bpm/yudao-module-bpm-server/src/test/java/cn/iocoder/yudao/module/bpm/service/category/BpmCategoryServiceImplTest.java‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
99
import cn.iocoder.yudao.module.bpm.dal.mysql.category.BpmCategoryMapper;
1010
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryServiceImpl;
11+
import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
12+
import jakarta.annotation.Resource;
1113
import org.junit.jupiter.api.Test;
1214
import org.springframework.context.annotation.Import;
13-
14-
import javax.annotation.Resource;
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1516

1617
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
1718
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
@@ -33,6 +34,9 @@ public class BpmCategoryServiceImplTest extends BaseDbUnitTest {
3334
@Resource
3435
private BpmCategoryServiceImpl categoryService;
3536

37+
@MockitoBean
38+
private BpmModelService modelService;
39+
3640
@Resource
3741
private BpmCategoryMapper categoryMapper;
3842

@@ -88,8 +92,8 @@ public void testDeleteCategory_success() {
8892

8993
// 调用
9094
categoryService.deleteCategory(id);
91-
// 校验数据不存在了
92-
assertNull(categoryMapper.selectById(id));
95+
// 校验数据不存在了
96+
assertNull(categoryMapper.selectById(id));
9397
}
9498

9599
@Test
@@ -103,35 +107,35 @@ public void testDeleteCategory_notExists() {
103107

104108
@Test
105109
public void testGetCategoryPage() {
106-
// mock 数据
107-
BpmCategoryDO dbCategory = randomPojo(BpmCategoryDO.class, o -> { // 等会查询到
108-
o.setName("芋头");
109-
o.setCode("xiaodun");
110-
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
111-
o.setCreateTime(buildTime(2023, 2, 2));
112-
});
113-
categoryMapper.insert(dbCategory);
114-
// 测试 name 不匹配
115-
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setName("小盾")));
116-
// 测试 code 不匹配
117-
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setCode("tudou")));
118-
// 测试 status 不匹配
119-
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
120-
// 测试 createTime 不匹配
121-
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setCreateTime(buildTime(2024, 2, 2))));
122-
// 准备参数
123-
BpmCategoryPageReqVO reqVO = new BpmCategoryPageReqVO();
124-
reqVO.setName("芋");
125-
reqVO.setCode("xiao");
126-
reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
127-
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
128-
129-
// 调用
130-
PageResult<BpmCategoryDO> pageResult = categoryService.getCategoryPage(reqVO);
131-
// 断言
132-
assertEquals(1, pageResult.getTotal());
133-
assertEquals(1, pageResult.getList().size());
134-
assertPojoEquals(dbCategory, pageResult.getList().get(0));
110+
// mock 数据
111+
BpmCategoryDO dbCategory = randomPojo(BpmCategoryDO.class, o -> { // 等会查询到
112+
o.setName("芋头");
113+
o.setCode("xiaodun");
114+
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
115+
o.setCreateTime(buildTime(2023, 2, 2));
116+
});
117+
categoryMapper.insert(dbCategory);
118+
// 测试 name 不匹配
119+
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setName("小盾")));
120+
// 测试 code 不匹配
121+
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setCode("tudou")));
122+
// 测试 status 不匹配
123+
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
124+
// 测试 createTime 不匹配
125+
categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setCreateTime(buildTime(2024, 2, 2))));
126+
// 准备参数
127+
BpmCategoryPageReqVO reqVO = new BpmCategoryPageReqVO();
128+
reqVO.setName("芋");
129+
reqVO.setCode("xiao");
130+
reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
131+
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
132+
133+
// 调用
134+
PageResult<BpmCategoryDO> pageResult = categoryService.getCategoryPage(reqVO);
135+
// 断言
136+
assertEquals(1, pageResult.getTotal());
137+
assertEquals(1, pageResult.getList().size());
138+
assertPojoEquals(dbCategory, pageResult.getList().get(0));
135139
}
136140

137141
}

‎yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public void sendDeliveryOrderMessage(TradeOrderDO order, TradeOrderDeliveryReqVO
427427
.addMessage("phrase6", TradeOrderStatusEnum.DELIVERED.getName()) // 订单状态
428428
.addMessage("date4", LocalDateTimeUtil.formatNormal(LocalDateTime.now()))// 发货时间
429429
.addMessage("character_string5", StrUtil.blankToDefault(deliveryReqVO.getLogisticsNo(), "-")) // 快递单号
430-
.addMessage("thing9", order.getReceiverDetailAddress())); // 收货地址
430+
.addMessage("thing9", order.getReceiverDetailAddress())).checkError(); // 收货地址
431431
}
432432

433433
/**
@@ -729,7 +729,7 @@ public void updateOrderPrice(TradeOrderUpdatePriceReqVO reqVO) {
729729
tradeOrderItemMapper.updateBatch(updateItems);
730730

731731
// 4. 更新支付订单
732-
payOrderApi.updatePayOrderPrice(order.getPayOrderId(), newPayPrice);
732+
payOrderApi.updatePayOrderPrice(order.getPayOrderId(), newPayPrice).checkError();
733733

734734
// 5. 记录订单日志
735735
TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), order.getStatus(),
@@ -957,7 +957,7 @@ public void cancelPaidOrder(Long userId, Long orderId, Integer cancelType) {
957957
// 特殊：因为订单支持 AfterSale 单个售后退款，也支持整单退款，所以需要通过 order- 进行下区分
958958
// 具体可见 AfterSaleController 的 updateAfterSaleRefunded 方法
959959
.setMerchantRefundId("order-" + order.getId())
960-
.setReason(TradeOrderCancelTypeEnum.COMBINATION_CLOSE.getName()).setPrice(order.getPayPrice())); // 价格信息
960+
.setReason(TradeOrderCancelTypeEnum.COMBINATION_CLOSE.getName()).setPrice(order.getPayPrice())).checkError(); // 价格信息
961961
}
962962

963963
@Override

‎yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void sendWalletRechargerPaidMessage(Long payOrderId, PayWalletRechargeDO
168168
.addMessage("character_string1", String.valueOf(payOrderId)) // 支付单编号
169169
.addMessage("amount2", fenToYuanStr(walletRecharge.getTotalPrice())) // 充值金额
170170
.addMessage("time3", LocalDateTimeUtil.formatNormal(walletRecharge.getCreateTime())) // 充值时间
171-
.addMessage("phrase4", "充值成功")); // 充值状态
171+
.addMessage("phrase4", "充值成功")).checkError(); // 充值状态
172172

173173
// 2. 调用接口上传虚拟物品发货信息
174174
// 注意：只有微信小程序支付的订单，才需要同步
@@ -182,7 +182,7 @@ public void sendWalletRechargerPaidMessage(Long payOrderId, PayWalletRechargeDO
182182
.setItemDesc(payOrder.getSubject())
183183
.setLogisticsType(SocialWxaOrderUploadShippingInfoReqDTO.LOGISTICS_TYPE_VIRTUAL); // 虚拟物品发货类型
184184
try {
185-
socialClientApi.uploadWxaOrderShippingInfo(UserTypeEnum.MEMBER.getValue(), reqDTO);
185+
socialClientApi.uploadWxaOrderShippingInfo(UserTypeEnum.MEMBER.getValue(), reqDTO).checkError();
186186
} catch (Exception ex) {
187187
log.error("[sendWalletRechargerPaidMessage][订单({}) 上传订单物流信息到微信小程序失败]", payOrder, ex);
188188
}

0 commit comments

Comments
 (0)