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
9e1dd327
Commit
9e1dd327
authored
Feb 26, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改问题
parent
c9abd336
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
0 deletions
+58
-0
order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ActivityDiscountsDto.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+57
-0
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ActivityDiscountsDto.java
View file @
9e1dd327
...
@@ -27,4 +27,5 @@ public class ActivityDiscountsDto {
...
@@ -27,4 +27,5 @@ public class ActivityDiscountsDto {
* 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
* 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
*/
*/
private
Integer
extendType
;
private
Integer
extendType
;
private
String
cartGoodsUid
;
}
}
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
9e1dd327
...
@@ -33,6 +33,7 @@ import cn.freemud.entities.dto.product.AttributeValue;
...
@@ -33,6 +33,7 @@ import cn.freemud.entities.dto.product.AttributeValue;
import
cn.freemud.entities.dto.product.GroupDetail
;
import
cn.freemud.entities.dto.product.GroupDetail
;
import
cn.freemud.entities.dto.product.ProductAttributeGroup
;
import
cn.freemud.entities.dto.product.ProductAttributeGroup
;
import
cn.freemud.entities.dto.product.ProductGroup
;
import
cn.freemud.entities.dto.product.ProductGroup
;
import
cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto
;
import
cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto
;
import
cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.dto.user.SendCouponForqujiaDtoResponseDto
;
import
cn.freemud.entities.dto.user.SendCouponForqujiaDtoResponseDto
;
...
@@ -111,6 +112,8 @@ import com.google.common.collect.Lists;
...
@@ -111,6 +112,8 @@ import com.google.common.collect.Lists;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
ma.glasnost.orika.MapperFacade
;
import
ma.glasnost.orika.impl.DefaultMapperFactory
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
@@ -121,6 +124,7 @@ import org.springframework.stereotype.Service;
...
@@ -121,6 +124,7 @@ import org.springframework.stereotype.Service;
import
java.util.*
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Service
@Service
...
@@ -234,6 +238,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -234,6 +238,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
@Autowired
@Autowired
private
CacheOpenApiEncryptManager
cacheOpenApiEncryptManager
;
private
CacheOpenApiEncryptManager
cacheOpenApiEncryptManager
;
private
static
MapperFacade
mapper
=
new
DefaultMapperFactory
.
Builder
().
build
().
getMapperFacade
();
@Override
@Override
public
BaseResponse
createMCCafeOrder
(
CreateOrderVo
createOrderVo
)
{
public
BaseResponse
createMCCafeOrder
(
CreateOrderVo
createOrderVo
)
{
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
...
@@ -605,6 +611,57 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -605,6 +611,57 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
return
mcCafeOrderCenterSdkService
.
createMCCafeOrderFlow
(
createOrderRequest
);
return
mcCafeOrderCenterSdkService
.
createMCCafeOrderFlow
(
createOrderRequest
);
}
}
public
static
void
main
(
String
[]
args
)
{
MCCafeOrderServiceImpl
mcCafeOrderService
=
new
MCCafeOrderServiceImpl
();
mcCafeOrderService
.
processRepeatGoodsWithSeedCoupon
(
JSON
.
parseObject
(
"{\"activityDiscountsDtos\":[{\"activityCode\":\"DPTJ2021022511040306293\",\"activityName\":\"月享卡特价1\",\"activityType\":2,\"discountAmount\":-1710},{\"activityCode\":\"216628714314049\",\"activityName\":\"啡常月享卡(商城)测试券\",\"activityType\":37,\"cartGoodsUid\":\"734d0689-111d-4ca7-a4d1-580d9dcf0105\",\"discountAmount\":-900,\"extendType\":10},{\"activityCode\":\"216628714314049\",\"activityName\":\"啡常月享卡(商城)测试券\",\"activityType\":37,\"cartGoodsUid\":\"82767a8b-0ad9-440c-9b37-d0bfc594179b\",\"discountAmount\":-1800,\"extendType\":10}],\"buyThreeGiveOneCouponFee\":0,\"deliveryAmount\":0,\"discountDeliveryAmount\":0,\"isDiscountDelivery\":false,\"originalTotalAmount\":11400,\"packageAmount\":0,\"payCardFee\":0,\"products\":[{\"activityDiscountsDtos\":[{\"activityCode\":\"216628714314049\",\"activityName\":\"啡常月享卡(商城)测试券\",\"activityType\":37,\"discountAmount\":-900,\"extendType\":10,\"tenderId\":\"508527\"}],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"cartGoodsUid\":\"734d0689-111d-4ca7-a4d1-580d9dcf0105\",\"classificationId\":\"\",\"classificationName\":\"\",\"couponCode\":\"216628714314049\",\"customerCode\":\"508527\",\"extraList\":[],\"hasProductCoupon\":false,\"isMonthCard\":0,\"isSeedCouponGoods\":0,\"isTableware\":0,\"materialList\":[],\"originalPrice\":1900,\"picture\":\"https://picture.sandload.cn/1605356768489.png\",\"productCode\":\"2217\",\"qty\":1,\"salePrice\":0,\"skuId\":\"191220974548593707\",\"skuName\":\"中杯拿铁\",\"spuId\":\"191220974497213481\",\"spuName\":\"拿铁\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":900,\"unit\":\"\",\"weight\":0.0},{\"activityDiscountsDtos\":[{\"activityCode\":\"216628714314049\",\"activityName\":\"啡常月享卡(商城)测试券\",\"activityType\":37,\"discountAmount\":-1800,\"extendType\":10,\"tenderId\":\"508527\"}],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"cartGoodsUid\":\"82767a8b-0ad9-440c-9b37-d0bfc594179b\",\"classificationId\":\"\",\"classificationName\":\"\",\"couponCode\":\"216628714314049\",\"customerCode\":\"508527\",\"extraList\":[],\"hasProductCoupon\":false,\"isMonthCard\":0,\"isSeedCouponGoods\":0,\"isTableware\":0,\"materialList\":[],\"originalPrice\":1900,\"picture\":\"https://picture.sandload.cn/1606184178473.png\",\"productCode\":\"2214\",\"qty\":2,\"salePrice\":0,\"skuId\":\"189264448691747619\",\"skuName\":\"中杯卡布奇诺\",\"spuId\":\"189264448647707425\",\"spuName\":\"卡布奇诺\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":1800,\"unit\":\"\",\"weight\":0.0},{\"activityDiscountsDtos\":[{\"activityCode\":\"DPTJ2021022511040306293\",\"activityName\":\"月享卡特价1\",\"activityType\":2,\"actualActivityGoodsNumber\":1,\"discountAmount\":1710}],\"activityType\":2,\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"cartGoodsUid\":\"ad4af27a-e24f-4264-a3ae-d6a3c3c38e6d\",\"classificationId\":\"\",\"classificationName\":\"\",\"customerCode\":\"509387\",\"extraList\":[],\"hasProductCoupon\":false,\"isMonthCard\":1,\"isSeedCouponGoods\":0,\"isTableware\":0,\"materialList\":[],\"monthCardInfo\":{\"cardCode\":\"216628714314049\",\"cardNo\":\"MQYK8563DBFBEA942693898E7F919C94ADDD\",\"type\":2},\"originalPrice\":1900,\"picture\":\"https://picture.sandload.cn/1609750514452.png\",\"productCode\":\"508554\",\"productType\":9,\"qty\":3,\"salePrice\":1900,\"skuId\":\"196061855703358215\",\"skuName\":\"月享卡\",\"spuId\":\"196061855703358215\",\"spuName\":\"月享卡\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":1710,\"unit\":\"\",\"weight\":0.0}],\"shareDiscountActivityDtos\":[],\"stocks\":[{\"activityCode\":\"DPTJ2021022511040306293\",\"activityType\":2,\"goodsStock\":[{\"goodsId\":\"196061855703358215\",\"stock\":1}]}],\"totalAmount\":6990,\"totalDiscountAmount\":4410}"
,
ShoppingCartGoodsDto
.
class
));
}
private
void
processRepeatGoodsWithSeedCoupon
(
ShoppingCartGoodsDto
shoppingCartGoodsDto
)
{
List
<
String
>
cardCodeList
=
shoppingCartGoodsDto
.
getProducts
().
stream
().
filter
(
o
->
ProductTypeEnum
.
VIRTUAL_PRODUCT
.
getCode
().
equals
(
o
.
getProductType
()))
.
map
(
o
->
o
.
getMonthCardInfo
().
getCardCode
()).
collect
(
Collectors
.
toList
());
List
<
ActivityDiscountsDto
>
activityDiscountsDtos
=
shoppingCartGoodsDto
.
getActivityDiscountsDtos
();
List
<
ShoppingCartGoodsDto
.
CartGoodsDetailDto
>
products
=
new
ArrayList
<>();
shoppingCartGoodsDto
.
getProducts
().
stream
().
forEach
(
o
->
{
boolean
flag
=
false
;
if
(
o
.
getQty
()
>
1
&&
CollectionUtils
.
isNotEmpty
(
o
.
getActivityDiscountsDtos
()))
{
for
(
ActivityDiscountsDto
activityDiscountsDto
:
o
.
getActivityDiscountsDtos
())
{
if
(
cardCodeList
.
contains
(
activityDiscountsDto
.
getActivityCode
()))
{
flag
=
true
;
int
qty
=
o
.
getQty
();
Integer
totalDiscountAmount
=
o
.
getTotalDiscountAmount
()/
qty
;
Integer
discountAmount
=
activityDiscountsDto
.
getDiscountAmount
()/
qty
;
String
cartGoodsUid
=
o
.
getCartGoodsUid
();
for
(
int
i
=
qty
;
i
>=
1
;
i
--)
{
ShoppingCartGoodsDto
.
CartGoodsDetailDto
cartGoodsDetailDto
=
mapper
.
map
(
o
,
ShoppingCartGoodsDto
.
CartGoodsDetailDto
.
class
);
cartGoodsDetailDto
.
setQty
(
1
);
cartGoodsDetailDto
.
setTotalDiscountAmount
(
totalDiscountAmount
);
cartGoodsDetailDto
.
getActivityDiscountsDtos
().
get
(
0
).
setDiscountAmount
(
discountAmount
);
products
.
add
(
cartGoodsDetailDto
);
}
for
(
int
j
=
0
;
j
<
activityDiscountsDtos
.
size
();
j
++)
{
if
(
cartGoodsUid
.
equals
(
activityDiscountsDtos
.
get
(
j
).
getCartGoodsUid
()))
{
ActivityDiscountsDto
orderActivityDiscountsDto
=
activityDiscountsDtos
.
get
(
j
);
orderActivityDiscountsDto
.
setDiscountAmount
(
orderActivityDiscountsDto
.
getDiscountAmount
()/
qty
);
activityDiscountsDtos
.
remove
(
j
);
for
(
int
k
=
0
;
k
<
qty
;
k
++)
{
activityDiscountsDtos
.
add
(
j
,
mapper
.
map
(
orderActivityDiscountsDto
,
ActivityDiscountsDto
.
class
));
}
break
;
}
}
break
;
}
}
}
if
(!
flag
)
{
products
.
add
(
o
);
}
});
shoppingCartGoodsDto
.
setProducts
(
products
);
System
.
out
.
println
(
JSON
.
toJSONString
(
shoppingCartGoodsDto
));
}
private
OrderPayResponse
getOrderPayResponse
(
PaymentRequest
paymentRequest
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
private
OrderPayResponse
getOrderPayResponse
(
PaymentRequest
paymentRequest
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
OrderPayResponse
orderPayResponse
;
OrderPayResponse
orderPayResponse
;
String
fmId
=
"SPAY"
+
ValidationCode
.
getRandomUuid
();
String
fmId
=
"SPAY"
+
ValidationCode
.
getRandomUuid
();
...
...
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