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
9ad4c1aa
Commit
9ad4c1aa
authored
Jul 01, 2021
by
黄兆良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
20210701-日志切面-黄兆良
parent
28d32211
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
5 deletions
+21
-5
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+21
-5
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
9ad4c1aa
...
...
@@ -18,6 +18,7 @@ import cn.freemud.adapter.ShoppingCartConvertAdapter;
import
cn.freemud.adapter.StoreItemAdapter
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.util.DateUtil
;
import
cn.freemud.constant.ApplicationConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ShoppingCartConstant
;
import
cn.freemud.demo.controller.ShoppingCartDemoController
;
...
...
@@ -815,7 +816,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
// 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
ApiLog
.
info
(
"校验入参券是否可用"
,
shoppingCartGoodsResponseVo
,
shoppingCartInfoRequestVo
.
getCouponCode
());
// ApiLog.info("校验入参券是否可用",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCode());
if
(
ApplicationConstant
.
printDebug
){
ApiLog
.
printLog
(
"校验入参券是否可用"
,
JSON
.
toJSONString
(
shoppingCartGoodsResponseVo
),
shoppingCartInfoRequestVo
.
getCouponCode
(),
null
);
}
// 校验入参券是否可用
if
(!
checkAvailableCoupon
(
shoppingCartGoodsResponseVo
,
shoppingCartInfoRequestVo
.
getCouponCode
())){
return
ResponseUtil
.
error
(
ResponseResult
.
SHOPPING_CART_COUPON_NOT_USE
);
...
...
@@ -1482,7 +1486,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
activityCalculationDiscountRequestDto
.
setProductChannel
(
BusinessTypeEnum
.
SAAS_DELIVERY
.
getCode
());
}
try
{
ApiLog
.
debug
(
"activityClient discount :{}"
,
JSON
.
toJSONString
(
activityCalculationDiscountRequestDto
));
// ApiLog.debug("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto));
if
(
ApplicationConstant
.
printDebug
){
ApiLog
.
printLog
(
"activityClient discount :{}"
,
JSON
.
toJSONString
(
activityCalculationDiscountRequestDto
),
null
,
null
);
}
activityCalculationDiscountResponseDto
=
activityClient
.
calculationDiscount
(
activityCalculationDiscountRequestDto
);
}
catch
(
Exception
ex
)
{
ErrorLog
.
printErrorLog
(
"calculation_discount_error"
,
"/calculation/discount"
,
activityCalculationDiscountRequestDto
,
ex
);
...
...
@@ -2465,7 +2472,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if
(
StringUtils
.
isBlank
(
receiveId
)
&&
!
Objects
.
equals
(
orderType
,
CreateOrderType
.
TAKE_OUT
.
getCode
()))
{
return
deliveryAmount
;
}
ApiLog
.
debug
(
"获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}"
,
LogThreadLocal
.
getTrackingNo
(),
storeDeliveryUseOld
,
receiveId
,
partnerId
,
storeId
);
// ApiLog.debug("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
if
(
ApplicationConstant
.
printDebug
){
ApiLog
.
printLog
(
"获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}"
,
LogThreadLocal
.
getTrackingNo
(),
JSON
.
toJSONString
(
storeDeliveryUseOld
),
"receiveId:"
+
receiveId
+
",partnerId:"
+
partnerId
+
",storeId:"
+
storeId
);
}
if
(
storeDeliveryUseOld
)
{
deliveryAmount
=
Long
.
parseLong
(
getDeliveryAmount
(
receiveId
,
partnerId
,
storeId
).
toString
());
shoppingCartGoodsResponseVo
.
setDeliveryFeeZeroReason
(
0
);
...
...
@@ -2814,7 +2824,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
List
<
ShoppingCartInfoRequestVo
.
couponCode
>
coupons
){
ApiLog
.
info
(
"批量使用优惠券前,oldCoupons,coupons"
,
oldCoupons
,
coupons
);
// ApiLog.info("批量使用优惠券前,oldCoupons,coupons",oldCoupons,coupons);
if
(
ApplicationConstant
.
printDebug
){
ApiLog
.
printLog
(
"批量使用优惠券前,oldCoupons,coupons"
,
JSON
.
toJSONString
(
oldCoupons
),
JSON
.
toJSONString
(
coupons
),
null
);
}
for
(
int
i
=
0
;
i
<
oldCoupons
.
size
()
;
i
++){
CalculationSharingDiscountRequestDto
.
CalculationDiscountCoupon
oldCoupon
=
oldCoupons
.
get
(
i
);
...
...
@@ -2840,7 +2853,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
}
ApiLog
.
info
(
"批量使用优惠券后,oldCoupons,coupons"
,
oldCoupons
,
coupons
);
// ApiLog.info("批量使用优惠券后,oldCoupons,coupons",oldCoupons,coupons);
if
(
ApplicationConstant
.
printDebug
){
ApiLog
.
printLog
(
"批量使用优惠券后,oldCoupons,coupons"
,
JSON
.
toJSONString
(
oldCoupons
),
JSON
.
toJSONString
(
coupons
),
null
);
}
return
oldCoupons
;
}
...
...
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