From 8c7508388bad1234b731e0fc59afa095db0fda1b Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sun, 16 May 2021 06:24:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 3 ++- zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 2 +- zq-xcx/project.config.json | 4 +++- zq-erp/src/main/resources/config/application.properties | 2 +- zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java index 894cdf2..08f9c22 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java +++ b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java @@ -521,7 +521,7 @@ /** * 免免邮金额 */ - public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE"; + public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE"; /** diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java index b5a3280..034df56 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java @@ -119,7 +119,8 @@ throw new GlobleException(sysVipInfo.getPhone()+"手机已被注册!"); } } - + SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); + sysVipInfo.setCompanyId(user.getCompanyId()); sysVipInfo.setCreateTime(new Date()); sysVipInfo.setPointAll(0); sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP); diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java index 9a44280..855bde1 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java +++ b/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())); diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index 3480aab..7589d03 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -3,7 +3,7 @@ #线上测试环境 - +# spring.datasource.username=ct_test spring.datasource.password=123456 spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 diff --git a/zq-xcx/project.config.json b/zq-xcx/project.config.json index 8b486aa..77acbda 100644 --- a/zq-xcx/project.config.json +++ b/zq-xcx/project.config.json @@ -23,18 +23,20 @@ "compileHotReLoad": false, "useMultiFrameRuntime": true, "useApiHook": true, + "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, + "enableEngineNative": false, + "bundle": false, "useIsolateContext": true, "useCompilerModule": true, "userConfirmedUseCompilerModuleSwitch": false, "userConfirmedBundleSwitch": false, "packNpmManually": false, "packNpmRelationList": [], - "enableEngineNative": false, "minifyWXSS": true }, "compileType": "miniprogram", -- Gitblit v1.9.1