更新订单sdk依赖，订单项商品数量支持单位为斤的时候填写小数

Jiang
1 parent 5f11717c
Showing 6 changed files with 29 additions and 13 deletions
mobsite-getway-domain/pom.xml
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderItem.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/cart/ModifyAmountReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShoppingCartRPCImpl.java
pom.xml
@@ -66,7 +66,7 @@
   <dependency>
     <groupId>com.b2c.orders</groupId>
     <artifactId>b2c-orders-client</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.4-SNAPSHOT</version>
     <scope>provided</scope>
   </dependency>
 package com.diligrp.mobsite.getway.domain.protocol;
 import java.io.Serializable;
+import java.math.BigDecimal;
 /**
  * <B>Description</B> 订单 <br />
@@ -45,7 +46,7 @@ public class Order implements Serializable {
 	/** 支付类型 */
 	private Integer payType;
 	/** 总金额 */
-	private Long totalPrice;
+	private BigDecimal totalPrice;
 	/**
 	 * 接单后修改的价格
 	 */
@@ -139,11 +140,11 @@ public class Order implements Serializable {
 		this.payType = payType;
 	}
-	public Long getTotalPrice() {
+	public BigDecimal getTotalPrice() {
 		return totalPrice;
 	}
-	public void setTotalPrice(Long totalPrice) {
+	public void setTotalPrice(BigDecimal totalPrice) {
 		this.totalPrice = totalPrice;
 	}
 package com.diligrp.mobsite.getway.domain.protocol;
+import java.math.BigDecimal;
+
 import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 /**
@@ -21,7 +24,9 @@ public class OrderItem {
 	private String sku;
 	@ApiParam("购买数量")
 	@NotNull(message = "购买数量不能为空")
-	private Integer amount;
+	private BigDecimal amount;
+	@ApiModelProperty("sku价格")
+	private Long skuPrice;
 	public String getSku() {
 		return sku;
@@ -31,11 +36,20 @@ public class OrderItem {
 		this.sku = sku;
 	}
-	public Integer getAmount() {
+	public BigDecimal getAmount() {
 		return amount;
 	}
-	public void setAmount(Integer amount) {
+	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 	}
+
+	public Long getSkuPrice() {
+		return skuPrice;
+	}
+
+	public void setSkuPrice(Long skuPrice) {
+		this.skuPrice = skuPrice;
+	}
+
 }
 package com.diligrp.mobsite.getway.domain.protocol.cart;
+import java.math.BigDecimal;
+
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +27,7 @@ public class ModifyAmountReq extends BaseReq {
      * 数量
      */
     @ApiModelProperty(value = "数量",required = true)
-    private Integer amount;
+    private BigDecimal amount;
     /**
@@ -34,7 +36,7 @@ public class ModifyAmountReq extends BaseReq {
      * @createTime 2014年10月28日 下午6:33:55
      * @author zhangshirui
      */
-    public Integer getAmount() {
+    public BigDecimal getAmount() {
         return amount;
     }
@@ -45,7 +47,7 @@ public class ModifyAmountReq extends BaseReq {
      * @createTime 2014年10月28日 下午6:33:55
      * @author zhangshirui
      */
-    public void setAmount(Integer amount) {
+    public void setAmount(BigDecimal amount) {
         this.amount = amount;
     }
@@ -115,7 +115,7 @@ public class ShoppingCartRPCImpl implements ShoppingCartRPC {
 	@Override
 	public ModifyAmountResp modifyAmount(ModifyAmountReq req) {
 		ShoppingCartUpdateInput input = new ShoppingCartUpdateInput();
-		input.setQuantity(req.getAmount().longValue());
+		input.setQuantity(req.getAmount());
 		input.setShopBuyerId(req.getUserId());
 		input.setSku(req.getSku());
 		BaseOutput<Boolean> response = this.cartService.modifyCart(input);
@@ -134,7 +134,6 @@ public class ShoppingCartRPCImpl implements ShoppingCartRPC {
 	@Override
 	public ConfirmCartResp confirmCartInfo(ConfirmCartReq req) {
-		GetCartByUserReq cartReq = new GetCartByUserReq();
 		ShoppingCartListInput input = new ShoppingCartListInput();
 		input.setShopBuyerId(req.getShopBuyerId());
 		input.setSkus(req.getSkus().toArray(new String[req.getSkus().size()]));
@@ -356,7 +356,7 @@
 		<dependency>
 			<groupId>com.b2c.orders</groupId>
 			<artifactId>b2c-orders-client</artifactId>
-			<version>0.0.3-SNAPSHOT</version>
+			<version>0.0.4-SNAPSHOT</version>
 		</dependency>
 		<!--商品库sdk-->