angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 注册成功返回地址；

This commit is contained in:
cabbage 2025-06-11 16:20:17 +08:00
parent 78c9b8d038
commit a687acd4f3
11 changed files with 41 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java
View File

@ -5,14 +5,10 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.DesensitizedUtil;
import cn.hutool.json.JSONUtil;
import com.hzs.common.core.annotation.RepeatSubmitSimple;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.constant.MemberFieldConstants;
import com.hzs.common.core.constant.SysConstants;
import com.hzs.common.core.constant.msg.FinanceMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.CommonUtil;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.reflect.ReflectUtils;
import com.hzs.common.core.web.controller.BaseController;
@ -39,9 +35,7 @@ import com.hzs.member.base.vo.UpPolicyCurrencyVO;
import com.hzs.member.detail.service.ICuMemberServiceLogService;
import com.hzs.system.base.dto.CurrencyDTO;
import com.hzs.system.config.IAccountServiceApi;
import com.hzs.system.config.IGradeServiceApi;
import com.hzs.system.config.ITradeConfigServiceApi;
import com.hzs.system.config.dto.GradeDTO;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@ -49,16 +43,12 @@ import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 会员提现表 前端控制器
*
* @author hzs
* @since 2022-09-06
*/
@RestController
@RequestMapping("/api/transfer")
@ -85,9 +75,6 @@ public class ApiCuMemberTransferController extends BaseController {
@DubboReference
IAccountServiceApi accountServiceApi;
@DubboReference
IGradeServiceApi gradeServiceApi;
@DubboReference
ITradeConfigServiceApi tradeConfigServiceApi;

10
bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiAliSmsServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.hzs.member.sms.service.impl;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EAliSmsTemplate;
@ -20,11 +20,7 @@ import java.util.Date;
import java.util.concurrent.TimeUnit;
/**
* @Description: 阿里短信发送服务
* @Author: jiang chao
* @Time: 2024/12/19 16:30
* @Classname: ApiAliSmsServiceImpl
* @PackageName: com.hzs.member.sms.service.impl
* 阿里短信发送服务
*/
@Slf4j
@Service
@ -89,7 +85,7 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService {
@Override
public String checkCode(String phone, String smsCode, String checkKey) {
if (EEnv.TEST.getValue().equals(HzsConfig.getEnv()) && "ASDF".equals(smsCode)) {
if (EEnv.TEST.getValue().equals(BdConfig.getEnv()) && "ASDF".equals(smsCode)) {
// 测试环境暂时不发放短信
return null;
}

12
bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiSmsServiceImpl.java
View File

@ -1,23 +1,17 @@
package com.hzs.member.sms.service.impl;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.constant.msg.SystemMsgConstants;
import com.hzs.common.core.enums.EEnv;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.util.TransactionUtils;
import com.hzs.member.sms.service.IApiSmsService;
import com.hzs.third.sms.ISmsServiceApi;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Description: 短信处理服务
* @Author: jiang chao
* @Time: 2023/3/8 15:56
* @Classname: ApiSmsServiceImpjl
* @PackageName: com.hzs.member.sms.service.impl
* 短信处理服务
*/
@Slf4j
@Service
@ -28,7 +22,7 @@ public class ApiSmsServiceImpl implements IApiSmsService {
@Override
public String checkSms(String cacheKey, String code) {
if (EEnv.TEST.getValue().equals(HzsConfig.getEnv()) && "ASDF".equals(code)) {
if (EEnv.TEST.getValue().equals(BdConfig.getEnv()) && "ASDF".equals(code)) {
// 测试环境暂时不发放短信
return null;
}

8
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
View File

@ -9,16 +9,12 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hzs.bonus.settle.IMemberSettleBonusApi;
import com.hzs.common.core.annotation.RepeatSubmitSimple;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.constant.SysConstants;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.constant.msg.AreaConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.BoxProductUtil;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.bonus.CuMemberRetail;
import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.retail.member.CuMemberRetailRegion;
import com.hzs.common.domain.retail.member.ext.CuMemberRetailRegionExt;
@ -262,7 +258,7 @@ public class RetailMemberController extends BaseController {
*/
@GetMapping("/region-tree")
public AjaxResult regionTree() {
if (EEnv.TEST.getValue().equals(HzsConfig.getEnv()) && SecurityUtils.getUserId().equals(615423L)) {
if (EEnv.TEST.getValue().equals(BdConfig.getEnv()) && SecurityUtils.getUserId().equals(615423L)) {
// 测试环境，指定账号，返回收益区域为空
return AjaxResult.success();
}

4
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java
View File

@ -3,12 +3,10 @@ package com.hzs.retail.member.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.constant.*;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.retail.member.CuMemberRetailRegion;
import com.hzs.common.domain.retail.member.ext.CuMemberRetailRegionExt;
import com.hzs.common.domain.system.base.BdArea;
@ -16,14 +14,12 @@ import com.hzs.retail.member.mapper.CuMemberRetailRegionMapper;
import com.hzs.retail.member.param.RetailMemberRegionParam;
import com.hzs.retail.member.service.ICuMemberRetailAchieveService;
import com.hzs.retail.member.service.ICuMemberRetailRegionService;
import com.hzs.retail.member.vo.CuMemberRetailAchieveVO;
import com.hzs.retail.member.vo.UnboundAreaVO;
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.math.BigDecimal;
import java.util.Date;
import java.util.List;

8
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java
View File

@ -3,17 +3,13 @@ package com.hzs.retail.sale.controller.api;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.annotation.RepeatSubmit;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.constant.SysConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EEnv;
import com.hzs.common.core.enums.EGrade;
import com.hzs.common.core.enums.ESpecialArea;
import com.hzs.common.core.enums.EYesNo;
import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.domain.member.base.CuMember;
@ -42,7 +38,6 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -317,6 +312,7 @@ public class ApiRetailOrderController {
.phone(newMember.getPhone())
.loginPassword(newMember.getLoginPassword())
.payPassword(newMember.getPayPassword())
.urlAddress(BdConfig.getPc())
.build());
}

11
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/vo/RetailOrderVO.java
View File

@ -8,11 +8,7 @@ import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description: 新零售订单返回VO
* @Author: jiang chao
* @Time: 2024/12/12 16:38
* @Classname: RetailOrderVO
* @PackageName: com.hzs.retail.sale.vo
* 新零售订单返回VO
*/
@Builder
@AllArgsConstructor
@ -47,4 +43,9 @@ public class RetailOrderVO implements Serializable {
*/
private String payPassword;
/**
* 登录网址
*/
private String urlAddress;
}

14
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java
View File

@ -2,7 +2,7 @@ package com.hzs.sale.order.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.constant.HttpStatus;
@ -20,12 +20,9 @@ import com.hzs.common.domain.member.account.CuMemberAccount;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.ext.CuMemberAccountExt;
import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.sale.ext.SaOrderExt;
import com.hzs.common.domain.sale.order.SaOrder;
import com.hzs.common.domain.sale.order.SaOrderItems;
import com.hzs.common.domain.scm.ic.IcAvailableNum;
import com.hzs.common.domain.scm.ic.ext.IcAvailableNumExt;
import com.hzs.common.domain.scm.pub.ScmItemSpecs;
import com.hzs.common.domain.system.base.BdStorehouse;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.util.TransactionUtils;
@ -52,13 +49,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.math.BigDecimal;
import java.util.*;
/**
* @Description:
* @Author: sui q
* @Time: 2022/8/30 8:42
* @Classname: ParentOrderController
* @PackageName: com.hzs.sale.order.controller
*/
@Slf4j
public abstract class ParentOrderController extends BaseController {
@ -391,7 +381,7 @@ public abstract class ParentOrderController extends BaseController {
**/
protected String validateAvailableNum(OrderParam orderParam, String orderCode) {
// 验证是否控制进销存
if (EYesNo.NO.getIntValue() == HzsConfig.getEnable()) {
if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) {
return null;
}
BdStorehouse bdStorehouse;

13
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.activity.pick.service.IAcRetailPickService;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.constant.*;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.constant.msg.MemberMsgConstants;
@ -63,7 +63,6 @@ import com.hzs.sale.order.param.*;
import com.hzs.sale.order.service.*;
import com.hzs.sale.order.vo.*;
import com.hzs.sale.product.service.IBdProductExtendService;
import com.hzs.sale.product.service.IBdProductService;
import com.hzs.sale.wares.service.*;
import com.hzs.scm.pub.IScmBillServiceApi;
import com.hzs.system.base.IAreaServiceApi;
@ -151,8 +150,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Autowired
private UserTokenService userTokenService;
@Autowired
private IBdProductService iBdProductService;
@Autowired
private IBdProductExtendService iBdProductExtendService;
@Autowired
private RabbitTemplate rabbitTemplate;
@ -820,7 +817,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public void convertAvailableNumMsg(List<IcAvailableNumExt> availableNumList) {
if (EYesNo.NO.getIntValue() == HzsConfig.getEnable()) {
if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) {
return;
}
log.info("生产活动消息，activity.exchange：{}", JSONUtil.toJsonStr(availableNumList));
@ -1838,7 +1835,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public String validateAvailableNum(OrderParam orderParam, String orderCode) {
if (EYesNo.NO.getIntValue() == HzsConfig.getEnable()) {
if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) {
return null;
}
BdStorehouse bdStorehouse;
@ -2119,7 +2116,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public Boolean checkPreSalesQuantity(OrderParam orderParam) {
// 开关控制是否处理
if (EYesNo.NO.getIntValue() == HzsConfig.getEnable()) {
if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) {
return true;
}
@ -2158,7 +2155,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Transactional(rollbackFor = Exception.class)
public Boolean reducePreSalesQuantity(String orderCode, Integer specialArea) {
// 开关控制是否处理
if (EYesNo.NO.getIntValue() == HzsConfig.getEnable()) {
if (EYesNo.NO.getIntValue() == BdConfig.getEnable()) {
return true;
}

4
bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java
View File

@ -1,7 +1,7 @@
package com.hzs.common.core.aspect;
import com.hzs.common.core.annotation.RepeatSubmit;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.constant.CacheToolsConstants;
import com.hzs.common.core.constant.HttpStatus;
import com.hzs.common.core.constant.MemberFieldConstants;
@ -53,7 +53,7 @@ public class RepeatSubmitAspectAdvice {
request.getHeader(MemberFieldConstants.TOKEN);
try {
if (EEnv.DEV.getValue().equals(HzsConfig.getEnv())) {
if (EEnv.DEV.getValue().equals(BdConfig.getEnv())) {
// 本地研发环境，不做拦截处理
return joinPoint.proceed();
}

30
bd-common/bd-common-core/src/main/java/com/hzs/common/core/config/HzsConfig.java → bd-common/bd-common-core/src/main/java/com/hzs/common/core/config/BdConfig.java
View File

@ -8,17 +8,17 @@ import org.springframework.stereotype.Component;
*/
@Component
@ConfigurationProperties(prefix = "bd")
public class HzsConfig {
public class BdConfig {
/**
* 当前环境
*/
private static String env;
// /**
// * PC地址
// */
// private static String pc;
/**
* PC地址
*/
private static String pc;
// /**
// * 公众号地址
// */
@ -39,17 +39,17 @@ public class HzsConfig {
}
public void setEnv(String env) {
HzsConfig.env = env;
BdConfig.env = env;
}
public static String getPc() {
return pc;
}
public void setPc(String pc) {
BdConfig.pc = pc;
}
// public static String getPc() {
// return pc;
// }
//
// public void setPc(String pc) {
// HzsConfig.pc = pc;
// }
//
// public static String getGzh() {
// return gzh;
// }
@ -79,6 +79,6 @@ public class HzsConfig {
}
public void setEnable(Integer enable) {
HzsConfig.enable = enable;
BdConfig.enable = enable;
}
}