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

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

@@ -76,7 +76,19 @@ public class OrderBill  implements Serializable {
      */
     private String address;
 
+    /**
+     * 商品原价格
+     */
+    private BigDecimal costPrice;
+
 
+    public BigDecimal getCostPrice() {
+        return costPrice;
+    }
+
+    public void setCostPrice(BigDecimal costPrice) {
+        this.costPrice = costPrice;
+    }
 
 
     public String getOrderNo() {

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

@@ -20,7 +20,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 @Service
@@ -216,22 +218,32 @@ public class CusOrderImpl implements CusOrderService{
         cusOrder.setAppStatus(Contants.APP_STATUS_SEPARETE);
         cusOrder.setAppTime(getNormalOrderNo());
         cusOrder.setOrderNo(orderBill.getOrderNo());
-        cusOrder.setEbpCode(merchant.getPlatSn());
-        cusOrder.setEbpName(merchant.getPlatName());
-        cusOrder.setEbcCode(merchant.getMerchSn());
-        cusOrder.setEbcName(merchant.getMerchName());
-        cusOrder.setGoodsValue(orderBill.getRealAmount());
+
+        cusOrder.setEbpCode(merchant.getMerchantCustomsCode());//电商平台代码
+        cusOrder.setEbpName(merchant.getMerchantCustomsName());//电商平台企业名称
+        cusOrder.setEbcCode(merchant.getMerchantCustomsCode());//电商商户代码
+        cusOrder.setEbcName(merchant.getMerchantCustomsName());//电商商户名称
+
+        BigDecimal goodsValue = orderBill.getCostPrice();
+        cusOrder.setGoodsValue(goodsValue);//成本价格
+
+        BigDecimal paid = orderBill.getRealAmount();
+        if(paid != null){
+            BigDecimal taxTotal = paid.subtract(goodsValue).setScale(2, BigDecimal.ROUND_HALF_UP);
+            cusOrder.setTaxTotal(taxTotal);//税率
+        }
+        cusOrder.setActuralPaid(paid);//总价格
+
         cusOrder.setbuyerIdNumber(orderBill.getUserId());
         cusOrder.setBuyerName(orderBill.getTrueName());
         cusOrder.setBuyerIdType(orderBill.getIdType());
         cusOrder.setbuyerIdNumber(orderBill.getIdCode());
-        cusOrder.setPayCode(merchant.getMerchantCustomsCode());
-        cusOrder.setPayName(merchant.getMerchantCustomsName());
-        cusOrder.setPayTransactionId(orderBill.getTradeNo());
+//        cusOrder.setPayCode(merchant.getMerchantCustomsCode());
+//        cusOrder.setPayName(merchant.getMerchantCustomsName());
+//        cusOrder.setPayTransactionId(orderBill.getTradeNo());
         cusOrder.setConsignee(orderBill.getAcceptName());
         cusOrder.setConsigneeTelephone(orderBill.getMobile());
         cusOrder.setConsigneeAddress(orderBill.getAddress());
-        cusOrder.setActuralPaid(orderBill.getRealAmount());
         cusOrder.setBuyerRegNo(orderBill.getUserId());
         return cusOrder;
     }

src/main/resources/mybatis/mapper/kmall/kmall_order.xml

@@ -68,6 +68,8 @@
 
         <result property="address" column="address"/>
 
+        <result property="costPrice" column="cost_price"/>
+
     </resultMap>
 
     <resultMap id="orderGoods" type="com.emato.ccnet.domain.kmall.OrderGoods">
@@ -85,7 +87,7 @@
     <select id="getOrderBills" parameterType="hashMap" resultMap="orderBill">
         SELECT tio.order_no, tio.seller_id, tis.seller_name, tio.create_time, tio.trade_no,
         tio.real_amount, tio.user_id, tim.true_name, tim.id_type, tim.id_code, tio.accept_name,
-        tio.mobile, tio.address
+        tio.mobile, tio.address,tig.cost_price
         FROM iwebshop_order tio
         LEFT OUTER JOIN iwebshop_seller tis ON tio.seller_id = tis.id
         LEFT OUTER JOIN iwebshop_order_cus tioc ON tio.order_no = tioc.order_no