Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
87db0332
Commit
87db0332
authored
May 06, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打日志
parent
8a117089
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
4 deletions
+17
-4
order-application-service/src/main/java/cn/freemud/service/CheckOrderUniversal.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
+4
-0
order-application-service/src/main/java/cn/freemud/service/universal/CommonCheckOrderHandle.java
+4
-1
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
+8
-3
No files found.
order-application-service/src/main/java/cn/freemud/service/CheckOrderUniversal.java
View file @
87db0332
...
@@ -320,6 +320,7 @@ public abstract class CheckOrderUniversal {
...
@@ -320,6 +320,7 @@ public abstract class CheckOrderUniversal {
}
else
{
}
else
{
apportionResponse
=
shoppingCartClient
.
getShoppingCartGoodsApportionNew
(
requestDto
);
apportionResponse
=
shoppingCartClient
.
getShoppingCartGoodsApportionNew
(
requestDto
);
}
}
LogUtil
.
info
(
"获取购物车详情"
,
requestDto
,
apportionResponse
);
if
(!
ObjectUtils
.
equals
(
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
,
apportionResponse
.
getCode
()))
{
if
(!
ObjectUtils
.
equals
(
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
,
apportionResponse
.
getCode
()))
{
ResponseResult
responseResult
=
ResponseResult
.
getResponseResult
(
apportionResponse
.
getCode
());
ResponseResult
responseResult
=
ResponseResult
.
getResponseResult
(
apportionResponse
.
getCode
());
throw
new
ServiceException
(
responseResult
!=
null
?
responseResult
:
ResponseResult
.
SHOPPING_CART_GETINFO_ERROR
);
throw
new
ServiceException
(
responseResult
!=
null
?
responseResult
:
ResponseResult
.
SHOPPING_CART_GETINFO_ERROR
);
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
View file @
87db0332
...
@@ -14,11 +14,13 @@ import cn.freemud.redis.RedisCache;
...
@@ -14,11 +14,13 @@ import cn.freemud.redis.RedisCache;
import
cn.freemud.service.*
;
import
cn.freemud.service.*
;
import
cn.freemud.service.universal.UniversalOrderService
;
import
cn.freemud.service.universal.UniversalOrderService
;
import
cn.freemud.service.universal.factory.CreateOrderServiceFactory
;
import
cn.freemud.service.universal.factory.CreateOrderServiceFactory
;
import
cn.freemud.utils.LogUtil
;
import
cn.freemud.utils.RedisUtil
;
import
cn.freemud.utils.RedisUtil
;
import
cn.freemud.utils.ResponseUtil
;
import
cn.freemud.utils.ResponseUtil
;
import
com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
;
import
com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
;
import
com.freemud.api.assortment.datamanager.enums.IappIdType
;
import
com.freemud.api.assortment.datamanager.enums.IappIdType
;
import
com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager
;
import
com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager
;
import
com.freemud.application.sdk.api.log.ApiLog
;
import
com.freemud.sdk.api.assortment.order.enums.OrderSourceType
;
import
com.freemud.sdk.api.assortment.order.enums.OrderSourceType
;
import
com.freemud.sdk.api.assortment.order.util.LockUtils
;
import
com.freemud.sdk.api.assortment.order.util.LockUtils
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
...
@@ -121,6 +123,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
...
@@ -121,6 +123,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
if
(!
"wc"
.
equals
(
createOrderVo
.
getChannelType
())
&&
if
(!
"wc"
.
equals
(
createOrderVo
.
getChannelType
())
&&
!
partnerIds
.
isEmpty
()
&&
partnerIds
.
contains
(
assortmentCustomerInfoVo
.
getPartnerId
())
!
partnerIds
.
isEmpty
()
&&
partnerIds
.
contains
(
assortmentCustomerInfoVo
.
getPartnerId
())
&&
!
storeIds
.
isEmpty
()
&&
storeIds
.
contains
(
assortmentCustomerInfoVo
.
getStoreId
()))
{
&&
!
storeIds
.
isEmpty
()
&&
storeIds
.
contains
(
assortmentCustomerInfoVo
.
getStoreId
()))
{
LogUtil
.
info
(
"进入 新订单创建流程"
,
createOrderVo
,
null
);
return
this
.
createOrderUniversal
(
com
.
freemud
.
application
.
sdk
.
api
.
util
.
MapUtils
.
java2Map
(
createOrderVo
));
return
this
.
createOrderUniversal
(
com
.
freemud
.
application
.
sdk
.
api
.
util
.
MapUtils
.
java2Map
(
createOrderVo
));
}
}
// 扩展字段中存储 sessionKey
// 扩展字段中存储 sessionKey
...
@@ -219,6 +222,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
...
@@ -219,6 +222,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
if
(!
LockUtils
.
lock
(
redisCache
.
getRedisTemplate
(),
createOrderKey
,
expire
))
{
if
(!
LockUtils
.
lock
(
redisCache
.
getRedisTemplate
(),
createOrderKey
,
expire
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_NOT_CREATE_ERROR
);
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_NOT_CREATE_ERROR
);
}
}
ApiLog
.
info
(
"新订单业务对象 :"
,
createOrderScene
,
createOrderBaseVo
);
return
createOrderServiceFactory
.
getCreateOrderService
(
createOrderScene
).
createOrder
(
createOrderBaseVo
,
assortmentCustomerInfoVo
,
createOrderScene
);
return
createOrderServiceFactory
.
getCreateOrderService
(
createOrderScene
).
createOrder
(
createOrderBaseVo
,
assortmentCustomerInfoVo
,
createOrderScene
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
throw
e
;
throw
e
;
...
...
order-application-service/src/main/java/cn/freemud/service/universal/CommonCheckOrderHandle.java
View file @
87db0332
...
@@ -9,6 +9,8 @@ import cn.freemud.enums.OrderMarketType;
...
@@ -9,6 +9,8 @@ import cn.freemud.enums.OrderMarketType;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.service.CouponService
;
import
cn.freemud.service.CouponService
;
import
cn.freemud.utils.LogUtil
;
import
com.freemud.application.sdk.api.log.ApiLog
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -41,6 +43,7 @@ public class CommonCheckOrderHandle {
...
@@ -41,6 +43,7 @@ public class CommonCheckOrderHandle {
*/
*/
public
void
diyCheckCouponCode
(
CreateOrderBaseVo
createOrderVo
,
ShoppingCartInfoRequestVo
shoppingCartInfoRequestVo
)
{
public
void
diyCheckCouponCode
(
CreateOrderBaseVo
createOrderVo
,
ShoppingCartInfoRequestVo
shoppingCartInfoRequestVo
)
{
// 如果使用优惠券或者商品券,校验 couponCode
// 如果使用优惠券或者商品券,校验 couponCode
ApiLog
.
info
(
"校验优惠券"
,
createOrderVo
,
shoppingCartInfoRequestVo
);
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getCouponCode
()))
{
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getCouponCode
()))
{
checkCouponCode
(
createOrderVo
,
shoppingCartInfoRequestVo
);
checkCouponCode
(
createOrderVo
,
shoppingCartInfoRequestVo
);
}
}
...
@@ -62,6 +65,7 @@ public class CommonCheckOrderHandle {
...
@@ -62,6 +65,7 @@ public class CommonCheckOrderHandle {
*/
*/
public
void
collageOrderHandle
(
CreateOrderBaseVo
createOrderVo
,
ShoppingCartGoodsDto
shoppingCartGoodsDto
)
{
public
void
collageOrderHandle
(
CreateOrderBaseVo
createOrderVo
,
ShoppingCartGoodsDto
shoppingCartGoodsDto
)
{
if
(
this
.
isCollageOrder
(
createOrderVo
))
{
if
(
this
.
isCollageOrder
(
createOrderVo
))
{
ApiLog
.
info
(
"拼单商品 业务处理"
,
createOrderVo
,
shoppingCartGoodsDto
);
// 处理拼单加购人信息
// 处理拼单加购人信息
List
<
ShoppingCartGoodsDto
.
CartGoodsDetailDto
>
products
=
shoppingCartGoodsDto
.
getProducts
();
List
<
ShoppingCartGoodsDto
.
CartGoodsDetailDto
>
products
=
shoppingCartGoodsDto
.
getProducts
();
ShoppingCartGoodsDto
.
CartGoodsDetailDto
createUserGood
=
products
.
stream
().
filter
(
good
->
createOrderVo
.
getUserId
().
equals
(
good
.
getUserId
())).
findFirst
().
orElse
(
null
);
ShoppingCartGoodsDto
.
CartGoodsDetailDto
createUserGood
=
products
.
stream
().
filter
(
good
->
createOrderVo
.
getUserId
().
equals
(
good
.
getUserId
())).
findFirst
().
orElse
(
null
);
...
@@ -97,7 +101,6 @@ public class CommonCheckOrderHandle {
...
@@ -97,7 +101,6 @@ public class CommonCheckOrderHandle {
}
}
private
void
checkCouponCode
(
CreateOrderBaseVo
createOrderVo
,
ShoppingCartInfoRequestVo
shoppingCartInfoRequestVo
)
{
private
void
checkCouponCode
(
CreateOrderBaseVo
createOrderVo
,
ShoppingCartInfoRequestVo
shoppingCartInfoRequestVo
)
{
// 校验couponCode
// 校验couponCode
GetCouponDetailResponseDto
getCouponDetailResponseDto
=
couponService
.
getMemberCoupon
(
GetMemberCouponRequestVo
.
builder
()
GetCouponDetailResponseDto
getCouponDetailResponseDto
=
couponService
.
getMemberCoupon
(
GetMemberCouponRequestVo
.
builder
()
...
...
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
View file @
87db0332
...
@@ -185,6 +185,7 @@ public abstract class UniversalOrderService {
...
@@ -185,6 +185,7 @@ public abstract class UniversalOrderService {
// 组装业务对象
// 组装业务对象
CreateOrderBo
createOrderBo
=
getCreateOrderBo
(
createOrderBaseVo
,
userLoginInfoDto
,
trackingNo
);
CreateOrderBo
createOrderBo
=
getCreateOrderBo
(
createOrderBaseVo
,
userLoginInfoDto
,
trackingNo
);
createOrderBo
.
setCreateOrderScene
(
createOrderSceneEnum
);
createOrderBo
.
setCreateOrderScene
(
createOrderSceneEnum
);
ApiLog
.
info
(
"组装业务对象 begin:"
,
createOrderBo
);
// 获取校验对象
// 获取校验对象
checkOrder
=
createOrderServiceFactory
.
getCheckOrderService
(
createOrderSceneEnum
);
checkOrder
=
createOrderServiceFactory
.
getCheckOrderService
(
createOrderSceneEnum
);
...
@@ -195,6 +196,7 @@ public abstract class UniversalOrderService {
...
@@ -195,6 +196,7 @@ public abstract class UniversalOrderService {
//1.9.2套餐需求同步优化创建订单代码
//1.9.2套餐需求同步优化创建订单代码
BaseResponse
createOrderOperateDtoResponse
=
this
.
createSharedOrder
(
createOrderBo
);
BaseResponse
createOrderOperateDtoResponse
=
this
.
createSharedOrder
(
createOrderBo
);
LogUtil
.
info
(
"组装业务对象 end:"
,
createOrderBo
,
createOrderOperateDtoResponse
);
if
(
createOrderOperateDtoResponse
==
null
||
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
createOrderOperateDtoResponse
.
getCode
())
||
createOrderOperateDtoResponse
.
getResult
()
==
null
)
{
if
(
createOrderOperateDtoResponse
==
null
||
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
createOrderOperateDtoResponse
.
getCode
())
||
createOrderOperateDtoResponse
.
getResult
()
==
null
)
{
return
createOrderOperateDtoResponse
;
return
createOrderOperateDtoResponse
;
}
}
...
@@ -216,7 +218,9 @@ public abstract class UniversalOrderService {
...
@@ -216,7 +218,9 @@ public abstract class UniversalOrderService {
//创建预支付
//创建预支付
CreatePrepayRequestDto
createPrepayRequestDto
=
createOrderAdapter
.
convertToCreatePrepayRequestDto
(
createOrderBo
);
CreatePrepayRequestDto
createPrepayRequestDto
=
createOrderAdapter
.
convertToCreatePrepayRequestDto
(
createOrderBo
);
return
createPrepayOrder
(
createPrepayRequestDto
);
BaseResponse
prepayOrder
=
createPrepayOrder
(
createPrepayRequestDto
);
LogUtil
.
info
(
"创建预支付:"
,
createPrepayRequestDto
,
prepayOrder
);
return
prepayOrder
;
}
}
/**
/**
...
@@ -321,11 +325,12 @@ public abstract class UniversalOrderService {
...
@@ -321,11 +325,12 @@ public abstract class UniversalOrderService {
/**
/**
* 扣减库存默认实现 子类按需求 提取
* 扣减库存默认实现 子类按需求 提取
*
* @param createOrderBo
* @param createOrderBo
* @param createOrderResponse
* @param createOrderResponse
* @return
* @return
*/
*/
protected
BaseResponse
defalutSendActivityUpdateStock
(
CreateOrderBo
createOrderBo
,
CreateOrderResponse
createOrderResponse
){
protected
BaseResponse
defalutSendActivityUpdateStock
(
CreateOrderBo
createOrderBo
,
CreateOrderResponse
createOrderResponse
)
{
ActivityUpdateStockRequest
activityUpdateStockRequest
=
this
.
initActivityUpdateStockRequest
(
createOrderBo
);
ActivityUpdateStockRequest
activityUpdateStockRequest
=
this
.
initActivityUpdateStockRequest
(
createOrderBo
);
MqMessageRequest
mqMessageRequest
=
new
MqMessageRequest
();
MqMessageRequest
mqMessageRequest
=
new
MqMessageRequest
();
mqMessageRequest
.
setBackOrdersNotifyActivityExchange
(
backOrdersNotifyActivityExchange
);
mqMessageRequest
.
setBackOrdersNotifyActivityExchange
(
backOrdersNotifyActivityExchange
);
...
@@ -690,7 +695,7 @@ public abstract class UniversalOrderService {
...
@@ -690,7 +695,7 @@ public abstract class UniversalOrderService {
public
BaseResponse
createPrepayOrder
(
CreatePrepayRequestDto
createPrepayRequestDto
)
{
public
BaseResponse
createPrepayOrder
(
CreatePrepayRequestDto
createPrepayRequestDto
)
{
CreateOrderResponseVo
createOrderResponse
;
CreateOrderResponseVo
createOrderResponse
;
OrderPayResponse
orderPayResponse
;
OrderPayResponse
orderPayResponse
;
PaymentRequest
paymentRequest
=
orderBodyConvertToPaymentBody
(
createPrepayRequestDto
.
getOpenId
(),
createPrepayRequestDto
.
getPartnerId
(),
createPrepayRequestDto
.
getWxAppId
(),
createPrepayRequestDto
.
getPayCode
());
PaymentRequest
paymentRequest
=
orderBodyConvertToPaymentBody
(
createPrepayRequestDto
.
getOpenId
(),
createPrepayRequestDto
.
getPartnerId
(),
createPrepayRequestDto
.
getWxAppId
(),
createPrepayRequestDto
.
getPayCode
());
long
totalAmount
=
createPrepayRequestDto
.
getTotalAmount
();
long
totalAmount
=
createPrepayRequestDto
.
getTotalAmount
();
String
cardCode
=
createPrepayRequestDto
.
getCardCode
();
String
cardCode
=
createPrepayRequestDto
.
getCardCode
();
...
...
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