cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

对于程序中配置字段，统一管理

Browse Source
This commit is contained in:
wangdawei
2020-05-25 10:45:05 +08:00
parent 200b48dc4e
commit ceb396c91e
27 changed files with 328 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java
View File

@ -6,6 +6,7 @@
package co.yixiang.modules.shop.rest;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.shop.domain.YxUser;
import co.yixiang.modules.shop.service.YxSystemConfigService;
@ -47,7 +48,7 @@ public class MemberController {
public ResponseEntity getYxUsers(YxUserQueryCriteria criteria, Pageable pageable){
if(ObjectUtil.isNotNull(criteria.getIsPromoter())){
if(criteria.getIsPromoter() == 1){
String key = yxSystemConfigService.findByKey("store_brokerage_statu")
String key = yxSystemConfigService.findByKey(SystemConfigConstants.STORE_BROKERAGE_STATU)
.getValue();
if(Integer.valueOf(key) == 2){
return new ResponseEntity(null,HttpStatus.OK);

9
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java
View File

@ -6,9 +6,9 @@
package co.yixiang.modules.shop.rest;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.shop.domain.YxSystemConfig;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria;
@ -18,7 +18,6 @@ import co.yixiang.utils.RedisUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cache.annotation.CacheEvict;
@ -67,11 +66,11 @@ public class SystemConfigController {
yxSystemConfigModel.setMenuName(key);
yxSystemConfigModel.setValue(value.toString());
//重新配置微信相关
if(RedisKeyEnum.WECHAT_APPID.getValue().equals(key)){
if(SystemConfigConstants.WECHAT_APPID.equals(key)){
WxMpConfiguration.removeWxMpService();
WxPayConfiguration.removeWxPayService();
}
if( RedisKeyEnum.WXPAY_MCHID.getValue().equals(key) || RedisKeyEnum.WXAPP_APPID.getValue().equals(key)){
if(SystemConfigConstants.WXPAY_MCHID.equals(key) || SystemConfigConstants.WXAPP_APPID.equals(key)){
WxPayConfiguration.removeWxPayService();
}
RedisUtil.set(key,value.toString(),0);

6
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java
View File

@ -7,15 +7,15 @@ package co.yixiang.modules.shop.rest;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.constant.ShopConstants;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.shop.domain.YxSystemStore;
import co.yixiang.modules.shop.service.YxSystemStoreService;
import co.yixiang.modules.shop.service.dto.YxSystemStoreDto;
import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria;
import co.yixiang.mp.config.ShopKeyUtils;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.RedisUtil;
import com.alibaba.fastjson.JSON;
@ -80,7 +80,7 @@ public class SystemStoreController {
@ApiOperation("获取经纬度")
@PreAuthorize("@el.check('yxSystemStore:getl')")
public ResponseEntity<Object> create(@Validated @RequestBody String jsonStr){
String key = RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue());
String key = RedisUtil.get(ShopKeyUtils.getTengXunMapKey());
if(StrUtil.isBlank(key)) throw new BadRequestException("请先配置腾讯地图key");
JSONObject jsonObject = JSON.parseObject(jsonStr);
String addr = jsonObject.getString("addr");