Commit 69eafd80 by 胡超

升级sdk-费用记录添加字段实际金额

parent 206c3f1d
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.3.7.RELEASE</version> <version>1.5.7-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<version>1.2.2.RELEASE</version> <version>1.3.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -653,6 +653,7 @@ public class OrderSdkAdapter { ...@@ -653,6 +653,7 @@ public class OrderSdkAdapter {
accountBean.setName(orderCostResp.getCostName()); accountBean.setName(orderCostResp.getCostName());
accountBean.setNumber(1); accountBean.setNumber(1);
accountBean.setPrice(orderCostResp.getCostAmount().longValue()); accountBean.setPrice(orderCostResp.getCostAmount().longValue());
accountBean.setActualCostAmount(null != orderCostResp.getActualCostAmount() ? orderCostResp.getActualCostAmount().longValue() : 0);
accountBean.setSequence(orderCostResp.getProductSeq()); accountBean.setSequence(orderCostResp.getProductSeq());
//新订单服务 1=包装费,2=运费,5=会员卡费用 //新订单服务 1=包装费,2=运费,5=会员卡费用
if (orderCostResp.getCostType() == 2) { if (orderCostResp.getCostType() == 2) {
......
...@@ -563,6 +563,11 @@ public class QueryOrdersResponse { ...@@ -563,6 +563,11 @@ public class QueryOrdersResponse {
* 优惠金额 * 优惠金额
*/ */
private Long price; private Long price;
// 实际金额
private Long actualCostAmount;
private Integer sequence; private Integer sequence;
/** /**
* 结算对象类型 1 运费 2折扣 3包装费 4积分 5 优惠券 6线下支付 7 微信 8 支付宝 9 商户金额 * 结算对象类型 1 运费 2折扣 3包装费 4积分 5 优惠券 6线下支付 7 微信 8 支付宝 9 商户金额
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.2.3.RELEASE</version> <version>1.3.4-SNAPSHOT</version>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<dependencies> <dependencies>
......
...@@ -39,6 +39,9 @@ public class OrderCostResp { ...@@ -39,6 +39,9 @@ public class OrderCostResp {
//费用金额 //费用金额
private BigDecimal costAmount; private BigDecimal costAmount;
//实际金额
private BigDecimal actualCostAmount;
//备注 //备注
private String note; private String note;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment