Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-05-19 23f5815a2327bde2a5259be3e83909c1aee94105

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java

@@ -346,7 +346,7 @@


        //计算运费
        discountExplain.setPostage(calculationPostage(discountExplain.getPayPrice(), HostInterceptor.getCompanyId()));
        discountExplain.setPostage(calculationPostage(billPrice, HostInterceptor.getCompanyId()));