Merge branch 'master' of dq/ccnet-wx-mp3.0 into master

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());

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/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