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

2
yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java
View File

@ -3,12 +3,10 @@ package co.yixiang.listener;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.modules.shop.entity.YxSystemConfig;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.List;

6
yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java
View File

@ -16,6 +16,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.http.HttpUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
@ -34,6 +35,7 @@ import co.yixiang.modules.user.entity.YxSystemAttachment;
import co.yixiang.modules.user.service.YxSystemAttachmentService;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.web.vo.YxUserQueryVo;
import co.yixiang.mp.config.ShopKeyUtils;
import co.yixiang.utils.SecurityUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -268,11 +270,11 @@ public class StoreBargainController extends BaseController {
Integer bargainId = jsonObject.getInteger("bargainId");
if(ObjectUtil.isNull(bargainId)) return ApiResult.fail("参数有误");
String siteUrl = systemConfigService.getData("site_url");
String siteUrl = systemConfigService.getData(SystemConfigConstants.SITE_URL);
if(StrUtil.isEmpty(siteUrl)){
return ApiResult.fail("未配置h5地址");
}
String apiUrl = systemConfigService.getData("api_url");
String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
if(StrUtil.isEmpty(apiUrl)){
return ApiResult.fail("未配置api地址");
}

5
yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java
View File

@ -15,6 +15,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.http.HttpUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
@ -122,11 +123,11 @@ public class StoreCombinationController extends BaseController {
Integer pinkId = jsonObject.getInteger("id");
if(ObjectUtil.isNull(pinkId)) return ApiResult.fail("参数有误");
String siteUrl = systemConfigService.getData("site_url");
String siteUrl = systemConfigService.getData(SystemConfigConstants.SITE_URL);
if(StrUtil.isEmpty(siteUrl)){
return ApiResult.fail("未配置h5地址");
}
String apiUrl = systemConfigService.getData("api_url");
String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
if(StrUtil.isEmpty(apiUrl)){
return ApiResult.fail("未配置api地址");
}

6
yshop-api/src/main/java/co/yixiang/modules/order/service/YxPayService.java
View File

@ -41,7 +41,7 @@
// public WxPayMpOrderResult wxPay(String orderId, String openId, String body,
// Integer totalFee,int type) throws WxPayException {
//
// String apiUrl = systemConfigService.getData("api_url");
// String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
// if (StrUtil.isBlank(apiUrl)) throw new ErrorRequestException("请配置api地址");
//
// WxPayService wxPayService = WxPayConfiguration.getPayService();
@ -79,7 +79,7 @@
// public WxPayMwebOrderResult wxH5Pay(String orderId, String body,
// Integer totalFee,int type) throws WxPayException {
//
// String apiUrl = systemConfigService.getData("api_url");
// String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
// if (StrUtil.isBlank(apiUrl)) throw new ErrorRequestException("请配置api地址");
//
// WxPayService wxPayService = WxPayConfiguration.getPayService();
@ -110,7 +110,7 @@
// * @throws WxPayException
// */
// public void refundOrder(String orderId, Integer totalFee) throws WxPayException {
// String apiUrl = systemConfigService.getData("api_url");
// String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
// if (StrUtil.isBlank(apiUrl)) throw new ErrorRequestException("请配置api地址");
//
// WxPayService wxPayService = WxPayConfiguration.getPayService();

5
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -16,6 +16,7 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging;
import co.yixiang.constant.ShopConstants;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.tools.domain.AlipayConfig;
import co.yixiang.tools.domain.vo.TradeVo;
import co.yixiang.enums.*;
@ -1565,11 +1566,11 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
@Override
public PriceGroupDTO getOrderPriceGroup(List<YxStoreCartQueryVo> cartInfo) {
String storePostageStr = systemConfigService.getData("store_postage");//邮费基础价
String storePostageStr = systemConfigService.getData(SystemConfigConstants.STORE_POSTAGE);//邮费基础价
Double storePostage = 0d;
if(StrUtil.isNotEmpty(storePostageStr)) storePostage = Double.valueOf(storePostageStr);
String storeFreePostageStr = systemConfigService.getData("store_free_postage");//满额包邮
String storeFreePostageStr = systemConfigService.getData(SystemConfigConstants.STORE_FREE_POSTAGE);//满额包邮
Double storeFreePostage = 0d;
if(StrUtil.isNotEmpty(storeFreePostageStr)) storeFreePostage = Double.valueOf(storeFreePostageStr);

12
yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java
View File

@ -13,12 +13,12 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
import co.yixiang.enums.OrderInfoEnum;
import co.yixiang.enums.PayTypeEnum;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.tools.express.ExpressService;
import co.yixiang.tools.express.dao.ExpressInfo;
@ -129,9 +129,9 @@ public class StoreOrderController extends BaseController {
.beUsableCoupon(uid,priceGroup.getTotalPrice()));
//积分抵扣
OtherDTO other = new OtherDTO();
other.setIntegralRatio(systemConfigService.getData("integral_ratio"));
other.setIntegralFull(systemConfigService.getData("integral_full"));
other.setIntegralMax(systemConfigService.getData("integral_max"));
other.setIntegralRatio(systemConfigService.getData(SystemConfigConstants.INTERGRAL_RATIO));
other.setIntegralFull(systemConfigService.getData(SystemConfigConstants.INTERGRAL_FULL));
other.setIntegralMax(systemConfigService.getData(SystemConfigConstants.INTERGRAL_MAX));
//拼团 砍价 秒杀
int combinationId = 0;
@ -454,9 +454,9 @@ public class StoreOrderController extends BaseController {
//门店
if(OrderInfoEnum.SHIPPIING_TYPE_2.getValue().equals(storeOrder.getShippingType())){
String mapKey = RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue());
String mapKey = RedisUtil.get(SystemConfigConstants.TENGXUN_MAP_KEY);
if(StrUtil.isBlank(mapKey)) return ApiResult.fail("请配置腾讯地图key");
String apiUrl = systemConfigService.getData("api_url");
String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
if(StrUtil.isEmpty(apiUrl)){
return ApiResult.fail("未配置api地址");
}

6
yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
View File

@ -14,7 +14,6 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging;
import co.yixiang.enums.CommonEnum;
import co.yixiang.enums.ProductEnum;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.shop.entity.YxStoreProduct;
import co.yixiang.modules.shop.entity.YxStoreProductAttrValue;
@ -27,18 +26,17 @@ import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam;
import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo;
import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.mp.config.ShopKeyUtils;
import co.yixiang.utils.RedisUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
@ -173,7 +171,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<YxStoreProductMap
//门店
productDTO.setSystemStore(systemStoreService.getStoreInfo(latitude,longitude));
productDTO.setMapKey(RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue()));
productDTO.setMapKey(RedisUtil.get(ShopKeyUtils.getTengXunMapKey()));
return productDTO;
}

3
yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java
View File

@ -19,6 +19,7 @@ import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam;
import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging;
import co.yixiang.mp.config.ShopKeyUtils;
import co.yixiang.utils.LocationUtils;
import co.yixiang.utils.RedisUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -76,7 +77,7 @@ public class YxSystemStoreServiceImpl extends BaseServiceImpl<YxSystemStoreMappe
.orderByDesc("id")
.last("limit 1"));
if(yxSystemStore == null) return null;
String mention = RedisUtil.get("store_self_mention");
String mention = RedisUtil.get(ShopKeyUtils.getStoreSelfMention());
if(mention == null || Integer.valueOf(mention) == 2) return null;
YxSystemStoreQueryVo systemStoreQueryVo = storeMap.toDto(yxSystemStore);
if(StrUtil.isNotEmpty(latitude) && StrUtil.isNotEmpty(longitude)){

5
yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java
View File

@ -14,12 +14,12 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.common.api.ApiResult;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.modules.shop.service.YxStoreProductService;
import co.yixiang.modules.shop.service.YxSystemGroupDataService;
import co.yixiang.modules.shop.service.YxSystemStoreService;
import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam;
import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo;
import co.yixiang.mp.config.ShopKeyUtils;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.RedisUtil;
import com.alibaba.fastjson.JSON;
@ -29,7 +29,6 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
@ -84,7 +83,7 @@ public class IndexController {
//滚动
map.put("roll",systemGroupDataService.getDatas(ShopConstants.YSHOP_HOME_ROLL_NEWS));
map.put("mapKey",RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue()));
map.put("mapKey",RedisUtil.get(ShopKeyUtils.getTengXunMapKey()));
return ApiResult.ok(map);
}

9
yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java
View File

@ -13,6 +13,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
@ -122,11 +123,11 @@ public class StoreProductController extends BaseController {
YxStoreProduct storeProduct = storeProductService.getProductInfo(id);
// 海报
String siteUrl = systemConfigService.getData("site_url");
String siteUrl = systemConfigService.getData(SystemConfigConstants.SITE_URL);
if(StrUtil.isEmpty(siteUrl)){
return ApiResult.fail("未配置h5地址");
}
String apiUrl = systemConfigService.getData("api_url");
String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
if(StrUtil.isEmpty(apiUrl)){
return ApiResult.fail("未配置api地址");
}
@ -190,11 +191,11 @@ public class StoreProductController extends BaseController {
int uid = SecurityUtils.getUserId().intValue();
ProductDTO productDTO = storeProductService.goodsDetail(id,0,uid,latitude,longitude);
// 海报
// String siteUrl = systemConfigService.getData("site_url");
// String siteUrl = systemConfigService.getData(SystemConfigConstants.SITE_URL);
// if(StrUtil.isEmpty(siteUrl)){
// return ApiResult.fail("未配置h5地址");
// }
// String apiUrl = systemConfigService.getData("api_url");
// String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
// if(StrUtil.isEmpty(apiUrl)){
// return ApiResult.fail("未配置api地址");
// }

24
yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java
View File

@ -16,12 +16,11 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging;
import co.yixiang.constant.ShopConstants;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.AppFromEnum;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.BadRequestException;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.order.service.YxStoreOrderService;
@ -46,6 +45,7 @@ import co.yixiang.modules.user.web.dto.PromUserDTO;
import co.yixiang.modules.user.web.param.PromParam;
import co.yixiang.modules.user.web.param.YxUserQueryParam;
import co.yixiang.modules.user.web.vo.YxUserQueryVo;
import co.yixiang.mp.config.ShopKeyUtils;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.RedisUtil;
@ -177,9 +177,9 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
//获取后台分销类型 1 指定分销 2 人人分销
int storeBrokerageStatus = 1;
if(StrUtil.isNotEmpty(systemConfigService.getData("store_brokerage_statu"))){
if(StrUtil.isNotEmpty(systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_STATU))){
storeBrokerageStatus = Integer.valueOf(systemConfigService
.getData("store_brokerage_statu"));
.getData(SystemConfigConstants.STORE_BROKERAGE_STATU));
}
//指定分销 判断 上级是否时推广员 如果不是推广员直接跳转二级返佣
@ -192,7 +192,7 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
}
//获取后台一级返佣比例
String storeBrokerageRatioStr = systemConfigService.getData("store_brokerage_ratio");
String storeBrokerageRatioStr = systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_RATIO);
int storeBrokerageRatio = 0;
if(StrUtil.isNotEmpty(storeBrokerageRatioStr)){
storeBrokerageRatio = Integer.valueOf(storeBrokerageRatioStr);
@ -268,9 +268,9 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
//获取后台分销类型 1 指定分销 2 人人分销
int storeBrokerageStatus = 1;
if(StrUtil.isNotEmpty(systemConfigService.getData("store_brokerage_statu"))){
if(StrUtil.isNotEmpty(systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_STATU))){
storeBrokerageStatus = Integer.valueOf(systemConfigService
.getData("store_brokerage_statu"));
.getData(SystemConfigConstants.STORE_BROKERAGE_STATU));
}
//指定分销 判断 上上级是否时推广员 如果不是推广员直接返回
YxUserQueryVo preUser = getYxUserById(userInfoTwo.getSpreadUid());
@ -282,7 +282,7 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
}
//获取二级返佣比例
String storeBrokerageTwoStr = systemConfigService.getData("store_brokerage_two");
String storeBrokerageTwoStr = systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_TWO);
int storeBrokerageTwo = 0;
if(StrUtil.isNotEmpty(storeBrokerageTwoStr)){
storeBrokerageTwo = Integer.valueOf(storeBrokerageTwoStr);
@ -437,7 +437,7 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
//1-指定分销 2-人人分销
int storeBrokerageStatus = Integer.valueOf(systemConfigService
.getData("store_brokerage_statu"));
.getData(SystemConfigConstants.STORE_BROKERAGE_STATU));
//如果是指定分销，如果 推广人不是分销员不能形成关系
if(storeBrokerageStatus == 1 && userInfoT.getIsPromoter() == 0){
return true;
@ -483,7 +483,7 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
userQueryVo.setOrderStatusNum(orderService.orderData((int)id));
userQueryVo.setCouponCount(storeCouponUserService.getUserValidCouponCount((int)id));
//判断分销类型
String statu = systemConfigService.getData("store_brokerage_statu");
String statu = systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_STATU);
if(StrUtil.isNotEmpty(statu)){
userQueryVo.setStatu(Integer.valueOf(statu));
}else{
@ -647,8 +647,8 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
String spread = loginParam.getSpread();
try {
//读取redis配置
String appId = RedisUtil.get(RedisKeyEnum.WXAPP_APPID.getValue());
String secret = RedisUtil.get(RedisKeyEnum.WXAPP_SECRET.getValue());
String appId = RedisUtil.get(ShopKeyUtils.getWxAppAppId());
String secret = RedisUtil.get(ShopKeyUtils.getWxAppSecret());
if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) {
throw new ErrorRequestException("请先配置小程序");
}

7
yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java
View File

@ -14,6 +14,7 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
@ -78,7 +79,7 @@ public class UserBillController extends BaseController {
int uid = SecurityUtils.getUserId().intValue();
//判断分销类型
String statu = systemConfigService.getData("store_brokerage_statu");
String statu = systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_STATU);
YxUserQueryVo userQueryVo = yxUserService.getYxUserById(uid);
if(StrUtil.isNotEmpty(statu)){
if(Integer.valueOf(statu) == 1){
@ -124,11 +125,11 @@ public class UserBillController extends BaseController {
public ApiResult<Object> spreadBanner(@RequestParam(value = "",required=false) String from){
int uid = SecurityUtils.getUserId().intValue();
YxUserQueryVo userInfo = yxUserService.getYxUserById(uid);
String siteUrl = systemConfigService.getData("site_url");
String siteUrl = systemConfigService.getData(SystemConfigConstants.SITE_URL);
if(StrUtil.isEmpty(siteUrl)){
return ApiResult.fail("未配置h5地址");
}
String apiUrl = systemConfigService.getData("api_url");
String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL);
if(StrUtil.isEmpty(apiUrl)){
return ApiResult.fail("未配置api地址");
}

3
yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java
View File

@ -11,6 +11,7 @@ package co.yixiang.modules.user.web.controller;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
import co.yixiang.common.web.vo.Paging;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.user.service.YxUserExtractService;
import co.yixiang.modules.user.service.YxUserService;
@ -61,7 +62,7 @@ public class UserExtractController extends BaseController {
YxUserQueryVo userInfo = userService.getYxUserById(uid);
Map<String,Object> map = new LinkedHashMap<>();
map.put("commissionCount",userInfo.getBrokeragePrice());
map.put("minPrice",systemConfigService.getData("user_extract_min_price"));
map.put("minPrice",systemConfigService.getData(SystemConfigConstants.USER_EXTRACT_MIN_PRICE));
return ApiResult.ok(map);
}

3
yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java
View File

@ -15,6 +15,7 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
import co.yixiang.constant.ShopConstants;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.BillDetailEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.shop.service.YxSystemConfigService;
@ -84,7 +85,7 @@ public class UserRechargeController extends BaseController {
@ApiOperation(value = "公众号充值/H5充值",notes = "公众号充值/H5充值",response = ApiResult.class)
public ApiResult<Map<String,Object>> add(@Valid @RequestBody RechargeParam param){
int uid = SecurityUtils.getUserId().intValue();
String money = systemConfigService.getData("store_user_min_recharge");
String money = systemConfigService.getData(SystemConfigConstants.STORE_USER_MIN_RECHARGE);
Double newMoney = 0d;
if(StrUtil.isNotEmpty(money)) newMoney = Double.valueOf(money);
if(newMoney > param.getPrice()) throw new ErrorRequestException("充值金额不能低于"+newMoney);

7
yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
View File

@ -12,6 +12,7 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.BillDetailEnum;
import co.yixiang.enums.OrderInfoEnum;
import co.yixiang.modules.order.entity.YxStoreOrder;
@ -72,9 +73,9 @@ public class WechatController extends BaseController {
@ApiOperation(value = "微信分享配置",notes = "微信分享配置")
public ApiResult<Object> share() {
Map<String,Object> map = new LinkedHashMap<>();
map.put("img",systemConfigService.getData("wechat_share_img"));
map.put("title",systemConfigService.getData("wechat_share_title"));
map.put("synopsis",systemConfigService.getData("wechat_share_synopsis"));
map.put("img",systemConfigService.getData(SystemConfigConstants.WECHAT_SHARE_IMG));
map.put("title",systemConfigService.getData(SystemConfigConstants.WECHAT_SHARE_TITLE));
map.put("synopsis",systemConfigService.getData(SystemConfigConstants.WECHAT_SHARE_SYNOPSIS));
Map<String,Object> mapt = new LinkedHashMap<>();
mapt.put("data",map);
return ApiResult.ok(mapt);

17
yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java
View File

@ -12,36 +12,25 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.common.api.ApiResult;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.notify.NotifyType;
import co.yixiang.modules.notify.SmsResult;
import co.yixiang.modules.security.rest.param.VerityParam;
import co.yixiang.modules.user.entity.YxUser;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.YxWechatUserService;
import co.yixiang.modules.user.web.vo.YxUserQueryVo;
import co.yixiang.modules.wechat.web.param.BindPhoneParam;
import co.yixiang.modules.wechat.web.param.WxPhoneParam;
import co.yixiang.mp.utils.JsonUtils;
import co.yixiang.mp.config.ShopKeyUtils;
import co.yixiang.utils.RedisUtil;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.SecurityUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.CommonResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@ -108,8 +97,8 @@ public class WxMaUserController {
}
//读取redis配置
String appId = RedisUtil.get(RedisKeyEnum.WXAPP_APPID.getValue());
String secret = RedisUtil.get(RedisKeyEnum.WXAPP_SECRET.getValue());
String appId = RedisUtil.get(ShopKeyUtils.getWxAppAppId());
String secret = RedisUtil.get(ShopKeyUtils.getWxAppSecret());
if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) {
throw new ErrorRequestException("请先配置小程序");
}