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
a888602c
Commit
a888602c
authored
Sep 07, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商品服务sdk升级
parent
81b62516
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
29 deletions
+3
-29
assortment-shoppingcart-sdk/pom.xml
+1
-2
shopping-cart-application-service/pom.xml
+1
-2
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
+1
-25
No files found.
assortment-shoppingcart-sdk/pom.xml
View file @
a888602c
...
@@ -42,8 +42,7 @@
...
@@ -42,8 +42,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
productcenter-sdk
</artifactId>
<artifactId>
productcenter-sdk
</artifactId>
<!--<version>3.7.RELEASE</version>-->
<version>
3.8.0.RELEASE
</version>
<version>
3.6.5.SNAPSHOT
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
shopping-cart-application-service/pom.xml
View file @
a888602c
...
@@ -35,8 +35,7 @@
...
@@ -35,8 +35,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
productcenter-sdk
</artifactId>
<artifactId>
productcenter-sdk
</artifactId>
<!--<version>3.7.RELEASE</version>-->
<version>
3.8.0.RELEASE
</version>
<version>
3.6.5.SNAPSHOT
</version>
<!-- //3.6.4-SNAPSHOTE -->
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
View file @
a888602c
...
@@ -84,7 +84,7 @@ public class ActivityCalculationDiscountRequestDto {
...
@@ -84,7 +84,7 @@ public class ActivityCalculationDiscountRequestDto {
@Data
@Data
public
static
class
CalculationDiscountGoods
{
public
static
class
CalculationDiscountGoods
{
/**
/**
*
商品ID
*
键位编号(麦咖啡)
*/
*/
private
String
goodsCode
;
private
String
goodsCode
;
/**
/**
...
@@ -118,30 +118,6 @@ public class ActivityCalculationDiscountRequestDto {
...
@@ -118,30 +118,6 @@ public class ActivityCalculationDiscountRequestDto {
private
List
<
Material
>
smallMaterial
;
private
List
<
Material
>
smallMaterial
;
private
String
spuId
;
private
String
spuId
;
private
List
<
Material
>
smallMaterial
;
@Data
@NoArgsConstructor
static
public
class
Material
{
/**
* 加料商品ID
*/
private
String
goodsId
;
/**
* 加料数量
*/
private
Integer
goodsQuantity
;
/**
* 加料单价
*/
private
Long
originalPrice
;
/**
* 1 :小料、2:可选搭配
*/
private
int
type
;
}
@Override
@Override
public
boolean
equals
(
Object
o
)
{
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
if
(
this
==
o
)
...
...
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