From 4020506fe1fa75993b44b4faaa0992c9b39f38d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 12:18:13 +0800
Subject: [PATCH] fix goods-update
---
src/test/java/cc/mrbird/febs/AgentTest.java | 6 ++++++
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 1 +
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 7 +++++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 3780ec4..7fab9d0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -93,6 +93,7 @@
* @param orderId
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void dynamicProfit(Long orderId) {
log.info("######直推奖励, 订单ID:{}######", orderId);
MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(orderId);
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index bfd4d27..d670df0 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -588,8 +588,11 @@
selector: '#toolbar-container',
mode: 'default'
});
- tableSkuData = skus;
- reloadTable(skus);
+
+ if (skus) {
+ tableSkuData = skus;
+ reloadTable(skus);
+ }
}
form.on('submit(goods-update-form-submit)', function (data) {
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 584839e..a25e932 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -615,4 +615,10 @@
public void profitJobTest() {
profitJob.profitJob();
}
+
+
+ @Test
+ public void orderReturnTest() {
+ agentProducer.sendOrderReturn(1L);
+ }
}
--
Gitblit v1.9.1