Merge branch 'master' of hyq/ccnet2.0 into master

src/main/java/com/emato/ccnet/domain/kmall/OrderBill.java

@@ -7,72 +7,72 @@ import java.util.Date;
 /**
  * 电子订单数据
  */
-public class OrderBill  implements Serializable {
+public class OrderBill implements Serializable {
 
     private static final long serialVersionUID = 1430859128928892774L;
 
     /**
-     *商户订单编号/订单编号
+     * 商户订单编号/订单编号
      */
     private String orderNo;
 
     /**
-     *第三方商户代码
+     * 第三方商户代码
      */
     private String sellerId;
 
     /**
-     *第三方商户名称
+     * 第三方商户名称
      */
     private String sellerName;
 
     /**
-     *下单时间
+     * 下单时间
      */
     private Date createTime;
 
     /**
-     *支付平台交易号
+     * 支付平台交易号
      */
     private String tradeNo;
 
     /**
-     *商品价格
+     * 商品价格
      */
     private BigDecimal realAmount;
 
     /**
-     *订购人注册号
+     * 订购人注册号
      */
     private String userId;
 
     /**
-     *订购人姓名
+     * 订购人姓名
      */
     private String trueName;
 
     /**
-     *订购人证件类型
+     * 订购人证件类型
      */
     private String idType;
 
     /**
-     *订购人证件号码
+     * 订购人证件号码
      */
     private String idCode;
 
     /**
-     *收货人名称
+     * 收货人名称
      */
     private String acceptName;
 
     /**
-     *收货人电话
+     * 收货人电话
      */
     private String mobile;
 
     /**
-     *收货人地址
+     * 收货人地址
      */
     private String address;
 
@@ -81,6 +81,16 @@ public class OrderBill  implements Serializable {
      */
     private BigDecimal costPrice;
 
+    /**
+     * 运杂费
+     */
+    private BigDecimal freight;
+
+    /**
+     * 非现金抵扣金额
+     */
+    private BigDecimal discount;
+
 
     public BigDecimal getCostPrice() {
         return costPrice;
@@ -90,6 +100,23 @@ public class OrderBill  implements Serializable {
         this.costPrice = costPrice;
     }
 
+    public BigDecimal getFreight() {
+        return freight;
+    }
+
+    public void setFreight(BigDecimal freight) {
+        this.freight = freight;
+    }
+
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(BigDecimal discount) {
+        this.discount = discount;
+    }
+
+
 
     public String getOrderNo() {
         return orderNo;

src/main/java/com/emato/ccnet/service/ccent/impl/CusOrderImpl.java

@@ -227,12 +227,22 @@ public class CusOrderImpl implements CusOrderService{
         BigDecimal goodsValue = orderBill.getCostPrice();
         cusOrder.setGoodsValue(goodsValue);//成本价格
 
-        BigDecimal paid = orderBill.getRealAmount();
+        BigDecimal taxTotal = new BigDecimal(0);
+        BigDecimal freight = new BigDecimal(0);
+        BigDecimal discount = new BigDecimal(0);
+
+        BigDecimal paid = orderBill.getRealAmount();//订单下单总价格
         if(paid != null){
-            BigDecimal taxTotal = paid.subtract(goodsValue).setScale(2, BigDecimal.ROUND_HALF_UP);
-            cusOrder.setTaxTotal(taxTotal);//税率
+            taxTotal = paid.subtract(goodsValue).setScale(2, BigDecimal.ROUND_HALF_UP);
         }
-        cusOrder.setActuralPaid(paid);//总价格
+        //实际支付金额 = 成本价格+运杂费+代扣税款-非现金支付金额
+        BigDecimal totalPaid =goodsValue.add(freight).add(taxTotal).subtract(discount).setScale(2, BigDecimal.ROUND_HALF_UP);
+
+        cusOrder.setTaxTotal(taxTotal);//待扣税款
+        cusOrder.setFreight(freight);
+        cusOrder.setDiscount(discount);
+        cusOrder.setActuralPaid(totalPaid);
+
 
         cusOrder.setbuyerIdNumber(orderBill.getUserId());
         cusOrder.setBuyerName(orderBill.getTrueName());