zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java
@@ -110,6 +110,7 @@ throw new GlobleException(AppMessageCode.User.ACCOUNT_IS_LOCK); } else { addErrorLoginRecord(loginUser, AppConstance.LOGIN_FAIL); throw new GlobleException(AppMessageCode.User.ACCOUNT_PASSWORD_ERROR, sessionErrorTimes, sessionErrorTimes, 5); }
@@ -253,9 +253,13 @@ sysProjServices.setTotalTime(totalTime); sysProjServices.setMoney(new BigDecimal(hkPrice).setScale(2, BigDecimal.ROUND_HALF_DOWN).doubleValue()); sysProjServicesDao.update(sysProjServices); //jyytodo 小程序订单没有操作人 Long userId=0L; if(user!=null){ userId= user.getSuId(); } //保存单据日志 operationLogService.saveOperation(sysProjServices.getCompanyId(), sysProjServices.getShopId(),user.getSuId(), operationLogService.saveOperation(sysProjServices.getCompanyId(), sysProjServices.getShopId(),userId, OperationFunctionEnum.SERVICE_ORDER, OperationButtonEnum.CREATE, sysProjServices.getId(), zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
@@ -238,7 +238,7 @@ if ((loginUser.getIsSales() == null || loginUser.getIsSales() == 2) && StringUtils.isNotBlank(sysVipInfo.getNickName())) {//目前还不是分销员 BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId()); if (fxSwith!=null && fxSwith.getParamValue().equals("1")) {//开启分销 if (fxSwith!=null && "1".equals(fxSwith.getParamValue())) {//开启分销 BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, loginUser.getCompanyId()); if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {//自动成为分销员 QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>(); zq-erp/src/main/resources/config/application-alpha.properties
@@ -3,9 +3,9 @@ #线上测试环境 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 spring.datasource.username=hive spring.datasource.password=hive123!@# spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 @@ -37,10 +37,11 @@ #rabbitMQ配置 rabbitmq.host=120.27.238.55 rabbitmq.host=47.111.134.136 rabbitmq.port=5672 rabbitmq.username=ct_rabbit rabbitmq.password=123456 rabbitmq.username=hivequeue rabbitmq.password=hivequeueadmin useRabbit=true server.session.timeout=120 @@ -61,7 +62,7 @@ #是否启用debug模式 debug=false # 日志文件保存地址 log_path=/home/javaweb/hive/log log_path=/mnt/hive/log # 系统语言环境 zh中文，us英文 system_language=zh @@ -72,9 +73,9 @@ default_password=123 #nginx静态资源访问地址 static_resource_url=http://120.27.238.55:8000/hive/static/uploadeFile/ static_resource_url=https://hive.file.csxuncong.com/uploadeFile/ #文件保存地址 file_storage_path=/home/javaweb/webresource/hive/static/uploadeFile/ file_storage_path=/mnt/hive/static/uploadeFile/ #文件上传大小字节为单位 10MB maxUploadSize=10485760 @@ -119,6 +120,8 @@ wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code xcx_appid =wx3836ab3c1490ff29 xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47 xcx_manager_appid=wx0d5655a6443807d3 xcx_manager_secret=b04e675224437c4f17c3068b6c2377b6 #微信支付调试开关 wx_pay_debug_onoff = false zq-erp/src/main/resources/config/prd/system.properties
@@ -95,7 +95,7 @@ platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo #微信支付回调地址 pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback pay_notify_url=https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
