记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
bd31dadb
Commit
bd31dadb
authored
Jan 27, 2024
by
zhangguobing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:券商品业务-完善申请退款处理;
parent
afbbebfc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
2 deletions
+31
-2
GoblinOrderAppServiceImpl.java
...ervice/goblin/service/impl/GoblinOrderAppServiceImpl.java
+1
-1
GoblinStoreBackOrderServiceImpl.java
.../service/impl/manage/GoblinStoreBackOrderServiceImpl.java
+29
-0
sqlmap.properties
...-service-goblin-impl/src/main/resources/sqlmap.properties
+1
-1
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java
View file @
bd31dadb
...
@@ -210,7 +210,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
...
@@ -210,7 +210,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
sqls
.
add
(
SqlMapping
.
get
(
"goblin_order.store.orderStatus"
));
sqls
.
add
(
SqlMapping
.
get
(
"goblin_order.store.orderStatus"
));
sqls
.
add
(
SqlMapping
.
get
(
"goblin_order.store.orderSkuStatus"
));
sqls
.
add
(
SqlMapping
.
get
(
"goblin_order.store.orderSkuStatus"
));
sqls
.
add
(
SqlMapping
.
get
(
"goblin_order.store.refundLog"
));
sqls
.
add
(
SqlMapping
.
get
(
"goblin_order.store.refundLog"
));
sqls
.
add
(
SqlMapping
.
get
(
"candy_user_coupon.update_
by_
apply_refund"
));
sqls
.
add
(
SqlMapping
.
get
(
"candy_user_coupon.update_apply_refund"
));
LinkedList
<
Object
[]>
applyRefund
=
CollectionUtil
.
linkedListObjectArr
();
LinkedList
<
Object
[]>
applyRefund
=
CollectionUtil
.
linkedListObjectArr
();
LinkedList
<
Object
[]>
orderStatus
=
CollectionUtil
.
linkedListObjectArr
();
LinkedList
<
Object
[]>
orderStatus
=
CollectionUtil
.
linkedListObjectArr
();
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java
View file @
bd31dadb
...
@@ -5,6 +5,8 @@ import com.liquidnet.commons.lang.util.*;
...
@@ -5,6 +5,8 @@ import com.liquidnet.commons.lang.util.*;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.candy.constant.CandyRedisConst
;
import
com.liquidnet.service.candy.dto.CandyUserCouponBasicDto
;
import
com.liquidnet.service.dragon.constant.DragonConstant
;
import
com.liquidnet.service.dragon.constant.DragonConstant
;
import
com.liquidnet.service.goblin.constant.GoblinStatusConst
;
import
com.liquidnet.service.goblin.constant.GoblinStatusConst
;
import
com.liquidnet.service.goblin.dto.vo.*
;
import
com.liquidnet.service.goblin.dto.vo.*
;
...
@@ -25,6 +27,7 @@ import java.math.BigDecimal;
...
@@ -25,6 +27,7 @@ import java.math.BigDecimal;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.IntStream
;
@Service
@Service
@Slf4j
@Slf4j
...
@@ -219,6 +222,32 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
...
@@ -219,6 +222,32 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
return
ResponseDto
.
failure
(
"无法查看"
);
return
ResponseDto
.
failure
(
"无法查看"
);
}
}
GoblinBackOrderVo
backOrderVo
=
redisUtils
.
getBackOrderVo
(
backOrderId
);
GoblinBackOrderVo
backOrderVo
=
redisUtils
.
getBackOrderVo
(
backOrderId
);
{
// 券类商品-拒绝退款后,恢复已发放券状态
List
<
GoblinBackOrderSkuVo
>
backOrderSkuVos
=
backOrderVo
.
getBackOrderSkuVos
();
for
(
GoblinBackOrderSkuVo
backOrderSkuVo
:
backOrderSkuVos
)
{
if
(
2
==
backOrderSkuVo
.
getSkuType
())
{
// 券类商品默认一个商品对应一个券,下单只可购买一张
String
ucKey
=
CandyRedisConst
.
BASIC_USER_COUPON
.
concat
(
backOrderVo
.
getUserId
());
List
<
CandyUserCouponBasicDto
>
vos
=
(
List
<
CandyUserCouponBasicDto
>)
redisUtils
.
get
(
ucKey
);
int
idx
=
IntStream
.
range
(
0
,
vos
.
size
())
.
filter
(
i
->
vos
.
get
(
i
).
getUcouponId
().
equals
(
backOrderSkuVo
.
getOrderSkuId
())).
findFirst
().
orElse
(-
1
);
if
(-
1
!=
idx
)
{
CandyUserCouponBasicDto
basicDto
=
vos
.
get
(
idx
);
basicDto
.
setState
(
1
);
// 恢复状态
vos
.
set
(
idx
,
basicDto
);
redisUtils
.
redisUtil
.
set
(
ucKey
,
vos
);
queueUtils
.
sendMsgByRedis
(
MQConst
.
GoblinQueue
.
GOBLIN_STORE_ORDER_OPERA
.
getKey
(),
SqlMapping
.
get
(
"candy_user_coupon.update_apply_refund"
,
basicDto
.
getState
(),
uid
,
now
,
basicDto
.
getUcouponId
()
)
);
}
else
{
log
.
warn
(
"券类商品订单拒绝退款,未找到对应券[orderSkuId={},operator={}]"
,
backOrderSkuVo
.
getOrderSkuId
(),
uid
);
}
}
}
}
backOrderVo
.
setStatus
(
GoblinStatusConst
.
Status
.
ORDER_BACK_STATUS_3
.
getValue
());
backOrderVo
.
setStatus
(
GoblinStatusConst
.
Status
.
ORDER_BACK_STATUS_3
.
getValue
());
backOrderVo
.
setRefuseAt
(
nowStr
);
backOrderVo
.
setRefuseAt
(
nowStr
);
backOrderVo
.
setRefuseSize
(
backOrderVo
.
getRefuseSize
()
==
null
?
1
:
backOrderVo
.
getRefuseSize
()
+
1
);
backOrderVo
.
setRefuseSize
(
backOrderVo
.
getRefuseSize
()
==
null
?
1
:
backOrderVo
.
getRefuseSize
()
+
1
);
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties
View file @
bd31dadb
...
@@ -189,6 +189,6 @@ goblin_nft_order.update_artwork=UPDATE goblin_nft_order SET artwork_id=? WHERE o
...
@@ -189,6 +189,6 @@ goblin_nft_order.update_artwork=UPDATE goblin_nft_order SET artwork_id=? WHERE o
#----
#----
goblin_sku.stock
=
UPDATE goblin_goods_sku SET sku_stock = ? , stock = ?, updated_at = ? WHERE sku_erp_code = ? and erp_warehouse_no = ?
goblin_sku.stock
=
UPDATE goblin_goods_sku SET sku_stock = ? , stock = ?, updated_at = ? WHERE sku_erp_code = ? and erp_warehouse_no = ?
#----
#----
candy_user_coupon.update_
by_
apply_refund
=
UPDATE candy_user_coupon SET state=?,operator=?,updated_at=? WHERE ucoupon_id=?
candy_user_coupon.update_apply_refund
=
UPDATE candy_user_coupon SET state=?,operator=?,updated_at=? WHERE ucoupon_id=?
#----
#----
#----
#----
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment