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
a5bc6a23
Commit
a5bc6a23
authored
Jun 16, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 内部内使用
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
d48bbb91
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
24 deletions
+7
-24
shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/ShoppingCartGoodsApportionBO.java
+1
-17
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformApportionService.java
+6
-7
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/ShoppingCartGoodsApportionBO.java
View file @
a5bc6a23
package
cn
.
freemud
.
demo
.
entities
.
bo
.
goods
;
package
cn
.
freemud
.
demo
.
entities
.
bo
.
goods
;
import
cn.freemud.demo.entities.bo.SendGoods
;
import
cn.freemud.entities.vo.CartGoods
;
import
cn.freemud.entities.vo.CartGoods
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -138,23 +139,6 @@ public class ShoppingCartGoodsApportionBO {
...
@@ -138,23 +139,6 @@ public class ShoppingCartGoodsApportionBO {
private
Integer
couponType
;
private
Integer
couponType
;
}
}
@Data
public
final
static
class
SendGoods
{
/**
* 商品Id
*/
@NotNull
private
String
goodsId
;
private
Long
originalPrice
;
/**
* 商品数量
*/
@NotNull
private
Integer
qty
;
private
String
activityCode
;
}
@Data
@Data
...
...
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformApportionService.java
View file @
a5bc6a23
...
@@ -2,7 +2,7 @@ package cn.freemud.demo.service.impl;
...
@@ -2,7 +2,7 @@ package cn.freemud.demo.service.impl;
import
cn.freemud.adapter.CouponAdapter
;
import
cn.freemud.adapter.CouponAdapter
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.demo.entities.bo.
goods.ValidateShopProductRequestBO
;
import
cn.freemud.demo.entities.bo.
SendGoods
;
import
cn.freemud.demo.entities.bo.goods.*
;
import
cn.freemud.demo.entities.bo.goods.*
;
import
cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO
;
import
cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO
;
import
cn.freemud.demo.entities.bo.store.GetStoreBO
;
import
cn.freemud.demo.entities.bo.store.GetStoreBO
;
...
@@ -13,7 +13,6 @@ import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
...
@@ -13,7 +13,6 @@ import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
import
cn.freemud.entities.dto.GetMemberCouponListResponseDto
;
import
cn.freemud.entities.dto.GetMemberCouponListResponseDto
;
import
cn.freemud.entities.vo.ActivityClassifyCouponBean
;
import
cn.freemud.entities.vo.ActivityClassifyCouponBean
;
import
cn.freemud.entities.vo.CartGoods
;
import
cn.freemud.entities.vo.CartGoods
;
import
cn.freemud.entities.vo.ShoppingCartInfoRequestVo
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.service.CouponService
;
import
cn.freemud.service.CouponService
;
...
@@ -74,11 +73,11 @@ public class PlatformApportionService extends AbstractApportionService {
...
@@ -74,11 +73,11 @@ public class PlatformApportionService extends AbstractApportionService {
buildCoupons
(
coupons
,
baseRequestDTO
.
getCouponCodes
());
buildCoupons
(
coupons
,
baseRequestDTO
.
getCouponCodes
());
List
<
S
hoppingCartGoodsApportionBO
.
S
endGoods
>
sendGoodsList
=
baseRequestDTO
.
getSendGoods
();
List
<
SendGoods
>
sendGoodsList
=
baseRequestDTO
.
getSendGoods
();
List
<
S
hoppingCartInfoRequestVo
.
S
endGoods
>
sendGoods
=
new
ArrayList
<>();
List
<
SendGoods
>
sendGoods
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
sendGoodsList
))
{
if
(
CollectionUtils
.
isNotEmpty
(
sendGoodsList
))
{
for
(
S
hoppingCartGoodsApportionBO
.
S
endGoods
sds
:
sendGoodsList
)
{
for
(
SendGoods
sds
:
sendGoodsList
)
{
S
hoppingCartInfoRequestVo
.
SendGoods
sd
=
new
ShoppingCartInfoRequestVo
.
SendGoods
();
S
endGoods
sd
=
new
SendGoods
();
sd
.
setGoodsId
(
sds
.
getGoodsId
());
sd
.
setGoodsId
(
sds
.
getGoodsId
());
if
(
StringUtils
.
isBlank
(
sds
.
getActivityCode
()))
continue
;
if
(
StringUtils
.
isBlank
(
sds
.
getActivityCode
()))
continue
;
sd
.
setQty
(
sds
.
getQty
());
sd
.
setQty
(
sds
.
getQty
());
...
@@ -121,7 +120,7 @@ public class PlatformApportionService extends AbstractApportionService {
...
@@ -121,7 +120,7 @@ public class PlatformApportionService extends AbstractApportionService {
List
<
GetCalculationDiscountBO
.
CalculationSendGoodsReqVO
>
sends
=
new
ArrayList
<>();
List
<
GetCalculationDiscountBO
.
CalculationSendGoodsReqVO
>
sends
=
new
ArrayList
<>();
List
<
GetCalculationDiscountBO
.
CalculationActivityReqVO
>
selectActivityLists
=
new
ArrayList
<>();
List
<
GetCalculationDiscountBO
.
CalculationActivityReqVO
>
selectActivityLists
=
new
ArrayList
<>();
GetCalculationDiscountBO
.
CalculationActivityReqVO
calculationActivityReqVO
=
new
GetCalculationDiscountBO
.
CalculationActivityReqVO
();
GetCalculationDiscountBO
.
CalculationActivityReqVO
calculationActivityReqVO
=
new
GetCalculationDiscountBO
.
CalculationActivityReqVO
();
for
(
S
hoppingCartGoodsApportionBO
.
S
endGoods
send
:
sendGoodsList
)
{
for
(
SendGoods
send
:
sendGoodsList
)
{
GetCalculationDiscountBO
.
CalculationSendGoodsReqVO
reqs
=
new
GetCalculationDiscountBO
.
CalculationSendGoodsReqVO
();
GetCalculationDiscountBO
.
CalculationSendGoodsReqVO
reqs
=
new
GetCalculationDiscountBO
.
CalculationSendGoodsReqVO
();
reqs
.
setGoodsId
(
send
.
getGoodsId
());
reqs
.
setGoodsId
(
send
.
getGoodsId
());
reqs
.
setGoodsQuantity
(
send
.
getQty
());
reqs
.
setGoodsQuantity
(
send
.
getQty
());
...
...
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