Merge branch 'master' of http://git.ds-bay.com/project/ccnet-wx-mp3.0

src/main/java/com/emato/ccnet/wx/biz/req/waybill/oms/Ceb511Response.java

@@ -119,8 +119,8 @@ public class Ceb511Response {
                 reMap.put("shippingStatus","1");
             }else {
                 reMap.put("shippingNo",wayBillResponse.getLogisticsNo());
-                reMap.put("shippingCode","YD");
-                reMap.put("shippingName","韵达快递");
+                reMap.put("shippingCode","YTO");
+                reMap.put("shippingName","圆通速递");
                 reMap.put("orderStatus","300");
                 reMap.put("shippingStatus","1");
             }

src/main/java/com/emato/ccnet/wx/dao/entity/wx/WxOrderDate.java

@@ -69,6 +69,26 @@ public class WxOrderDate implements Serializable {
 
     private String exprAgreementType;
 
+    private BigDecimal couponPrice;
+
+    private BigDecimal fullCutPrice;
+
+    public BigDecimal getFullCutPrice() {
+        return fullCutPrice;
+    }
+
+    public void setFullCutPrice(BigDecimal fullCutPrice) {
+        this.fullCutPrice = fullCutPrice;
+    }
+
+    public BigDecimal getCouponPrice() {
+        return couponPrice;
+    }
+
+    public void setCouponPrice(BigDecimal couponPrice) {
+        this.couponPrice = couponPrice;
+    }
+
     public String getExprAgreementType() {
         return exprAgreementType;
     }

src/main/java/com/emato/ccnet/wx/service/impl/CusOrderServiceImpl.java

@@ -259,8 +259,8 @@ public class CusOrderServiceImpl implements CusOrderService {
             cusOrderGoods.setBarCode(wxOrderGoods.getBarCode());
             cusOrderGoods.setUnit(wxOrderGoods.getUnit());
             cusOrderGoods.setQty(wxOrderGoods.getQty());
-            cusOrderGoods.setPrice(wxOrderGoods.getPrice());
-            cusOrderGoods.setTotalPrice(wxOrderGoods.getTotalPrice());
+            cusOrderGoods.setPrice(wxOrderGoods.getTaxPrice());
+            cusOrderGoods.setTotalPrice(wxOrderGoods.getActuralPrice());
             cusOrderGoods.setCurrency(Contants.CURRENCY);
             cusOrderGoods.setCountry(wxOrderGoods.getCountry());
             cusOrderGoods.setCiqGno(wxOrderGoods.getCiqGno());
@@ -317,9 +317,11 @@ public class CusOrderServiceImpl implements CusOrderService {
             cusOrder.setGoodsValue(goodsValue);
             BigDecimal taxTotal = new BigDecimal(0);
             BigDecimal paid = wxOrder.getActuralPaid();//订单下单总价格
-            if(paid != null){
-                taxTotal = paid.subtract(goodsValue).setScale(2, BigDecimal.ROUND_HALF_UP);
-            }
+//            logger.error("订单下单总价格："+paid);
+//            logger.error("商品不含税总价："+goodsValue);
+//            if(paid != null){
+//                taxTotal = paid.subtract(goodsValue).setScale(2, BigDecimal.ROUND_HALF_UP);
+//            }
 
             cusOrder.setTaxTotal(taxTotal);//待扣税款
             cusOrder.setFreight(wxOrder.getFreight());

src/main/java/com/emato/ccnet/wx/service/impl/CusWaybillServiceImpl.java

@@ -219,7 +219,7 @@ public class CusWaybillServiceImpl implements CusWaybillService {
             cusWaybillGoods.setCusWaybillSn(cusWaybillSn);
             cusWaybillGoods.setMerchOrderSn(wxOrder.getOrderSn());
             cusWaybillGoods.setSku(wxOrderGoods.getItemNo());
-            cusWaybillGoods.setBuyUnitPrice(wxOrderGoods.getPrice());
+            cusWaybillGoods.setBuyUnitPrice(wxOrderGoods.getTaxPrice());
             cusWaybillGoods.setBuyQty(wxOrderGoods.getQty());
             cusWaybillGoods.setCreaterSn(Contants.CREATER_NUMBER);
             cusWaybillGoods.setCreateTime(new Date());

src/main/java/com/emato/ccnet/wx/service/impl/WxOrderServiceImpl.java

@@ -194,13 +194,21 @@ public class WxOrderServiceImpl implements WxOrderService {
 
         BigDecimal freight = new BigDecimal(0);
         BigDecimal discount = new BigDecimal(0);
+        //优惠券优惠金额
+        if(wxOrderDate.getCouponPrice() != null && wxOrderDate.getCouponPrice().compareTo(new BigDecimal(0)) != 0) {
+            discount = wxOrderDate.getCouponPrice();
+        }
+        //满减优惠金额
+        if(wxOrderDate.getFullCutPrice() != null && wxOrderDate.getFullCutPrice().compareTo(new BigDecimal(0)) != 0) {
+            discount = wxOrderDate.getFullCutPrice();
+        }
         wxOrder.setFreight(freight);
         wxOrder.setDiscount(discount);
 
         wxOrder.setActuralPaid(wxOrderDate.getActuralPaid());
 
         wxOrder.setExprType(cus.getWaybill().get("exprType"));
-        if (!CcnetContants.wsFlag.item_00.getItem().equals(wxOrderDate.getWsFlag())) {
+        if (!CcnetContants.wsFlag.item_10.getItem().equals(wxOrderDate.getWsFlag())) {
             wxOrder.setExprCompId(cus.getWaybill().get("exprComrId"));
         } else {
             wxOrder.setExprCompId("emato");

src/main/resources/application-dev.yml

@@ -32,8 +32,8 @@ spring:
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
             url: jdbc:mysql://120.76.84.45:3306/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: ceshi
-            password: abc-123
+            username: tuser
+            password: Qq!123
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -112,9 +112,9 @@ cus:
         #校验
         check-url: http://127.0.0.1:8080/al/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play:
@@ -124,7 +124,7 @@ cus:
             #微信支付商户号
             mch-id: 1501125641
             #财富通编号：
-            pay-code: 440316T004
+            pay-code: 4403169D3W
             #财富通备案名称：
             pay-name: 财付通支付科技有限公司
             #海关

src/main/resources/application-global.yml

@@ -126,9 +126,9 @@ cus:
         #校验
         check-url: http://ws.ds-bay.com/al/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play:
@@ -139,7 +139,7 @@ cus:
             #微信支付商户号
             mch-id: 103106626
             #财富通编号：
-            pay-code: 440316T004
+            pay-code: 4403169D3W
             #财富通备案名称：
             pay-name: 财付通支付科技有限公司
             #海关

src/main/resources/application-test.yml

@@ -127,9 +127,9 @@ cus:
         #校验
         check-url: http://192.168.1.251:8680/oms-controller-ws/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play:
@@ -139,7 +139,7 @@ cus:
             #微信支付商户号
             mch-id: 1501125641
             #财富通编号：
-            pay-code: 440316T004
+            pay-code: 4403169D3W
             #财富通备案名称：
             pay-name: 财付通支付科技有限公司
             #海关

src/main/resources/application.yml

@@ -100,7 +100,7 @@ redis:
               port: 7004
             - host: 120.76.26.84
               port: 7005
-        password: Abc-123#*.-
+#        password: Abc-123#*.-
         # 连接超时时间(秒), 默认 2*1000
         connection-timeout: 5000
         # so-timeout:
@@ -189,9 +189,9 @@ cus:
         #校验
         check-url: http://ws.ds-bay.com/al/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play:
@@ -202,7 +202,7 @@ cus:
             #微信支付商户号
             mch-id: 1501125641
             #财富通编号：
-            pay-code: 440316T004
+            pay-code: 4403169D3W
             #财富通备案名称：
             pay-name: 财付通支付科技有限公司
             #海关

src/main/resources/mybatis/mapper/wx/WxOrderGrab.xml

@@ -32,6 +32,8 @@
     <result column="order_biz_type" property="wsFlag" jdbcType="CHAR" />
     <result column="buyer_pay_check" property="buyerPayCheck" jdbcType="CHAR" />
     <result column="expr_agreement_type" property="exprAgreementType" />
+    <result column="coupon_price" property="couponPrice" />
+    <result column="full_cut_price" property="fullCutPrice" />
   </resultMap>
 
   <resultMap id="wxOrderGoodsDate" type="com.emato.ccnet.wx.dao.entity.wx.WxOrderGoodsDate" >
@@ -55,7 +57,7 @@
   <select id="getWxOrderDate"  parameterType="hashMap" resultMap="wxOrderDate">
     SELECT mo.merch_order_sn,mo.order_sn,mo.id,ms.merch_sn,ms.merch_name, ms.store_number,ms.third_party_merch_code,ms.third_party_merch_name,mo.store_id,mo.add_time,mo.user_id,mo.add_time AS buyer_bill_time,mu.id_no,mu.username,
     mu.mobile AS buyer_tel,mo.consignee,mo.mobile,mo.province,mo.city,mo.district,mo.address,mo.pay_name,mo.pay_mobile,mo.pay_transaction_id,mo.actual_price,
-    mo.pay_time,mo.order_biz_type, mo.buyer_pay_check,ms.expr_agreement_type
+    mo.pay_time,mo.order_biz_type, mo.buyer_pay_check,ms.expr_agreement_type,mo.coupon_price,mo.full_cut_price
     FROM mall_order mo
     LEFT OUTER JOIN mall_user mu ON mo.user_id = mu.id
     LEFT OUTER JOIN mall_store ms ON mo.store_id = ms.id