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

Merge branch 'lx_dev' of gitee.com:cabbage_qd/java-base-app into lx_dev

This commit is contained in:
woody 2025-05-12 17:37:06 +08:00
parent c8f6679ca6 4e4b1408cc
commit 90334f01d8
46 changed files with 367 additions and 1469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bd-api/bd-api-system/src/main/java/com/hzs/system/base/ISystemConfigServiceApi.java
View File

@ -1,18 +1,13 @@
package com.hzs.system.base; package com.hzs.system.base;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.domain.system.base.BdCubasdoc;
import com.hzs.system.base.dto.BdCubasdocDTO; import com.hzs.system.base.dto.BdCubasdocDTO;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
/** /**
* @Description: 查询系统参数 * 查询系统参数
* @Author: sui q
* @Time: 2022/11/10 11:27
* @Classname: ISystemConfigServiceApi
* @PackageName: com.hzs.system.base
*/ */
public interface ISystemConfigServiceApi { public interface ISystemConfigServiceApi {
@ -21,9 +16,6 @@ public interface ISystemConfigServiceApi {
* *
* @param pkCountry 国家 * @param pkCountry 国家
* @param key 键 * @param key 键
* @return: BdSystemConfig
* @Author: sui q
* @Date: 2022/11/10 11:28
*/ */
R<String> getBonusSystemConfig(Integer pkCountry, String key); R<String> getBonusSystemConfig(Integer pkCountry, String key);
@ -40,42 +32,22 @@ public interface ISystemConfigServiceApi {
* 批量查询系统参数 * 批量查询系统参数
* *
* @param pkCountry 国家 * @param pkCountry 国家
* @return: R<Map < String, String>>
* @Author: sui q
* @Date: 2022/11/10 14:03
*/ */
R<Map<String, String>> getBonusSystemConfig(Integer pkCountry); R<Map<String, String>> getBonusSystemConfig(Integer pkCountry);
/** /**
* 批量查询所有国家的系统参数 * 批量查询所有国家的系统参数
*
* @return: R<Map < String, String>>
* @Author: sui q
* @Date: 2022/11/10 14:04
*/ */
R<Map<String, String>> getBonusSystemConfig(); R<Map<String, String>> getBonusSystemConfig();
/** /**
* 批量查询所有国家的订单参数 * 批量查询所有国家的订单参数
*
* @return: R<Map < String, String>>
* @Author: yh
* @Date: 2022/11/10 14:04
*/ */
R<Map<String, String>> getSystemConfig(); R<Map<String, String>> getSystemConfig();
/* /*
* @description: 根据用户查询供应商 * @description: 根据用户查询供应商
* @author: sui q
* @date: 2024/3/23 11:56
* @param: null null
**/ **/
R<BdCubasdocDTO> queryBdCubasdocByUser(Long pkUser); R<BdCubasdocDTO> queryBdCubasdocByUser(Long pkUser);
/**
* 保存供应商
* @param cubasdocDto 参数
* @return
*/
R<Boolean> saveCubasdoc(BdCubasdocDTO cubasdocDto);
} }

159
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java
View File

@ -16,6 +16,7 @@ import com.hzs.common.core.utils.poi.ExcelUtil;
import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.service.ITransactionCommonService;
import com.hzs.common.util.TransactionUtils; import com.hzs.common.util.TransactionUtils;
@ -46,38 +47,31 @@ import java.util.*;
/** /**
* 注水业绩记录表 前端控制器 * 注水业绩记录表 前端控制器
*
* @author zhangjing
* @since 2023-02-03
*/ */
@RestController @RestController
@RequestMapping("/manager/member-achieve-log") @RequestMapping("/manager/member-achieve-log")
public class CuMemberAchieveLogController extends BaseController { public class CuMemberAchieveLogController extends BaseController {
@Autowired @Autowired
private ICuMemberAchieveLogService cuMemberAchieveLogService; private ICuMemberAchieveLogService iCuMemberAchieveLogService;
@Autowired @Autowired
private ICuMemberTradeService cuMemberTradeService; private ICuMemberTradeService iCuMemberTradeService;
@Autowired @Autowired
private ICuMemberBaseService cuMemberBaseService; private ICuMemberBaseService iCuMemberBaseService;
@Autowired @Autowired
private ICuMemberSettlePeriodService cuMemberSettlePeriodService; private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired @Autowired
private ICuMemberService cuMemberService; private ICuMemberService iCuMemberService;
@Autowired @Autowired
private ITransactionCommonService iTransactionCommonService; private ITransactionCommonService iTransactionCommonService;
@DubboReference @DubboReference
IServiceChargeServiceApi serviceChargeServiceApi; IServiceChargeServiceApi iServiceChargeServiceApi;
@DubboReference @DubboReference
ICurrencyServiceApi currencyServiceApi; ICurrencyServiceApi iCurrencyServiceApi;
/** /**
* @description: 特殊业务-注水业绩记录查询 * 特殊业务-注水业绩记录查询
* @author: zhang jing
* @date: 2023/2/3 17:21
* @param: [cuMemberAchieveLogVO]
* @return: com.hzs.common.core.web.page.TableDataInfo
**/ **/
@AccessPermissions("WaterPv") @AccessPermissions("WaterPv")
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT)
@ -85,8 +79,8 @@ public class CuMemberAchieveLogController extends BaseController {
public TableDataInfo achieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO) { public TableDataInfo achieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO) {
startPage(); startPage();
cuMemberAchieveLogVO.setPkCountry(SecurityUtils.getPkCountry()); cuMemberAchieveLogVO.setPkCountry(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
List<CuMemberAchieveLogVO> list = cuMemberAchieveLogService.queryMemberAchieveLogList(cuMemberAchieveLogVO); List<CuMemberAchieveLogVO> list = iCuMemberAchieveLogService.queryMemberAchieveLogList(cuMemberAchieveLogVO);
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
for (CuMemberAchieveLogVO cma : list) { for (CuMemberAchieveLogVO cma : list) {
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
@ -174,18 +168,14 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 导出 * 导出
* @author: zhang jing
* @date: 2023/4/7 10:14
* @param: [response, cuMemberAchieveLogVO, language]
* @return: void
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.EXPORT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, CuMemberAchieveLogVO cuMemberAchieveLogVO) { public void export(HttpServletResponse response, CuMemberAchieveLogVO cuMemberAchieveLogVO) {
startPage(); startPage();
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
List<CuMemberAchieveLogVO> list = cuMemberAchieveLogService.queryMemberAchieveLogList(cuMemberAchieveLogVO); List<CuMemberAchieveLogVO> list = iCuMemberAchieveLogService.queryMemberAchieveLogList(cuMemberAchieveLogVO);
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
//枚举翻译 //枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EInfusingWaterType.values()); Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EInfusingWaterType.values());
@ -282,11 +272,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 下载模板 * 下载模板
* @author: zhang jing
* @date: 2023/4/11 17:45
* @param: [response]
* @return: void
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.EXPORT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.EXPORT)
@PostMapping("/download") @PostMapping("/download")
@ -298,11 +284,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 查询会员当期业绩 * 查询会员当期业绩
* @author: zhang jing
* @date: 2023/2/4 9:37
* @param: [cuMemberAchieveLogVO]
* @return: com.hzs.common.core.web.page.TableDataInfo
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT)
@GetMapping("/searchList") @GetMapping("/searchList")
@ -311,18 +293,18 @@ public class CuMemberAchieveLogController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL));
} }
UpdateCodeVO updateCodeVO = BeanUtil.copyProperties(cuMemberAchieveLogVO, UpdateCodeVO.class); UpdateCodeVO updateCodeVO = BeanUtil.copyProperties(cuMemberAchieveLogVO, UpdateCodeVO.class);
updateCodeVO = cuMemberService.specialBusinessQuery(updateCodeVO); updateCodeVO = iCuMemberService.specialBusinessQuery(updateCodeVO);
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
Integer maxSecond = cuMemberAchieveLogService.selectByMaxApproveNumber(updateCodeVO.getPkId(), EApproveStatus.FINISH.getValue()); Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(updateCodeVO.getPkId(), EApproveStatus.FINISH.getValue());
//查询扣费金额，账户信息 //查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
serviceChargeDTO.setQuantity(maxSecond + 1); serviceChargeDTO.setQuantity(maxSecond + 1);
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
updateCodeVO.setCost(serviceChargeDTOR.getData().getCost()); updateCodeVO.setCost(serviceChargeDTOR.getData().getCost());
updateCodeVO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); updateCodeVO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
updateCodeVO.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount())); updateCodeVO.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
cuMemberAchieveLogVO = BeanUtil.copyProperties(updateCodeVO, CuMemberAchieveLogVO.class); cuMemberAchieveLogVO = BeanUtil.copyProperties(updateCodeVO, CuMemberAchieveLogVO.class);
cuMemberAchieveLogVO.setPkMember(updateCodeVO.getPkId()); cuMemberAchieveLogVO.setPkMember(updateCodeVO.getPkId());
List<CuMemberAchieveLogVO> list = new ArrayList<>(); List<CuMemberAchieveLogVO> list = new ArrayList<>();
@ -331,11 +313,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 根据某一期查询历史业绩 * 根据某一期查询历史业绩
* @author: zhang jing
* @date: 2023/9/11 9:26
* @param: [cuMemberAchieveLogVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT)
@GetMapping("/historyAchieve") @GetMapping("/historyAchieve")
@ -344,7 +322,7 @@ public class CuMemberAchieveLogController extends BaseController {
String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberAchieveLogVO.getSettleDate()); String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberAchieveLogVO.getSettleDate());
String month = DateUtils.getMonth(datestr); String month = DateUtils.getMonth(datestr);
String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month; String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month;
Integer count = cuMemberService.selectExistTable(tableName); Integer count = iCuMemberService.selectExistTable(tableName);
if (count == 0) { if (count == 0) {
//表不存在则查询之前一天的数据 //表不存在则查询之前一天的数据
cuMemberAchieveLogVO.setSettleDate(DateUtils.beforeDate(1, ChronoUnit.DAYS, cuMemberAchieveLogVO.getSettleDate())); cuMemberAchieveLogVO.setSettleDate(DateUtils.beforeDate(1, ChronoUnit.DAYS, cuMemberAchieveLogVO.getSettleDate()));
@ -353,13 +331,13 @@ public class CuMemberAchieveLogController extends BaseController {
tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month; tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month;
} }
//查询最新期数 //查询最新期数
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(datestr)).getPkId(); DateUtils.parseDateToStr(datestr)).getPkId();
cuMemberAchieveLogVO.setTableName(tableName); cuMemberAchieveLogVO.setTableName(tableName);
cuMemberAchieveLogVO.setPeriod(period); cuMemberAchieveLogVO.setPeriod(period);
List<CuMemberAchieveLogVO> calList = new ArrayList<>(); List<CuMemberAchieveLogVO> calList = new ArrayList<>();
calList.add(cuMemberAchieveLogVO); calList.add(cuMemberAchieveLogVO);
calList = cuMemberAchieveLogService.queryMemberAchieveHistoryList(calList); calList = iCuMemberAchieveLogService.queryMemberAchieveHistoryList(calList);
if (CollectionUtil.isNotEmpty(calList)) { if (CollectionUtil.isNotEmpty(calList)) {
return AjaxResult.success(calList.get(0)); return AjaxResult.success(calList.get(0));
} else { } else {
@ -371,11 +349,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 判断日期是否在7天内 * 判断日期是否在7天内
* @author: zhang jing
* @date: 2023/3/28 9:25
* @param: [addtime, now]
* @return: boolean
**/ **/
private boolean isLatestWeek(Date addtime, Date now) { private boolean isLatestWeek(Date addtime, Date now) {
Calendar calendar = Calendar.getInstance(); //得到日历 Calendar calendar = Calendar.getInstance(); //得到日历
@ -386,11 +360,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 导入信息 * 导入信息
* @author: zhang jing
* @date: 2023/2/3 17:48
* @param: [file, updateSupport]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.IMPORT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
@ -404,7 +374,7 @@ public class CuMemberAchieveLogController extends BaseController {
for (CuMemberAchieveLogImportVO cma : list) { for (CuMemberAchieveLogImportVO cma : list) {
if (StringUtils.isNotEmpty(cma.getMemberCode())) { if (StringUtils.isNotEmpty(cma.getMemberCode())) {
UpdateCodeVO updateCodeVO = BeanUtil.copyProperties(cma, UpdateCodeVO.class); UpdateCodeVO updateCodeVO = BeanUtil.copyProperties(cma, UpdateCodeVO.class);
updateCodeVO = cuMemberService.specialBusinessQuery(updateCodeVO); updateCodeVO = iCuMemberService.specialBusinessQuery(updateCodeVO);
if (null == updateCodeVO) { if (null == updateCodeVO) {
cma.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); cma.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
errorlist.add(cma); errorlist.add(cma);
@ -412,16 +382,16 @@ public class CuMemberAchieveLogController extends BaseController {
} }
cma.setPkMember(updateCodeVO.getPkId()); cma.setPkMember(updateCodeVO.getPkId());
cma.setMemberName(updateCodeVO.getMemberName()); cma.setMemberName(updateCodeVO.getMemberName());
Integer maxSecond = cuMemberAchieveLogService.selectByMaxApproveNumber(updateCodeVO.getPkId(), EApproveStatus.FINISH.getValue()); Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(updateCodeVO.getPkId(), EApproveStatus.FINISH.getValue());
//查询扣费金额，账户信息 //查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
serviceChargeDTO.setQuantity(maxSecond + 1); serviceChargeDTO.setQuantity(maxSecond + 1);
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
cma.setCost(serviceChargeDTOR.getData().getCost()); cma.setCost(serviceChargeDTOR.getData().getCost());
cma.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); cma.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
cma.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount())); cma.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
listNew.add(cma); listNew.add(cma);
} else { } else {
cma.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); cma.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
@ -436,11 +406,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 根据选中的会员查询会员的历史业绩 * 根据选中的会员查询会员的历史业绩
* @author: zhang jing
* @date: 2023/3/28 19:46
* @param: [cuMemberAchieveLogVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT)
@PostMapping("/infusingWaterBelow") @PostMapping("/infusingWaterBelow")
@ -457,7 +423,7 @@ public class CuMemberAchieveLogController extends BaseController {
for (Long pkid : cuMemberAchieveLogVO.getPkMemberList()) { for (Long pkid : cuMemberAchieveLogVO.getPkMemberList()) {
CuMemberAchieveLogVO cma = new CuMemberAchieveLogVO(); CuMemberAchieveLogVO cma = new CuMemberAchieveLogVO();
cma.setPkMember(pkid); cma.setPkMember(pkid);
CuMemberAchieveLogVO cmal = cuMemberAchieveLogService.searchOne(cma, pkCountry); CuMemberAchieveLogVO cmal = iCuMemberAchieveLogService.searchOne(cma, pkCountry);
if (StringUtils.isNotNull(cmal)) { if (StringUtils.isNotNull(cmal)) {
CuMemberAchieveLogVO cmalnew = new CuMemberAchieveLogVO(); CuMemberAchieveLogVO cmalnew = new CuMemberAchieveLogVO();
cmalnew.setPkMember(cma.getPkMember()); cmalnew.setPkMember(cma.getPkMember());
@ -493,17 +459,17 @@ public class CuMemberAchieveLogController extends BaseController {
cmalnew.setRepBSumPv(cma.getRepBSumPv()); cmalnew.setRepBSumPv(cma.getRepBSumPv());
} }
} }
Integer maxSecond = cuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue()); Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue());
//查询扣费金额，账户信息 //查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
serviceChargeDTO.setQuantity(maxSecond + 1); serviceChargeDTO.setQuantity(maxSecond + 1);
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
//接口查询金额是否足够 //接口查询金额是否足够
cmalnew.setCost(serviceChargeDTOR.getData().getCost()); cmalnew.setCost(serviceChargeDTOR.getData().getCost());
cmalnew.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); cmalnew.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
cmalnew.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount())); cmalnew.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
listNew.add(cmalnew); listNew.add(cmalnew);
} }
} }
@ -512,11 +478,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description:注水业绩 确认 * 注水业绩 确认
* @author: zhang jing
* @date: 2023/2/6 14:50
* @param: [cuMemberAchieveLogVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SUBMIT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SUBMIT)
@PostMapping("/infusingWater") @PostMapping("/infusingWater")
@ -565,7 +527,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
//获取期数 //获取期数
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cmal.getSettleDate())).getPkId(); int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cmal.getSettleDate())).getPkId();
if (period == 0) { if (period == 0) {
cmal.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.ACHIEVE_WITHIN_SEVEN_DAYS)); cmal.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.ACHIEVE_WITHIN_SEVEN_DAYS));
errorList.add(cmal); errorList.add(cmal);
@ -591,7 +553,21 @@ public class CuMemberAchieveLogController extends BaseController {
&& StringUtils.isNull(cmal.getRepBModifySumPv())) { && StringUtils.isNull(cmal.getRepBModifySumPv())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.INFUSING_WATER_PV_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.INFUSING_WATER_PV_NOT_NULL));
} }
Integer maxSecond = cuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue());
CuMember cuMember = iCuMemberService.getMember(cmal.getPkMember());
if (null == cuMember) {
cmal.setErrorMsg(TransactionUtils.getContent("会员 " + cmal.getMemberCode() + " 不存在"));
errorList.add(cmal);
continue;
}
if (cmal.getSettleDateStr().compareTo(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, cuMember.getPayTime())) < 0) {
// 注水日期不能早于会员的注册日期
cmal.setErrorMsg(TransactionUtils.getContent("会员 " + cmal.getMemberCode() + " 注水日期不能早于会员支付日期"));
errorList.add(cmal);
continue;
}
Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue());
cmal.setApproveNumber(maxSecond + 1); cmal.setApproveNumber(maxSecond + 1);
if (cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() || if (cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() ||
cuMemberAchieveLogVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { cuMemberAchieveLogVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
@ -600,7 +576,7 @@ public class CuMemberAchieveLogController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
serviceChargeDTO.setQuantity(maxSecond + 1); serviceChargeDTO.setQuantity(maxSecond + 1);
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
//接口查询金额是否足够 //接口查询金额是否足够
businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
businessCommissionDTO.setPkCountry(pkCountry); businessCommissionDTO.setPkCountry(pkCountry);
@ -609,7 +585,7 @@ public class CuMemberAchieveLogController extends BaseController {
memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost()); memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost());
cmal.setCost(serviceChargeDTOR.getData().getCost()); cmal.setCost(serviceChargeDTOR.getData().getCost());
cmal.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); cmal.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
cmal.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount())); cmal.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
memberAmountDTOList.add(memberAmountDTO); memberAmountDTOList.add(memberAmountDTO);
} }
pkMemberList.add(cmal.getPkMember()); pkMemberList.add(cmal.getPkMember());
@ -618,10 +594,9 @@ public class CuMemberAchieveLogController extends BaseController {
return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorList); return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorList);
} }
cuMemberAchieveLogVO.setPkMemberList(pkMemberList); cuMemberAchieveLogVO.setPkMemberList(pkMemberList);
List<CuMemberAchieveLogVO> achieveList = cuMemberAchieveLogService.checkAchieveList(cuMemberAchieveLogVO); List<CuMemberAchieveLogVO> achieveList = iCuMemberAchieveLogService.checkAchieveList(cuMemberAchieveLogVO);
if (CollectionUtil.isNotEmpty(achieveList)) { if (CollectionUtil.isNotEmpty(achieveList)) {
achieveList.forEach(itm -> itm.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)) achieveList.forEach(itm -> itm.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)));
);
return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, achieveList); return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, achieveList);
} }
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) { if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
@ -629,14 +604,14 @@ public class CuMemberAchieveLogController extends BaseController {
cuMemberAchieveLogVO.setMemberAmountDTOList(memberAmountDTOList); cuMemberAchieveLogVO.setMemberAmountDTOList(memberAmountDTOList);
cuMemberAchieveLogVO.setPkCountry(pkCountry); cuMemberAchieveLogVO.setPkCountry(pkCountry);
//接口查询金额是否足够 //接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) { if (CollectionUtil.isNotEmpty(memberBalanceList)) {
memberBalanceList.forEach(item -> errorList.add(BeanUtil.copyProperties(item, CuMemberAchieveLogVO.class))); memberBalanceList.forEach(item -> errorList.add(BeanUtil.copyProperties(item, CuMemberAchieveLogVO.class)));
errorList.forEach(itm2 -> itm2.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT))); errorList.forEach(itm2 -> itm2.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT)));
return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorList); return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorList);
} }
} }
memberAchieveLogVONew = cuMemberAchieveLogService.infusingWater(cuMemberAchieveLogVO); memberAchieveLogVONew = iCuMemberAchieveLogService.infusingWater(cuMemberAchieveLogVO);
} else { } else {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
} }
@ -644,11 +619,7 @@ public class CuMemberAchieveLogController extends BaseController {
} }
/** /**
* @description: 特殊业务-注水业绩-发起签呈 * 特殊业务-注水业绩-发起签呈
* @author: zhang jing
* @date: 2023/3/28 13:50
* @param: [cuMemberAchieveLogVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SUBMIT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SUBMIT)
@PostMapping("/petition") @PostMapping("/petition")
@ -693,7 +664,7 @@ public class CuMemberAchieveLogController extends BaseController {
&& StringUtils.isNull(cmal.getRepBModifySumPv())) { && StringUtils.isNull(cmal.getRepBModifySumPv())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.INFUSING_WATER_PV_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.INFUSING_WATER_PV_NOT_NULL));
} }
Integer maxSecond = cuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue()); Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue());
cmal.setApproveNumber(maxSecond + 1); cmal.setApproveNumber(maxSecond + 1);
if (cuMemberAchieveLogVO.getProcessType() == EProcessType.DOUBLEPAY.getValue() || if (cuMemberAchieveLogVO.getProcessType() == EProcessType.DOUBLEPAY.getValue() ||
cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDPAY.getValue()) { cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDPAY.getValue()) {
@ -702,7 +673,7 @@ public class CuMemberAchieveLogController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
serviceChargeDTO.setQuantity(maxSecond + 1); serviceChargeDTO.setQuantity(maxSecond + 1);
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
//接口查询金额是否足够 //接口查询金额是否足够
businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
businessCommissionDTO.setPkCountry(pkCountry); businessCommissionDTO.setPkCountry(pkCountry);
@ -711,13 +682,13 @@ public class CuMemberAchieveLogController extends BaseController {
memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost()); memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost());
cmal.setCost(serviceChargeDTOR.getData().getCost()); cmal.setCost(serviceChargeDTOR.getData().getCost());
cmal.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); cmal.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
cmal.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount())); cmal.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
memberAmountDTOList.add(memberAmountDTO); memberAmountDTOList.add(memberAmountDTO);
pkMemberList.add(cmal.getPkMember()); pkMemberList.add(cmal.getPkMember());
} }
} }
cuMemberAchieveLogVO.setPkMemberList(pkMemberList); cuMemberAchieveLogVO.setPkMemberList(pkMemberList);
List<CuMemberAchieveLogVO> achieveList = cuMemberAchieveLogService.checkAchieveList(cuMemberAchieveLogVO); List<CuMemberAchieveLogVO> achieveList = iCuMemberAchieveLogService.checkAchieveList(cuMemberAchieveLogVO);
if (CollectionUtil.isNotEmpty(achieveList)) { if (CollectionUtil.isNotEmpty(achieveList)) {
achieveList.forEach(itm -> itm.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)) achieveList.forEach(itm -> itm.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT))
); );
@ -727,14 +698,14 @@ public class CuMemberAchieveLogController extends BaseController {
businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList);
cuMemberAchieveLogVO.setMemberAmountDTOList(memberAmountDTOList); cuMemberAchieveLogVO.setMemberAmountDTOList(memberAmountDTOList);
//接口查询金额是否足够 //接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) { if (CollectionUtil.isNotEmpty(memberBalanceList)) {
memberBalanceList.forEach(item -> errorList.add(BeanUtil.copyProperties(item, CuMemberAchieveLogVO.class))); memberBalanceList.forEach(item -> errorList.add(BeanUtil.copyProperties(item, CuMemberAchieveLogVO.class)));
errorList.forEach(itm2 -> itm2.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT))); errorList.forEach(itm2 -> itm2.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT)));
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorList); return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorList);
} }
} }
memberAchieveLogVONew = cuMemberAchieveLogService.petition(cuMemberAchieveLogVO); memberAchieveLogVONew = iCuMemberAchieveLogService.petition(cuMemberAchieveLogVO);
} else { } else {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
} }

26
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java
View File

@ -5,11 +5,9 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.hzs.common.core.annotation.Log; import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*; import com.hzs.common.core.enums.*;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.domain.AjaxResult;
@ -49,17 +47,8 @@ public class CuMemberTeamController extends BaseController {
@DubboReference @DubboReference
ITransactionServiceApi iTransactionServiceApi; ITransactionServiceApi iTransactionServiceApi;
private RedisService redisService;
@Autowired
public void setRedisService(RedisService redisService) {
this.redisService = redisService;
}
/** /**
* @description: 查询会员所属团队（隶属团队）列表 * @description: 查询会员所属团队（隶属团队）列表
* @author: zhang jing
* @date: 2022/8/30 10:20
* @param: [cuMemberTeam] * @param: [cuMemberTeam]
* @return: com.hzs.common.core.web.page.TableDataInfo * @return: com.hzs.common.core.web.page.TableDataInfo
**/ **/
@ -74,8 +63,6 @@ public class CuMemberTeamController extends BaseController {
/** /**
* @description: 隶属团队下拉选 * @description: 隶属团队下拉选
* @author: zhang jing
* @date: 2022/11/16 15:43
* @param: [cuMemberTeam] * @param: [cuMemberTeam]
* @return: com.hzs.common.core.web.page.TableDataInfo * @return: com.hzs.common.core.web.page.TableDataInfo
**/ **/
@ -116,8 +103,6 @@ public class CuMemberTeamController extends BaseController {
/** /**
* @description: 新增会员所属团队（隶属团队） * @description: 新增会员所属团队（隶属团队）
* @author: zhang jing
* @date: 2022/8/30 10:21
* @param: [cuMemberTeam] * @param: [cuMemberTeam]
* @return: com.hzs.common.core.web.domain.AjaxResult * @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@ -154,15 +139,12 @@ public class CuMemberTeamController extends BaseController {
cuMemberTeam.setPkCountry(SecurityUtils.getPkCountry()); cuMemberTeam.setPkCountry(SecurityUtils.getPkCountry());
cuMemberTeam.setPkCreator(SecurityUtils.getUserId()); cuMemberTeam.setPkCreator(SecurityUtils.getUserId());
cuMemberTeam.setCreationTime(new Date()); cuMemberTeam.setCreationTime(new Date());
redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + pkCountry);
return toAjax(cuMemberTeamService.save(cuMemberTeam)); return toAjax(cuMemberTeamService.save(cuMemberTeam));
} }
/** /**
* @description: 修改会员所属团队（隶属团队） * @description: 修改会员所属团队（隶属团队）
* @author: zhang jing
* @date: 2022/8/30 10:21
* @param: [cuMemberTeam] * @param: [cuMemberTeam]
* @return: com.hzs.common.core.web.domain.AjaxResult * @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@ -205,15 +187,12 @@ public class CuMemberTeamController extends BaseController {
} }
cuMemberTeam.setPkModified(SecurityUtils.getUserId()); cuMemberTeam.setPkModified(SecurityUtils.getUserId());
cuMemberTeam.setModifiedTime(new Date()); cuMemberTeam.setModifiedTime(new Date());
redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + pkCountry);
return toAjax(cuMemberTeamService.updateById(cuMemberTeam)); return toAjax(cuMemberTeamService.updateById(cuMemberTeam));
} }
/** /**
* @description: 查询单条会员所属团队（隶属团队） * @description: 查询单条会员所属团队（隶属团队）
* @author: zhang jing
* @date: 2022/8/30 10:21
* @param: [pkId] * @param: [pkId]
* @return: com.hzs.common.core.web.domain.AjaxResult * @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@ -230,8 +209,6 @@ public class CuMemberTeamController extends BaseController {
/** /**
* @description: 删除会员所属团队（隶属团队） * @description: 删除会员所属团队（隶属团队）
* @author: zhang jing
* @date: 2022/8/30 10:21
* @param: [pkId] * @param: [pkId]
* @return: com.hzs.common.core.web.domain.AjaxResult * @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@ -248,14 +225,11 @@ public class CuMemberTeamController extends BaseController {
List<Long> pkIdList = new ArrayList<>(); List<Long> pkIdList = new ArrayList<>();
pkIdList.add(memberTeam.getPkTransaction().longValue()); pkIdList.add(memberTeam.getPkTransaction().longValue());
iTransactionServiceApi.removeTransactionByPkId(pkIdList); iTransactionServiceApi.removeTransactionByPkId(pkIdList);
redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + SecurityUtils.getPkCountry());
return toAjax(cuMemberTeamService.update(updateWrapper)); return toAjax(cuMemberTeamService.update(updateWrapper));
} }
/** /**
* @description: 更新所属团队（隶属团队） * @description: 更新所属团队（隶属团队）
* @author: sui q
* @date: 2022/8/30 10:21
* @param: [pkId] * @param: [pkId]
* @return: com.hzs.common.core.web.domain.AjaxResult * @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/

8
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
View File

@ -17,7 +17,6 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
import com.hzs.member.handlebusiness.vo.HandleBusinessVO; import com.hzs.member.handlebusiness.vo.HandleBusinessVO;
import com.hzs.member.marketnews.param.MarketNewsParam; import com.hzs.member.marketnews.param.MarketNewsParam;
import com.hzs.member.marketnews.vo.UserInvestmentVo; import com.hzs.member.marketnews.vo.UserInvestmentVo;
import com.hzs.member.param.MemberParam;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import java.util.Collection; import java.util.Collection;
@ -526,13 +525,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/ */
List<CuMemberExt> queryMemberSelect(MemberSelectParam param, Integer pkCountry); List<CuMemberExt> queryMemberSelect(MemberSelectParam param, Integer pkCountry);
/**
* 点击确认生成分享订单
*
* @param memberParam 参数
*/
CuMember confirmShareMemberByMemberParam(MemberParam memberParam);
/** /**
* 删除会员信息 * 删除会员信息
* *

256
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -73,8 +73,6 @@ import java.util.stream.Collectors;
/** /**
* @Description: 会员服务需要保存不同的表, 用于处理服务内的事务 * @Description: 会员服务需要保存不同的表, 用于处理服务内的事务
* @Author: sui q
* @Time: 2022/9/13 9:26
* @Classname: CuMemberBusinessServiceImpl * @Classname: CuMemberBusinessServiceImpl
* @PackageName: com.hzs.member.base.service.impl * @PackageName: com.hzs.member.base.service.impl
*/ */
@ -100,33 +98,33 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
@Autowired @Autowired
private MemberToolsHandler memberToolsHandler; private MemberToolsHandler memberToolsHandler;
@Autowired @Autowired
private ICuMemberAchieveService cuMemberAchieveService; private ICuMemberAchieveService iCuMemberAchieveService;
@Autowired @Autowired
private ICuMemberExpireHistoryService iCuMemberExpireHistoryService; private ICuMemberExpireHistoryService iCuMemberExpireHistoryService;
@Autowired @Autowired
private RedisService redisService; private RedisService redisService;
@Autowired @Autowired
private ICuMemberService cuMemberService; private ICuMemberService iCuMemberService;
@Autowired @Autowired
private ICuMemberRegisterService cuMemberRegisterService; private ICuMemberRegisterService iCuMemberRegisterService;
@Autowired @Autowired
private ICuMemberAccountService cuMemberAccountService; private ICuMemberAccountService iCuMemberAccountService;
@Autowired @Autowired
private ICuMemberTradeService cuMemberTradeService; private ICuMemberTradeService iCuMemberTradeService;
@Autowired @Autowired
private ICuMemberLevelService cuMemberLevelService; private ICuMemberLevelService iCuMemberLevelService;
@Autowired @Autowired
private ICuMemberAwardsService cuMemberAwardsService; private ICuMemberAwardsService iCuMemberAwardsService;
@Autowired @Autowired
private ICuMemberChangeLogService cuMemberChangeLogService; private ICuMemberChangeLogService iCuMemberChangeLogService;
@Autowired @Autowired
private ICuMemberShareService cuMemberShareService; private ICuMemberShareService iCuMemberShareService;
@Autowired @Autowired
private ICuMemberTradeDetailService cuMemberTradeDetailService; private ICuMemberTradeDetailService iCuMemberTradeDetailService;
@Autowired @Autowired
private ICuMemberTradeBonusService cuMemberTradeBonusService; private ICuMemberTradeBonusService iCuMemberTradeBonusService;
@Autowired @Autowired
private ICuMemberSettlePeriodService cuMemberSettlePeriodService; private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Override @Override
@ -134,7 +132,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public void updateCuMember(CuMember cuMember) { public void updateCuMember(CuMember cuMember) {
redisService.lockKeyMany(CacheConstants.UPD_MEMBER + cuMember.getMemberCode()); redisService.lockKeyMany(CacheConstants.UPD_MEMBER + cuMember.getMemberCode());
try { try {
cuMemberService.updateById(cuMember); iCuMemberService.updateById(cuMember);
} finally { } finally {
redisService.unlock(CacheConstants.UPD_MEMBER + cuMember.getMemberCode()); redisService.unlock(CacheConstants.UPD_MEMBER + cuMember.getMemberCode());
} }
@ -146,9 +144,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param cuMember 会员信息 * @param cuMember 会员信息
* @param saOrder 订单信息 * @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息 * @param cuMemberAccountExt 会员账户信息
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/26 11:35
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -157,7 +152,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 当cuMember为空时，不更新会员表 // 当cuMember为空时，不更新会员表
if (cuMember != null) { if (cuMember != null) {
// 验证等级是否发生了变化 // 验证等级是否发生了变化
CuMember member = cuMemberService.getMember(cuMember.getPkId()); CuMember member = iCuMemberService.getMember(cuMember.getPkId());
if (!cuMember.getPkSettleGrade().equals(member.getPkSettleGrade())) { if (!cuMember.getPkSettleGrade().equals(member.getPkSettleGrade())) {
saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, member.getPkSettleGrade()); saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, member.getPkSettleGrade());
} }
@ -197,7 +192,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
acPickExt.setOrderCode(saOrder.getOrderCode()); acPickExt.setOrderCode(saOrder.getOrderCode());
pickExtList.add(acPickExt); pickExtList.add(acPickExt);
} }
cuMemberTradeService.saveBatch(cuMemberTradeList); iCuMemberTradeService.saveBatch(cuMemberTradeList);
if (pickExtList.size() > 0 && !iAcPickServiceApi.updatePickUse(pickExtList, ESignSource.MANAGE.getValue(), null).getData()) { if (pickExtList.size() > 0 && !iAcPickServiceApi.updatePickUse(pickExtList, ESignSource.MANAGE.getValue(), null).getData()) {
throw new RuntimeException("更新提货单失败"); throw new RuntimeException("更新提货单失败");
} }
@ -217,12 +212,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单 * @param saOrder 订单
* @param pkOldLevel 原等级 * @param pkOldLevel 原等级
* @Description: 保存奖衔 * @Description: 保存奖衔
* @return: void
* @Author: sui q
* @Date: 2023/3/25 17:20
*/ */
private Boolean saveLevelUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldLevel) { private Boolean saveLevelUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldLevel) {
// TODO new V3可以买一单升V4，这个位置需要添加校验，如果是购买升级 并且 原等级大于新等级，不添加升级记录 // V3可以买一单升V4，这个位置需要添加校验，如果是购买升级 并且 原等级大于新等级，不添加升级记录
if (EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType() if (EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType()
&& EUpgradeType.BUY_UPGRADE.getValue() == levelType) { && EUpgradeType.BUY_UPGRADE.getValue() == levelType) {
// 购买升级 // 购买升级
@ -245,7 +237,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
.build(); .build();
cuMemberLevel.setPkCountry(cuMember.getPkSettleCountry()); cuMemberLevel.setPkCountry(cuMember.getPkSettleCountry());
cuMemberLevel.setPkCreator(cuMember.getPkId()); cuMemberLevel.setPkCreator(cuMember.getPkId());
return cuMemberLevelService.save(cuMemberLevel); return iCuMemberLevelService.save(cuMemberLevel);
} }
/** /**
@ -254,13 +246,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单 * @param saOrder 订单
* @param pkOldAwards 会员 * @param pkOldAwards 会员
* @Description: 保存奖衔, 升级送奖项默认免考 * @Description: 保存奖衔, 升级送奖项默认免考
* @return: void
* @Author: sui q
* @Date: 2023/3/25 17:20
*/ */
private void saveAwardsUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldAwards) { private void saveAwardsUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldAwards) {
// 记录奖衔升级历史 // 记录奖衔升级历史
CuMemberSettlePeriod cuMemberSettlePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrder.getPayTime())); CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrder.getPayTime()));
CuMemberAwards cuMemberAwards = CuMemberAwards.builder() CuMemberAwards cuMemberAwards = CuMemberAwards.builder()
.period(cuMemberSettlePeriod.getPkId()) .period(cuMemberSettlePeriod.getPkId())
.pkMember(cuMember.getPkId()) .pkMember(cuMember.getPkId())
@ -273,7 +262,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
.build(); .build();
cuMemberAwards.setPkCountry(cuMember.getPkSettleCountry()); cuMemberAwards.setPkCountry(cuMember.getPkSettleCountry());
cuMemberAwards.setPkCreator(cuMember.getPkId()); cuMemberAwards.setPkCreator(cuMember.getPkId());
cuMemberAwardsService.save(cuMemberAwards); iCuMemberAwardsService.save(cuMemberAwards);
} }
@Override @Override
@ -285,10 +274,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (isPay) { if (isPay) {
updateCuMember(cuMember); updateCuMember(cuMember);
} else { } else {
if (cuMemberService.getMember(cuMember.getPkId()) != null) { if (iCuMemberService.getMember(cuMember.getPkId()) != null) {
updateCuMember(cuMember); updateCuMember(cuMember);
} else { } else {
cuMemberService.saveMember(cuMember); iCuMemberService.saveMember(cuMember);
} }
} }
// 代表在线支付，在线支付先插入一条充值信息 // 代表在线支付，在线支付先插入一条充值信息
@ -309,40 +298,19 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
return true; return true;
} }
@Override
public Boolean saveShareMember(CuMember cuMember) {
// 保存会员
cuMemberService.saveMember(cuMember);
// 保存账户
saveMemberAccount(cuMember);
// 保存会员注册、等级信息
// 用户注册信息
CuMemberRegister cuMemberRegister = BeanUtil.copyProperties(cuMember, CuMemberRegister.class);
cuMemberRegister.setPkMember(cuMember.getPkId());
cuMemberRegisterService.save(cuMemberRegister);
// 解锁 安置位置
// redisService.unlock(CacheConstants.POSITION + cuMember.getPkPlaceParent() + cuMember.getPlaceDept());
return null;
}
/** /**
* @param cuMember 会员 * @param cuMember 会员
* @Description: 保存会员账户信息 * @Description: 保存会员账户信息
* @return: void
* @Author: sui q
* @Date: 2023/3/15 18:36
*/ */
private void saveMemberAccount(CuMember cuMember) { private void saveMemberAccount(CuMember cuMember) {
// 新会员生成账户，保存账户 // 新会员生成账户，保存账户
CuMemberAccount cuMemberAccount = CuMemberAccount.builder() CuMemberAccount cuMemberAccount = CuMemberAccount.builder()
.pkMember(cuMember.getPkId()) .pkMember(cuMember.getPkId())
// .account6(saOrder.getOrderAmount())
.build(); .build();
cuMemberAccount.setPkCreator(cuMember.getPkCreator()); cuMemberAccount.setPkCreator(cuMember.getPkCreator());
cuMemberAccount.setPkCountry(cuMember.getPkSettleCountry()); cuMemberAccount.setPkCountry(cuMember.getPkSettleCountry());
// 获取账户配置，判断是否有积分账户 // 获取账户配置，判断是否有积分账户
cuMemberAccountService.save(cuMemberAccount); iCuMemberAccountService.save(cuMemberAccount);
// 验证订单是否存在购买的订单
} }
private void saveMemberRecords(CuMember cuMember, SaOrder saOrder) { private void saveMemberRecords(CuMember cuMember, SaOrder saOrder) {
@ -356,20 +324,20 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 用户注册信息 // 用户注册信息
CuMemberRegister cuMemberRegister = BeanUtil.copyProperties(cuMember, CuMemberRegister.class); CuMemberRegister cuMemberRegister = BeanUtil.copyProperties(cuMember, CuMemberRegister.class);
cuMemberRegister.setPkMember(cuMember.getPkId()); cuMemberRegister.setPkMember(cuMember.getPkId());
cuMemberRegisterService.save(cuMemberRegister); iCuMemberRegisterService.save(cuMemberRegister);
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean saveMember(CuMember cuMember, SaOrder saOrder) { public Boolean saveMember(CuMember cuMember, SaOrder saOrder) {
// 生成会员 // 生成会员
cuMemberService.saveMember(cuMember); iCuMemberService.saveMember(cuMember);
// 记录等级，记录注册记录 // 记录等级，记录注册记录
saveMemberRecords(cuMember, saOrder); saveMemberRecords(cuMember, saOrder);
// 生成账户信息 // 生成账户信息
saveMemberAccount(cuMember); saveMemberAccount(cuMember);
// 更新分享会员表状态 // 更新分享会员表状态
cuMemberShareService.updateCuMemberShare(cuMember.getPkCreator()); iCuMemberShareService.updateCuMemberShare(cuMember.getPkCreator());
saveMemberOnLineTrade(null, saOrder, null); saveMemberOnLineTrade(null, saOrder, null);
// 解锁 安置位置 // 解锁 安置位置
@ -397,7 +365,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
} }
if (cuMember != null) { if (cuMember != null) {
// 验证等级是否发生了变化，海外存在累计升级的国家 // 验证等级是否发生了变化，海外存在累计升级的国家
CuMember member = cuMemberService.getMember(cuMember.getPkId()); CuMember member = iCuMemberService.getMember(cuMember.getPkId());
if (!cuMember.getPkSettleGrade().equals(member.getPkSettleGrade())) { if (!cuMember.getPkSettleGrade().equals(member.getPkSettleGrade())) {
saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, member.getPkSettleGrade()); saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, member.getPkSettleGrade());
} }
@ -431,22 +399,19 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单编号 * @param saOrder 订单编号
* @param bdAccount 账户 * @param bdAccount 账户
* @Description: 插入充值记录trade * @Description: 插入充值记录trade
* @return: CuMemberAccountExt
* @Author: sui q
* @Date: 2023/3/23 16:08
*/ */
private CuMemberAccountExt insertRechargeTrade(SaOrder saOrder, BdAccount bdAccount) { private CuMemberAccountExt insertRechargeTrade(SaOrder saOrder, BdAccount bdAccount) {
// 扣款 扣款信息 // 扣款 扣款信息
Integer pkCountry = saOrder.getPkCountry(); Integer pkCountry = saOrder.getPkCountry();
Long pkMember = saOrder.getPkCreator(); Long pkMember = saOrder.getPkCreator();
CuMember cuMember = cuMemberService.getMember(saOrder.getPkCreator()); CuMember cuMember = iCuMemberService.getMember(saOrder.getPkCreator());
if (cuMember != null) { if (cuMember != null) {
pkCountry = cuMember.getPkSettleCountry(); pkCountry = cuMember.getPkSettleCountry();
pkMember = cuMember.getPkId(); pkMember = cuMember.getPkId();
} }
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(pkMember).build(); CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(pkMember).build();
cuMemberAccount.setPkCountry(pkCountry); cuMemberAccount.setPkCountry(pkCountry);
List<CuMemberAccountExt> cuMemberAccountExtList = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount); List<CuMemberAccountExt> cuMemberAccountExtList = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount);
if (cuMemberAccountExtList.size() == 0) { if (cuMemberAccountExtList.size() == 0) {
throw new RuntimeException("没有找到会员账户"); throw new RuntimeException("没有找到会员账户");
} }
@ -456,7 +421,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
BigDecimal originalMoney = ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue()); BigDecimal originalMoney = ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue());
CuMemberTrade cuMemberTrade = packageMemberTrade(saOrder, pkCountry, bdAccount.getPkId(), originalMoney, tradeMoney, ETradeClassify.RECHARGE.getValue()); CuMemberTrade cuMemberTrade = packageMemberTrade(saOrder, pkCountry, bdAccount.getPkId(), originalMoney, tradeMoney, ETradeClassify.RECHARGE.getValue());
cuMemberTrade.setRemarks("在线充值"); cuMemberTrade.setRemarks("在线充值");
cuMemberTradeService.save(cuMemberTrade); iCuMemberTradeService.save(cuMemberTrade);
BigDecimal afterAccount = ComputeUtil.computeAdd(ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue()), tradeMoney); BigDecimal afterAccount = ComputeUtil.computeAdd(ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue()), tradeMoney);
ReflectUtils.invokeSetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue(), afterAccount); ReflectUtils.invokeSetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue(), afterAccount);
ReflectUtils.invokeSetter(cuMemberAccountExt, MemberFieldConstants.PAY_ACCOUNT + bdAccount.getFieldValue(), tradeMoney); ReflectUtils.invokeSetter(cuMemberAccountExt, MemberFieldConstants.PAY_ACCOUNT + bdAccount.getFieldValue(), tradeMoney);
@ -467,9 +432,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单 * @param saOrder 订单
* @param cuMemberAccount 账户 * @param cuMemberAccount 账户
* @Description: 插入会员的交易明细 * @Description: 插入会员的交易明细
* @return: void
* @Author: sui q
* @Date: 2022/9/13 15:12
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
@ -534,7 +496,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
cuMemberTradeBonusList.add(cuMemberTradeBonus); cuMemberTradeBonusList.add(cuMemberTradeBonus);
} }
// 查询会员的发放明细 // 查询会员的发放明细
List<CuMemberTradeDetail> cuMemberTradeDetailList = cuMemberTradeDetailService.queryCuMemberTradeDetail(cuMemberAccount.getPkMember()); List<CuMemberTradeDetail> cuMemberTradeDetailList = iCuMemberTradeDetailService.queryCuMemberTradeDetail(cuMemberAccount.getPkMember());
if (cuMemberTradeDetailList.size() > 0 && ComputeUtil.compareValue(bonusTradeMoney)) { if (cuMemberTradeDetailList.size() > 0 && ComputeUtil.compareValue(bonusTradeMoney)) {
// 会员发放交易明细 // 会员发放交易明细
List<CuMemberTradeDetail> updMemberTradeDetailList = new ArrayList<>(); List<CuMemberTradeDetail> updMemberTradeDetailList = new ArrayList<>();
@ -568,11 +530,11 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
updateMemberAccount.setConsumeAccount4(consumeMoney.negate()); updateMemberAccount.setConsumeAccount4(consumeMoney.negate());
} }
// 更新会员发放交易流水表 // 更新会员发放交易流水表
cuMemberTradeDetailService.updateCuMemberTradeDetail(updMemberTradeDetailList); iCuMemberTradeDetailService.updateCuMemberTradeDetail(updMemberTradeDetailList);
} }
if (cuMemberTradeBonusList.size() > 0) { if (cuMemberTradeBonusList.size() > 0) {
// 新增会员奖金交易流水表 // 新增会员奖金交易流水表
cuMemberTradeBonusService.batchInsertCuMemberTradeBonus(cuMemberTradeBonusList); iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(cuMemberTradeBonusList);
} }
} }
} }
@ -592,7 +554,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
private void saveAndUpdateCuMember(List<CuMemberTrade> cuMemberTradeList, CuMemberAccount updateMemberAccount) { private void saveAndUpdateCuMember(List<CuMemberTrade> cuMemberTradeList, CuMemberAccount updateMemberAccount) {
if (cuMemberTradeList.size() > 0) { if (cuMemberTradeList.size() > 0) {
cuMemberTradeService.saveBatch(cuMemberTradeList); iCuMemberTradeService.saveBatch(cuMemberTradeList);
} }
updateCuMemberAccount(updateMemberAccount); updateCuMemberAccount(updateMemberAccount);
} }
@ -602,9 +564,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* *
* @param updateMemberAccount 账户 * @param updateMemberAccount 账户
* @throws RuntimeException 抛出异常 * @throws RuntimeException 抛出异常
* @return: void
* @Author: sui q
* @Date: 2023/3/16 14:16
*/ */
private void updateCuMemberAccount(CuMemberAccount updateMemberAccount) { private void updateCuMemberAccount(CuMemberAccount updateMemberAccount) {
Long pkMember = updateMemberAccount.getPkMember(); Long pkMember = updateMemberAccount.getPkMember();
@ -613,7 +572,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
} }
// 更新账户余额 // 更新账户余额
try { try {
if (!cuMemberAccountService.updateMemberAccount(updateMemberAccount, pkMember)) { if (!iCuMemberAccountService.updateMemberAccount(updateMemberAccount, pkMember)) {
throw new RuntimeException("用户付款失败，请重试！"); throw new RuntimeException("用户付款失败，请重试！");
} }
} finally { } finally {
@ -670,55 +629,48 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
CuMemberAccount payMemberAccount; CuMemberAccount payMemberAccount;
// 默认回退给创建人 // 默认回退给创建人
payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()); payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() || if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() ||
EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) { EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) {
// 会员账号 验证会员账户是否存在金额 // 会员账号 验证会员账户是否存在金额
CuMember member = cuMemberService.getMemberById(saOrder.getPkMember()); CuMember member = iCuMemberService.getMemberById(saOrder.getPkMember());
// 会员变为死点 // 会员变为死点
member.setCategory(ECategory.LOGGED_OUT.getValue()); member.setCategory(ECategory.LOGGED_OUT.getValue());
member.setCustomerType(ECustomerType.DEAD_POINT.getValue()); member.setCustomerType(ECustomerType.DEAD_POINT.getValue());
member.setPkModified(saOrder.getPkModified()); member.setPkModified(saOrder.getPkModified());
member.setModifiedTime(DateUtils.currentDateTime()); member.setModifiedTime(DateUtils.currentDateTime());
cuMemberService.updateById(member); iCuMemberService.updateById(member);
// 撤销正常订单，修改 cu_member_register 账户状态为死点 // 撤销正常订单，修改 cu_member_register 账户状态为死点
CuMemberRegister cuMemberRegister = new CuMemberRegister(); CuMemberRegister cuMemberRegister = new CuMemberRegister();
cuMemberRegister.setPkMember(member.getPkId()); cuMemberRegister.setPkMember(member.getPkId());
cuMemberRegister.setPkCountry(saOrder.getPkCountry()); cuMemberRegister.setPkCountry(saOrder.getPkCountry());
cuMemberRegister.setPkModified(saOrder.getPkCreator()); cuMemberRegister.setPkModified(saOrder.getPkCreator());
cuMemberRegisterService.updateCuMemberRegister(cuMemberRegister); iCuMemberRegisterService.updateCuMemberRegister(cuMemberRegister);
} }
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount); cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
return true; return true;
} }
/**
* @description: 自助撤单-注册单撤单
* @author: zhang jing
* @date: 2023/11/23 16:19
* @param: [pkApprove, saOrder, businessCommissionDTO]
* @return: java.lang.Boolean
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) { public Boolean singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) {
deductCancelOrderCost(businessCommissionDTO); deductCancelOrderCost(businessCommissionDTO);
// 回退给创建人 // 回退给创建人
CuMemberAccount payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()); CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() || if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() ||
EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) { EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) {
// 会员账号 验证会员账户是否存在金额 // 会员账号 验证会员账户是否存在金额
CuMember member = cuMemberService.getMember(saOrder.getPkMember()); CuMember member = iCuMemberService.getMember(saOrder.getPkMember());
//删除会员 //删除会员
UpdateWrapper<CuMember> updateWrapper = new UpdateWrapper(); UpdateWrapper<CuMember> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("MEMBER_CODE", CommonUtil.deleteMemberCode(member.getMemberCode())); updateWrapper.set("MEMBER_CODE", CommonUtil.deleteMemberCode(member.getMemberCode()));
updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
updateWrapper.set("MODIFIED_TIME", DateUtils.currentDateTime()); updateWrapper.set("MODIFIED_TIME", DateUtils.currentDateTime());
updateWrapper.set("PK_MODIFIED", saOrder.getPkModified()); updateWrapper.set("PK_MODIFIED", saOrder.getPkModified());
updateWrapper.eq("PK_ID", member.getPkId()); updateWrapper.eq("PK_ID", member.getPkId());
cuMemberService.update(updateWrapper); iCuMemberService.update(updateWrapper);
// 删除会员注册表 // 删除会员注册表
UpdateWrapper<CuMemberRegister> updateWrapperRegister = new UpdateWrapper<>(); UpdateWrapper<CuMemberRegister> updateWrapperRegister = new UpdateWrapper<>();
@ -726,20 +678,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
updateWrapperRegister.set("MODIFIED_TIME", DateUtils.currentDateTime()); updateWrapperRegister.set("MODIFIED_TIME", DateUtils.currentDateTime());
updateWrapperRegister.set("PK_MODIFIED", saOrder.getPkModified()); updateWrapperRegister.set("PK_MODIFIED", saOrder.getPkModified());
updateWrapperRegister.eq("PK_MEMBER", member.getPkId()); updateWrapperRegister.eq("PK_MEMBER", member.getPkId());
cuMemberRegisterService.update(updateWrapperRegister); iCuMemberRegisterService.update(updateWrapperRegister);
} }
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount); cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
return true; return true;
} }
/**
* @description: 自助服务-生成订单
* @author: zhang jing
* @date: 2023/4/18 17:13
* @param: [pkApprove, saOrder, payMemberAccount]
* @return: void
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount) { public void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount) {
@ -752,7 +696,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public Boolean updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney) { public Boolean updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney) {
CuMemberAccount cuMemberAccountParam = CuMemberAccount.builder().pkMember(pkMember).build(); CuMemberAccount cuMemberAccountParam = CuMemberAccount.builder().pkMember(pkMember).build();
cuMemberAccountParam.setPkCountry(pkCountry); cuMemberAccountParam.setPkCountry(pkCountry);
List<CuMemberAccountExt> cuMemberAccountExtList = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccountParam); List<CuMemberAccountExt> cuMemberAccountExtList = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccountParam);
if (CollectionUtil.isEmpty(cuMemberAccountExtList)) { if (CollectionUtil.isEmpty(cuMemberAccountExtList)) {
return Boolean.FALSE; return Boolean.FALSE;
} }
@ -784,7 +728,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
.build(); .build();
cuMemberTrade.setPkCountry(pkCountry); cuMemberTrade.setPkCountry(pkCountry);
cuMemberTrade.setPkCreator(pkMember); cuMemberTrade.setPkCreator(pkMember);
cuMemberTradeService.save(cuMemberTrade); iCuMemberTradeService.save(cuMemberTrade);
} }
@Override @Override
@ -807,7 +751,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public Boolean updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt) { public Boolean updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt) {
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(acDrawRewardNumExt.getPkMember()).build(); CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(acDrawRewardNumExt.getPkMember()).build();
cuMemberAccount.setPkCountry(acDrawRewardNumExt.getPkCountry()); cuMemberAccount.setPkCountry(acDrawRewardNumExt.getPkCountry());
List<CuMemberAccountExt> cuMemberAccountExtList = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount); List<CuMemberAccountExt> cuMemberAccountExtList = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount);
if (cuMemberAccountExtList.size() == 0) { if (cuMemberAccountExtList.size() == 0) {
throw new RuntimeException("没有找到会员账户"); throw new RuntimeException("没有找到会员账户");
} }
@ -835,10 +779,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
CuMemberAccount updateMemberAccount = new CuMemberAccount(); CuMemberAccount updateMemberAccount = new CuMemberAccount();
List<CuMemberTrade> cuMemberTradeList = packageCancelOrderCuMemberTrades(pkApprove, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount); List<CuMemberTrade> cuMemberTradeList = packageCancelOrderCuMemberTrades(pkApprove, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount);
if (newCuMemberTradeBonusList.size() > 0) { if (newCuMemberTradeBonusList.size() > 0) {
cuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList); iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
} }
// 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail // 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail
cuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList); iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount); saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount);
} }
@ -860,7 +804,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 返回的流水明细 // 返回的流水明细
List<CuMemberTrade> cuMemberTradeList = new ArrayList<>(); List<CuMemberTrade> cuMemberTradeList = new ArrayList<>();
List<CuMemberTrade> cuMemberTrades = cuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode()); List<CuMemberTrade> cuMemberTrades = iCuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
// 如果有订单支付流水明细 // 如果有订单支付流水明细
if (CollectionUtil.isNotEmpty(cuMemberTrades)) { if (CollectionUtil.isNotEmpty(cuMemberTrades)) {
// 订单所属国家和订单支付流水国家不相同则为跨国，需要以订单支付流水中的国家为准进行退款 // 订单所属国家和订单支付流水国家不相同则为跨国，需要以订单支付流水中的国家为准进行退款
@ -899,7 +843,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
updateMemberAccount.setConsumeAccount4(BigDecimal.ZERO); updateMemberAccount.setConsumeAccount4(BigDecimal.ZERO);
BigDecimal bonusTradeMoney = tradeMoney; BigDecimal bonusTradeMoney = tradeMoney;
List<Integer> consumeTypeList = Arrays.asList(EConsumeType.ORDER.getValue(), EConsumeType.BACK_ORDER.getValue()); List<Integer> consumeTypeList = Arrays.asList(EConsumeType.ORDER.getValue(), EConsumeType.BACK_ORDER.getValue());
List<CuMemberTradeBonus> cuMemberTradeBonusList = cuMemberTradeBonusService.queryCuMemberTradeBonus(consumeTypeList, saOrder.getPkId()); List<CuMemberTradeBonus> cuMemberTradeBonusList = iCuMemberTradeBonusService.queryCuMemberTradeBonus(consumeTypeList, saOrder.getPkId());
for (CuMemberTradeBonus cuMemberTradeBonus : cuMemberTradeBonusList) { for (CuMemberTradeBonus cuMemberTradeBonus : cuMemberTradeBonusList) {
if (!ComputeUtil.compareValue(bonusTradeMoney)) { if (!ComputeUtil.compareValue(bonusTradeMoney)) {
break; break;
@ -958,26 +902,26 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 按照memberList 倒叙往后删除 // 按照memberList 倒叙往后删除
Date currentDateTime = DateUtils.currentDateTime(); Date currentDateTime = DateUtils.currentDateTime();
List<Long> centerIdList = saOrderMap.values().stream().map(BaseEntity::getPkCreator).distinct().collect(Collectors.toList()); List<Long> centerIdList = saOrderMap.values().stream().map(BaseEntity::getPkCreator).distinct().collect(Collectors.toList());
List<CuMemberAccount> cuMemberAccountList = cuMemberAccountService.queryCuMemberAccountByPkMembers(centerIdList); List<CuMemberAccount> cuMemberAccountList = iCuMemberAccountService.queryCuMemberAccountByPkMembers(centerIdList);
Map<Long, CuMemberAccount> cuMemberAccountMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberAccountList.size())); Map<Long, CuMemberAccount> cuMemberAccountMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberAccountList.size()));
cuMemberAccountList.forEach(cuMemberAccount -> cuMemberAccountList.forEach(cuMemberAccount ->
cuMemberAccountMap.put(cuMemberAccount.getPkMember(), cuMemberAccount)); cuMemberAccountMap.put(cuMemberAccount.getPkMember(), cuMemberAccount));
for (int i = memberList.size() - 1; i >= 0; i--) { for (int i = memberList.size() - 1; i >= 0; i--) {
Long pkMember = memberList.get(i); Long pkMember = memberList.get(i);
SaOrderExt saOrder = saOrderMap.get(pkMember); SaOrderExt saOrder = saOrderMap.get(pkMember);
CuMember cuMember = cuMemberService.getMemberById(pkMember); CuMember cuMember = iCuMemberService.getMemberById(pkMember);
// 删除等级 // 删除等级
cuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime); iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
// 回退奖衔,根据订单从 cu_member_awards查询 // 回退奖衔,根据订单从 cu_member_awards查询
cuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime); iCuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime);
cuMemberService.deleteCuMemberByPkMember(pkMember, pkApprove, currentDateTime); iCuMemberService.deleteCuMemberByPkMember(pkMember, pkApprove, currentDateTime);
cuMemberAccountService.deleteCuMemberAccountByPkMember(pkMember, pkApprove, currentDateTime); iCuMemberAccountService.deleteCuMemberAccountByPkMember(pkMember, pkApprove, currentDateTime);
// 撤销正常订单，修改 cu_member_register 账户状态为死点 // 撤销正常订单，修改 cu_member_register 账户状态为死点
CuMemberRegister cuMemberRegister = new CuMemberRegister(); CuMemberRegister cuMemberRegister = new CuMemberRegister();
cuMemberRegister.setPkMember(pkMember); cuMemberRegister.setPkMember(pkMember);
cuMemberRegister.setPkCountry(saOrder.getPkCountry()); cuMemberRegister.setPkCountry(saOrder.getPkCountry());
cuMemberRegister.setPkModified(saOrder.getPkCreator()); cuMemberRegister.setPkModified(saOrder.getPkCreator());
cuMemberRegisterService.updateCuMemberRegister(cuMemberRegister); iCuMemberRegisterService.updateCuMemberRegister(cuMemberRegister);
CuMemberAccount payMemberAccount = cuMemberAccountMap.get(saOrder.getPkCreator()); CuMemberAccount payMemberAccount = cuMemberAccountMap.get(saOrder.getPkCreator());
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount); cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
} }
@ -986,7 +930,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
private void deductCancelOrderCost(BusinessCommissionDTO businessCommissionDTO) { private void deductCancelOrderCost(BusinessCommissionDTO businessCommissionDTO) {
if (businessCommissionDTO != null) { if (businessCommissionDTO != null) {
if (!cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO)) { if (!iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO)) {
throw new RuntimeException("撤销订单扣除业务手续费失败"); throw new RuntimeException("撤销订单扣除业务手续费失败");
} }
} }
@ -1000,17 +944,17 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (EOrderType.UPGRADE_ORDER.getValue() == saOrder.getOrderType() if (EOrderType.UPGRADE_ORDER.getValue() == saOrder.getOrderType()
|| EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType() || EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType()
) { ) {
cuMemberService.updateById(cuMember); iCuMemberService.updateById(cuMember);
// 回退等级 // 回退等级
cuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime); iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
// 回退奖衔,根据订单从 cu_member_awards查询 // 回退奖衔,根据订单从 cu_member_awards查询
cuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime); iCuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime);
} }
// 部分撤单 todo 发货后邮费不退，未发货退邮费 // 部分撤单 todo 发货后邮费不退，未发货退邮费
if (saOrder.getBackOrderAmount() != null && ComputeUtil.compareValue(saOrder.getBackOrderAmount())) { if (saOrder.getBackOrderAmount() != null && ComputeUtil.compareValue(saOrder.getBackOrderAmount())) {
cancelPartOrderBackAmount(pkApprove, saOrder); cancelPartOrderBackAmount(pkApprove, saOrder);
} else { } else {
CuMemberAccount payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()); CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
// 回退账号余额 // 回退账号余额
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount); cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
} }
@ -1019,7 +963,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
@Override @Override
public void cancelPartOrderBackAmount(Long pkApprove, SaOrderExt saOrder) { public void cancelPartOrderBackAmount(Long pkApprove, SaOrderExt saOrder) {
CuMemberAccount payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()); CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
BigDecimal backOrderAmount = saOrder.getBackOrderAmount(); BigDecimal backOrderAmount = saOrder.getBackOrderAmount();
// 考虑部分撤单 // 考虑部分撤单
// 部分退，回退金额按照 币种扣除的倒叙扣除 现金->消费->奖金 奖金->消费->现金 // 部分退，回退金额按照 币种扣除的倒叙扣除 现金->消费->奖金 奖金->消费->现金
@ -1039,7 +983,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
mustPayMoneyMap.put(areaCurrencyDTO.getPkAccount(), mustPayMoney); mustPayMoneyMap.put(areaCurrencyDTO.getPkAccount(), mustPayMoney);
} }
} }
List<CuMemberTrade> cuMemberTrades = cuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode()); List<CuMemberTrade> cuMemberTrades = iCuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
Map<Integer, CuMemberTrade> cuMemberTradeMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberTrades.size())); Map<Integer, CuMemberTrade> cuMemberTradeMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberTrades.size()));
cuMemberTrades.forEach(cuMemberTrade -> cuMemberTrades.forEach(cuMemberTrade ->
cuMemberTradeMap.put(cuMemberTrade.getPkAccount(), cuMemberTrade)); cuMemberTradeMap.put(cuMemberTrade.getPkAccount(), cuMemberTrade));
@ -1084,10 +1028,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
} }
} }
if (newCuMemberTradeBonusList.size() > 0) { if (newCuMemberTradeBonusList.size() > 0) {
cuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList); iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
} }
// 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail // 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail
cuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList); iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount); saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount);
} }
@ -1095,13 +1039,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
@Override @Override
public String orderChangeProductPre(SaOrder saOrder, SaOrder updateOrder) { public String orderChangeProductPre(SaOrder saOrder, SaOrder updateOrder) {
// 查询会员订单支付币种 // 查询会员订单支付币种
List<CuMemberTrade> cuMemberTrades = cuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode()); List<CuMemberTrade> cuMemberTrades = iCuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
// 查询会员当前余额 // 查询会员当前余额
CuMemberAccount cuMemberAccount = new CuMemberAccount(); CuMemberAccount cuMemberAccount = new CuMemberAccount();
cuMemberAccount.setPkCountry(saOrder.getPkCountry()); cuMemberAccount.setPkCountry(saOrder.getPkCountry());
cuMemberAccount.setPkMember(saOrder.getPkCreator()); cuMemberAccount.setPkMember(saOrder.getPkCreator());
CuMemberAccountExt tmpCuMemberAccount = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0); CuMemberAccountExt tmpCuMemberAccount = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0);
if (CollectionUtil.isNotEmpty(cuMemberTrades)) { if (CollectionUtil.isNotEmpty(cuMemberTrades)) {
List<AreaCurrencyDTO> currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(saOrder.getPkCountry()).getData(); List<AreaCurrencyDTO> currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(saOrder.getPkCountry()).getData();
@ -1140,13 +1084,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public void orderChangeProduct(SaOrder saOrder, SaOrder updateOrder, Long userId, Object obj) { public void orderChangeProduct(SaOrder saOrder, SaOrder updateOrder, Long userId, Object obj) {
if (null != saOrder && null != updateOrder) { if (null != saOrder && null != updateOrder) {
// 撤销订单 // 撤销订单
this.cancelOrderBackAccount(userId, saOrder, cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator())); this.cancelOrderBackAccount(userId, saOrder, iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()));
// 查询会员当前余额 // 查询会员当前余额
CuMemberAccount cuMemberAccount = new CuMemberAccount(); CuMemberAccount cuMemberAccount = new CuMemberAccount();
cuMemberAccount.setPkCountry(saOrder.getPkCountry()); cuMemberAccount.setPkCountry(saOrder.getPkCountry());
cuMemberAccount.setPkMember(saOrder.getPkCreator()); cuMemberAccount.setPkMember(saOrder.getPkCreator());
CuMemberAccountExt tmpCuMemberAccount = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0); CuMemberAccountExt tmpCuMemberAccount = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0);
// 获取需要扣除各币种金额 // 获取需要扣除各币种金额
R<CuMemberAccountExt> resultR = iSaOrderServiceApi.queryOrderSpendDetails(tmpCuMemberAccount, updateOrder, null); R<CuMemberAccountExt> resultR = iSaOrderServiceApi.queryOrderSpendDetails(tmpCuMemberAccount, updateOrder, null);
@ -1178,7 +1122,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 追加业务实体不为null，需要处理 // 追加业务实体不为null，需要处理
if (obj instanceof BusinessCommissionDTO) { if (obj instanceof BusinessCommissionDTO) {
// 业务办理扣款逻辑 // 业务办理扣款逻辑
if (!cuMemberTradeService.businessCommissionSubmit((BusinessCommissionDTO) obj)) { if (!iCuMemberTradeService.businessCommissionSubmit((BusinessCommissionDTO) obj)) {
throw new ServiceException("业务手续费扣款失败"); throw new ServiceException("业务手续费扣款失败");
} }
} }
@ -1205,7 +1149,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
List<CuMemberTrade> saveMemberTradeList = new ArrayList<>(); List<CuMemberTrade> saveMemberTradeList = new ArrayList<>();
// 查询订单创建人账户 // 查询订单创建人账户
CuMemberAccount cuMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(pkMember); CuMemberAccount cuMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
// 订单所属专区扣币的第一位配置 // 订单所属专区扣币的第一位配置
AreaCurrencyDTO areaCurrencyDTO = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), pkCountry).getData().get(0); AreaCurrencyDTO areaCurrencyDTO = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), pkCountry).getData().get(0);
// 专区扣币的第一位配置所用字段 // 专区扣币的第一位配置所用字段
@ -1214,7 +1158,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (EOrderPayType.WALLET.getValue() == saOrder.getPayType()) { if (EOrderPayType.WALLET.getValue() == saOrder.getPayType()) {
// 钱包支付 // 钱包支付
// 查询之前订单的支付明细 // 查询之前订单的支付明细
List<CuMemberTrade> memberTradeList = cuMemberTradeService.querySourceCodeLastTrade(pkMember, orderCode, null); List<CuMemberTrade> memberTradeList = iCuMemberTradeService.querySourceCodeLastTrade(pkMember, orderCode, null);
// 获取所有账户配置ID // 获取所有账户配置ID
List<Integer> pkAccountList = memberTradeList.stream().map(CuMemberTrade::getPkAccount).collect(Collectors.toList()); List<Integer> pkAccountList = memberTradeList.stream().map(CuMemberTrade::getPkAccount).collect(Collectors.toList());
@ -1278,7 +1222,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
} }
// 批量插入会员明细 // 批量插入会员明细
cuMemberTradeService.batchSaveTradeByMemberCode(saveMemberTradeList); iCuMemberTradeService.batchSaveTradeByMemberCode(saveMemberTradeList);
// 奖金账户有变化，需要同步处理 可提现奖金账户 // 奖金账户有变化，需要同步处理 可提现奖金账户
BigDecimal bonusBigDecimal = ReflectUtils.invokeGetter(updateMemberAccount, MemberFieldConstants.ACCOUNT + 4); BigDecimal bonusBigDecimal = ReflectUtils.invokeGetter(updateMemberAccount, MemberFieldConstants.ACCOUNT + 4);
@ -1287,7 +1231,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
ReflectUtils.invokeSetter(updateMemberAccount, MemberFieldConstants.WITHDRAW_ACCOUNT + 4, bonusBigDecimal); ReflectUtils.invokeSetter(updateMemberAccount, MemberFieldConstants.WITHDRAW_ACCOUNT + 4, bonusBigDecimal);
} }
// 更新会员余额 // 更新会员余额
cuMemberAccountService.updateMemberAccount(updateMemberAccount, userId); iCuMemberAccountService.updateMemberAccount(updateMemberAccount, userId);
// 更新创建人账号（根据订单类型不同，进行处理） // 更新创建人账号（根据订单类型不同，进行处理）
switch (EOrderType.getEnumByValue(saOrder.getOrderType())) { switch (EOrderType.getEnumByValue(saOrder.getOrderType())) {
@ -1299,13 +1243,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
memberUpdateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); memberUpdateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId);
memberUpdateWrapper.set(SystemFieldConstants.MODIFIED_TIME, nowDate); memberUpdateWrapper.set(SystemFieldConstants.MODIFIED_TIME, nowDate);
memberUpdateWrapper.set("CATEGORY", ECategory.LOGGED_OUT.getValue()); memberUpdateWrapper.set("CATEGORY", ECategory.LOGGED_OUT.getValue());
cuMemberService.update(memberUpdateWrapper); iCuMemberService.update(memberUpdateWrapper);
// 添加会员信息修改记录 // 添加会员信息修改记录
CuMemberChangeLog cuMemberChangeLog = new CuMemberChangeLog(); CuMemberChangeLog cuMemberChangeLog = new CuMemberChangeLog();
cuMemberChangeLog.setPkMember(saOrder.getPkMember()); cuMemberChangeLog.setPkMember(saOrder.getPkMember());
cuMemberChangeLog.setChangeType(EMemberChangeType.ORDER_RETURN.getValue()); cuMemberChangeLog.setChangeType(EMemberChangeType.ORDER_RETURN.getValue());
cuMemberChangeLog.setChangeAfter(ECategory.LOGGED_OUT.getLabel()); cuMemberChangeLog.setChangeAfter(ECategory.LOGGED_OUT.getLabel());
cuMemberChangeLogService.save(cuMemberChangeLog); iCuMemberChangeLogService.save(cuMemberChangeLog);
} }
} }
@ -1318,7 +1262,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
memberUpdateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); memberUpdateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId);
memberUpdateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); memberUpdateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date());
memberUpdateWrapper.set("CATEGORY", ECategory.LOGGED_OUT.getValue()); memberUpdateWrapper.set("CATEGORY", ECategory.LOGGED_OUT.getValue());
cuMemberService.update(memberUpdateWrapper); iCuMemberService.update(memberUpdateWrapper);
// 添加会员信息修改记录 // 添加会员信息修改记录
List<CuMemberChangeLog> cuMemberChangeLogList = new ArrayList<>(); List<CuMemberChangeLog> cuMemberChangeLogList = new ArrayList<>();
for (Long pkMember : pkMemberList) { for (Long pkMember : pkMemberList) {
@ -1329,7 +1273,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
cuMemberChangeLog.setChangeAfter(ECategory.LOGGED_OUT.getLabel()); cuMemberChangeLog.setChangeAfter(ECategory.LOGGED_OUT.getLabel());
cuMemberChangeLogList.add(cuMemberChangeLog); cuMemberChangeLogList.add(cuMemberChangeLog);
} }
cuMemberChangeLogService.saveBatch(cuMemberChangeLogList); iCuMemberChangeLogService.saveBatch(cuMemberChangeLogList);
} }
@ -1415,7 +1359,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Date nowDate = new Date(); Date nowDate = new Date();
// 会员账户 // 会员账户
CuMemberAccount cuMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(pkMember); CuMemberAccount cuMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
// 会员更新账户 // 会员更新账户
CuMemberAccount updateMemberAccount = new CuMemberAccount(); CuMemberAccount updateMemberAccount = new CuMemberAccount();
updateMemberAccount.setPkMember(pkMember); updateMemberAccount.setPkMember(pkMember);
@ -1442,9 +1386,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
cuMemberTrade.setCreationTime(nowDate); cuMemberTrade.setCreationTime(nowDate);
// 保存会员交易明细 // 保存会员交易明细
cuMemberTradeService.save(cuMemberTrade); iCuMemberTradeService.save(cuMemberTrade);
// 更新会员账户 // 更新会员账户
cuMemberAccountService.updateMemberAccount(updateMemberAccount, userId); iCuMemberAccountService.updateMemberAccount(updateMemberAccount, userId);
return null; return null;
} }
@ -1461,12 +1405,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Long pkMember = cuMember.getPkParent(); Long pkMember = cuMember.getPkParent();
Integer pkCountry = cuMember.getPkSettleCountry(); Integer pkCountry = cuMember.getPkSettleCountry();
// 获取推荐人的左右区 // 获取推荐人的左右区
CuMember parentMember = cuMemberService.queryMember(pkMember); CuMember parentMember = iCuMemberService.queryMember(pkMember);
int placeDept; int placeDept;
// 查询当前的业绩 // 查询当前的业绩
CuMemberAchieve cuMemberAchieve = cuMemberAchieveService.queryCuMemberAchieveByPkMember(pkMember, pkCountry); CuMemberAchieve cuMemberAchieve = iCuMemberAchieveService.queryCuMemberAchieveByPkMember(pkMember, pkCountry);
placeDept = getPlaceDept(isFirst, isFirstAchieve, cuMemberAchieve, parentMember.getPkId()); placeDept = getPlaceDept(isFirst, isFirstAchieve, cuMemberAchieve, parentMember.getPkId());
CuMemberExt cuMemberExt = cuMemberService.queryPlaceSponsorLastLeft(pkMember, placeDept); CuMemberExt cuMemberExt = iCuMemberService.queryPlaceSponsorLastLeft(pkMember, placeDept);
CuMember placeCuMember = new CuMember(); CuMember placeCuMember = new CuMember();
if (cuMemberExt != null) { if (cuMemberExt != null) {
placeCuMember.setPkPlaceParent(cuMemberExt.getPkId()); placeCuMember.setPkPlaceParent(cuMemberExt.getPkId());
@ -1518,7 +1462,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
} }
} else { } else {
// 验证左右区人数，放入人数少的 // 验证左右区人数，放入人数少的
List<CuMember> personNumList = cuMemberService.queryMemberLeftRightCount(pkParent); List<CuMember> personNumList = iCuMemberService.queryMemberLeftRightCount(pkParent);
if (personNumList != null && personNumList.size() > 1) { if (personNumList != null && personNumList.size() > 1) {
long leftNum = 0; long leftNum = 0;
long rigthNum = 0; long rigthNum = 0;
@ -1588,7 +1532,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
*/ */
private String handleExistMemberContinue(Long pkMember, EMemberContinue eMemberContinue) { private String handleExistMemberContinue(Long pkMember, EMemberContinue eMemberContinue) {
// 查询会员信息 // 查询会员信息
CuMember cuMember = cuMemberService.queryMember(pkMember); CuMember cuMember = iCuMemberService.queryMember(pkMember);
if (null == cuMember) { if (null == cuMember) {
log.error("会员续约有效期处理，会员不存在 pkMember ：{}", pkMember); log.error("会员续约有效期处理，会员不存在 pkMember ：{}", pkMember);
return "会员不存在"; return "会员不存在";
@ -1602,7 +1546,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Integer pkCountry = cuMember.getPkSettleCountry(); Integer pkCountry = cuMember.getPkSettleCountry();
// 查询同姓名、同手机号最高奖衔 // 查询同姓名、同手机号最高奖衔
CuMemberExt cuMemberExt = cuMemberService.querySameMemberByAwards(memberName, phone, pkCountry); CuMemberExt cuMemberExt = iCuMemberService.querySameMemberByAwards(memberName, phone, pkCountry);
// 休止期月数会员为6个月 // 休止期月数会员为6个月
int stopMonth = 6; int stopMonth = 6;
@ -1617,7 +1561,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 更新前，记录历史同姓名、同手机号【有效期】和【休止期】，撤单时需要使用 // 更新前，记录历史同姓名、同手机号【有效期】和【休止期】，撤单时需要使用
iCuMemberExpireHistoryService.saveExpireHistory(pkMember, memberName, phone, pkCountry); iCuMemberExpireHistoryService.saveExpireHistory(pkMember, memberName, phone, pkCountry);
// 【有效期】只更新同手机号比自己有效期早的，【休止期】按照同姓名、同手机号下最高奖衔的来算 -- 新注册订单，有效期肯定是最大的 // 【有效期】只更新同手机号比自己有效期早的，【休止期】按照同姓名、同手机号下最高奖衔的来算 -- 新注册订单，有效期肯定是最大的
cuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, cuMember.getExpireDate(), stopMonth, pkCountry); iCuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, cuMember.getExpireDate(), stopMonth, pkCountry);
break; break;
case UPGRADE_ORDER: case UPGRADE_ORDER:
// 升级订单 // 升级订单
@ -1627,32 +1571,32 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
return null; return null;
} else { } else {
// 只需要处理【休止期】 // 只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry); iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
} }
break; break;
case UPGRADE_CANCEL: case UPGRADE_CANCEL:
// 升级撤单 // 升级撤单
if (stopMonth == 6) { if (stopMonth == 6) {
// 休止期是6个月，只需要处理【休止期】 // 休止期是6个月，只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry); iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
} }
break; break;
case CHANGE_AWARDS: case CHANGE_AWARDS:
// 会员修改奖衔 // 会员修改奖衔
// 只需要处理【休止期】 // 只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry); iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
break; break;
case BUY_GIFT: case BUY_GIFT:
// 续约礼包，下单成功后，更新【有效期】【休止期】 // 续约礼包，下单成功后，更新【有效期】【休止期】
// 【有效期】【休止期】全部更新为续约这个最新的会员数据 // 【有效期】【休止期】全部更新为续约这个最新的会员数据
cuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, null, stopMonth, pkCountry); iCuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, null, stopMonth, pkCountry);
break; break;
case CHANGE_INFO: case CHANGE_INFO:
// 变更户籍（修改会员姓名 或 手机号） // 变更户籍（修改会员姓名 或 手机号）
// 更新前，记录历史同姓名、同手机号【有效期】和【休止期】 // 更新前，记录历史同姓名、同手机号【有效期】和【休止期】
iCuMemberExpireHistoryService.saveExpireHistory(pkMember, memberName, phone, pkCountry); iCuMemberExpireHistoryService.saveExpireHistory(pkMember, memberName, phone, pkCountry);
// 【有效期】按最新更新，【休止期】按照同姓名、同手机号下最高奖衔的来算 // 【有效期】按最新更新，【休止期】按照同姓名、同手机号下最高奖衔的来算
cuMemberService.updateExpireAndStopDateByChange(pkMember, memberName, phone, stopMonth, pkCountry); iCuMemberService.updateExpireAndStopDateByChange(pkMember, memberName, phone, stopMonth, pkCountry);
break; break;
default: default:
log.error("会员续约处理传入类型错误，eMemberContinue : {}", eMemberContinue); log.error("会员续约处理传入类型错误，eMemberContinue : {}", eMemberContinue);
@ -1660,7 +1604,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
} }
// 更新有效状态 // 更新有效状态
cuMemberService.updateExpireStatus(null, memberName, phone, pkCountry); iCuMemberService.updateExpireStatus(null, memberName, phone, pkCountry);
return null; return null;
} }
@ -1674,7 +1618,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
*/ */
private String handleNotExistMemberContinue(Long pkMember) { private String handleNotExistMemberContinue(Long pkMember) {
// 查询会员信息 // 查询会员信息
CuMember cuMember = cuMemberService.queryMemberNotFlag(null, pkMember); CuMember cuMember = iCuMemberService.queryMemberNotFlag(null, pkMember);
if (null == cuMember) { if (null == cuMember) {
log.error("会员续约有效期处理，会员不存在 pkMember ：{}", pkMember); log.error("会员续约有效期处理，会员不存在 pkMember ：{}", pkMember);
return "会员不存在"; return "会员不存在";
@ -1688,7 +1632,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Integer pkCountry = cuMember.getPkSettleCountry(); Integer pkCountry = cuMember.getPkSettleCountry();
// 查询同姓名、同手机号最高奖衔 // 查询同姓名、同手机号最高奖衔
CuMemberExt cuMemberExt = cuMemberService.querySameMemberByAwards(memberName, phone, pkCountry); CuMemberExt cuMemberExt = iCuMemberService.querySameMemberByAwards(memberName, phone, pkCountry);
if (null == cuMemberExt) { if (null == cuMemberExt) {
log.info("会员续约不处理，会员撤单后不存在相同户籍数据"); log.info("会员续约不处理，会员撤单后不存在相同户籍数据");
return null; return null;
@ -1706,14 +1650,14 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (null != cuMemberExpireHistory) { if (null != cuMemberExpireHistory) {
// 有历史【有效期】记录 // 有历史【有效期】记录
// 同姓名、同手机号，重置有效期等为历史记录中数据 // 同姓名、同手机号，重置有效期等为历史记录中数据
cuMemberService.resetExpireAndStopDate(memberName, phone, cuMemberExpireHistory.getExpireDate(), cuMemberExpireHistory.getStopDate(), pkCountry); iCuMemberService.resetExpireAndStopDate(memberName, phone, cuMemberExpireHistory.getExpireDate(), cuMemberExpireHistory.getStopDate(), pkCountry);
} else { } else {
// 没有历史【有效期】记录 // 没有历史【有效期】记录
// 只需要处理【休止期】 // 只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry); iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
} }
// 更新有效状态 // 更新有效状态
cuMemberService.updateExpireStatus(null, memberName, phone, pkCountry); iCuMemberService.updateExpireStatus(null, memberName, phone, pkCountry);
return null; return null;
} }

456
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -2,24 +2,19 @@ package com.hzs.member.base.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.activity.base.IActivityServiceApi;
import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.*;
import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*; import com.hzs.common.core.enums.*;
import com.hzs.common.core.exception.ServiceException; import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.*; import com.hzs.common.core.utils.*;
import com.hzs.common.domain.member.account.CuMemberAccount; import com.hzs.common.domain.member.account.CuMemberAccount;
import com.hzs.common.domain.member.achieve.CuMemberTree; import com.hzs.common.domain.member.achieve.CuMemberTree;
@ -28,7 +23,6 @@ import com.hzs.common.domain.member.detail.CuMemberServiceLog;
import com.hzs.common.domain.member.empty.CuMemberEmptyCode; import com.hzs.common.domain.member.empty.CuMemberEmptyCode;
import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.common.domain.member.ext.CuMemberTeamExt;
import com.hzs.common.domain.sale.wares.BdWaresAuthority; import com.hzs.common.domain.sale.wares.BdWaresAuthority;
import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.base.BdCountry;
import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdAwards;
@ -54,7 +48,6 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
import com.hzs.member.handlebusiness.vo.HandleBusinessVO; import com.hzs.member.handlebusiness.vo.HandleBusinessVO;
import com.hzs.member.marketnews.param.MarketNewsParam; import com.hzs.member.marketnews.param.MarketNewsParam;
import com.hzs.member.marketnews.vo.UserInvestmentVo; import com.hzs.member.marketnews.vo.UserInvestmentVo;
import com.hzs.member.param.MemberParam;
import com.hzs.system.base.ICountryServiceApi; import com.hzs.system.base.ICountryServiceApi;
import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.ISystemConfigServiceApi; import com.hzs.system.base.ISystemConfigServiceApi;
@ -103,8 +96,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
IApprovalServiceApi iApprovalServiceApi; IApprovalServiceApi iApprovalServiceApi;
@DubboReference @DubboReference
IAwardsServiceApi iAwardsServiceApi; IAwardsServiceApi iAwardsServiceApi;
@DubboReference
ISystemConfigServiceApi iSystemConfigServiceApi;
@Autowired @Autowired
private ICuMemberRegisterService iCuMemberRegisterService; private ICuMemberRegisterService iCuMemberRegisterService;
@ -122,13 +113,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
private ICuAwardsControlService iCuAwardsControlService; private ICuAwardsControlService iCuAwardsControlService;
@Autowired @Autowired
private ICuSettleCountryDetailedService iCuSettleCountryDetailedService; private ICuSettleCountryDetailedService iCuSettleCountryDetailedService;
@Autowired
private ICuMemberTeamService iCuMemberTeamService;
@Autowired
private ICuMemberBusinessService iCuMemberBusinessService;
@Autowired
private RedisService redisService;
@Autowired @Autowired
private RabbitTemplate rabbitTemplate; private RabbitTemplate rabbitTemplate;
@ -322,9 +307,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return cuMember; return cuMember;
} }
/**
* @description: 会员信息
**/
@Override @Override
public List<CuMemberVO> queryCuMemberByCondition(CuMemberVO memberParam) { public List<CuMemberVO> queryCuMemberByCondition(CuMemberVO memberParam) {
return baseMapper.queryCuMemberByCondition(memberParam); return baseMapper.queryCuMemberByCondition(memberParam);
@ -340,20 +322,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.queryCuMemberByMemberListExcel(memberParam); return baseMapper.queryCuMemberByMemberListExcel(memberParam);
} }
/**
* @description: 真实信息
**/
@Override @Override
public List<CuMemberVO> realCuMemberByCondition(CuMemberVO memberParam) { public List<CuMemberVO> realCuMemberByCondition(CuMemberVO memberParam) {
return baseMapper.realCuMemberByCondition(memberParam); return baseMapper.realCuMemberByCondition(memberParam);
} }
/**
* 创建空单注册会员
*
* @param member
* @return
*/
@Override @Override
public CuMember createEmptyOrderMember(CuMemberExt member) { public CuMember createEmptyOrderMember(CuMemberExt member) {
try { try {
@ -397,25 +370,16 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
iCuMemberRegisterService.save(cuMemberRegister); iCuMemberRegisterService.save(cuMemberRegister);
} }
/**
* @description: 特殊业务-修改会员编号列表
**/
@Override @Override
public List<UpdateCodeVO> puCodeList(UpdateCodeVO updateCodeVO) { public List<UpdateCodeVO> puCodeList(UpdateCodeVO updateCodeVO) {
return baseMapper.puCodeList(updateCodeVO); return baseMapper.puCodeList(updateCodeVO);
} }
/**
* @description: 查询会员续约
**/
@Override @Override
public List<UpdateExpireStopVO> getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO) { public List<UpdateExpireStopVO> getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO) {
return baseMapper.getMemberExpireStopList(updateExpireStopVO); return baseMapper.getMemberExpireStopList(updateExpireStopVO);
} }
/**
* @description: 零元撤单列表
**/
@Override @Override
public List<ZeroElementRevokeVO> zeroList(ZeroElementRevokeVO zeroElementRevokeVO) { public List<ZeroElementRevokeVO> zeroList(ZeroElementRevokeVO zeroElementRevokeVO) {
return baseMapper.zeroList(zeroElementRevokeVO); return baseMapper.zeroList(zeroElementRevokeVO);
@ -439,17 +403,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return zeoList; return zeoList;
} }
/**
* @description: 查询会员变更前信息
**/
@Override @Override
public UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO) { public UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO) {
return baseMapper.specialBusinessQuery(updateCodeVO); return baseMapper.specialBusinessQuery(updateCodeVO);
} }
/**
* @description: 批量修改会员编号
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpdateCodeVO updateCode(UpdateCodeVO updateCode) { public UpdateCodeVO updateCode(UpdateCodeVO updateCode) {
@ -514,9 +472,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return updateCode; return updateCode;
} }
/**
* @description: 修改会员续约发起签呈
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpdateExpireStopVO upExpireStop(UpdateExpireStopVO upESVO) { public UpdateExpireStopVO upExpireStop(UpdateExpireStopVO upESVO) {
@ -607,9 +562,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return upESVO; return upESVO;
} }
/**
* @description: 修改会员续约-审核通过驳回
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean upExpireStopProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean upExpireStopProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -648,9 +600,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 零元撤单
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ZeroElementRevokeVO zeroRevokeBusiness(ZeroElementRevokeVO zero) { public ZeroElementRevokeVO zeroRevokeBusiness(ZeroElementRevokeVO zero) {
@ -728,9 +677,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return zero; return zero;
} }
/**
* @description: 发起签呈-零元撤单
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ZeroElementRevokeVO zeroPetition(ZeroElementRevokeVO zeroElementRevokeVO) { public ZeroElementRevokeVO zeroPetition(ZeroElementRevokeVO zeroElementRevokeVO) {
@ -876,9 +822,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return updateCodeVO; return updateCodeVO;
} }
/**
* @description: 发起签呈-修改结算国
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpdateSettleCountryVO petition(UpdateSettleCountryVO upseCountryVO) { public UpdateSettleCountryVO petition(UpdateSettleCountryVO upseCountryVO) {
@ -953,9 +896,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return upseCountryVO; return upseCountryVO;
} }
/**
* @description: 特殊业务-修改政策币发起签呈
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpPolicyCurrencyVO petition(UpPolicyCurrencyVO policyCurrencyVO) { public UpPolicyCurrencyVO petition(UpPolicyCurrencyVO policyCurrencyVO) {
@ -1031,9 +971,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return policyCurrencyVO; return policyCurrencyVO;
} }
/**
* @description: 特殊业务-零元撤单-审核通过/驳回
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean zeroByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean zeroByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -1120,11 +1057,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 特殊业务-修改会员编号-审核通过
* @param: [updateCodeVO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean updateCodeByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean updateCodeByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -1156,11 +1088,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 政策币签呈-审核通过-驳回
* @param: [approvalBusinessResultDTO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean upPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean upPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -1218,11 +1145,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 删除政策币业务审核
* @param: [approvalBusinessResultDTO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean delPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean delPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -1293,11 +1215,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 特殊业务-修改会员编号-审核驳回
* @param: [updateCodeVO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean updateCodeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean updateCodeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -1353,11 +1270,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 特殊业务-真实奖衔控制-审核通过或驳回
* @param: [updateCodeVO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean awardsControlPetition(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean awardsControlPetition(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -1706,11 +1618,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return businessNo; return businessNo;
} }
/**
* @param pkCountry 国家
* @Description: 生成会员编号
* @return: String
*/
@Override @Override
public String createUserNameByPremix(Integer pkCountry, Boolean isHaiFun, Integer digit) { public String createUserNameByPremix(Integer pkCountry, Boolean isHaiFun, Integer digit) {
String prefix; String prefix;
@ -2091,13 +1998,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return num; return num;
} }
/**
* 后台安置列表
*
* @param list
* @param memberSettleExt
* @return
*/
@Override @Override
public List<Tree<String>> systemAzSetListTree(List<CuMemberSettleExt> list, CuMemberSettleExt memberSettleExt) { public List<Tree<String>> systemAzSetListTree(List<CuMemberSettleExt> list, CuMemberSettleExt memberSettleExt) {
R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
@ -2110,7 +2010,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
memberSettleExt.setColor(date.getColor()); memberSettleExt.setColor(date.getColor());
} }
} }
// TODO 关联网体查询等级颜色值
Map<String, GradeDTO> gradeDtoMap = queryGradeDTOMap(list); Map<String, GradeDTO> gradeDtoMap = queryGradeDTOMap(list);
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
TreeNodeConfig treeNodeConfig = new TreeNodeConfig(); TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
@ -2202,13 +2101,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return build; return build;
} }
/**
* 安置架构五
*
* @param list
* @param memberSettleExt
* @return
*/
@Override @Override
public List<Tree<String>> systemAzSetListTreeFive(List<CuMemberSettleExt> list, CuMemberSettleExt memberSettleExt) { public List<Tree<String>> systemAzSetListTreeFive(List<CuMemberSettleExt> list, CuMemberSettleExt memberSettleExt) {
TreeNodeConfig treeNodeConfig = new TreeNodeConfig(); TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
@ -2243,31 +2135,16 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return num; return num;
} }
/**
* @description: 特殊配置 修改结算国列表
* @param: [upseCountryVO]
* @return: java.util.List<com.hzs.member.base.vo.UpdateSettleCountryVO>
**/
@Override @Override
public List<UpdateSettleCountryVO> upsettleCountryList(UpdateSettleCountryVO upseCountryVO) { public List<UpdateSettleCountryVO> upsettleCountryList(UpdateSettleCountryVO upseCountryVO) {
return baseMapper.upsettleCountryList(upseCountryVO); return baseMapper.upsettleCountryList(upseCountryVO);
} }
/**
* @description: 查询修改政策币列表
* @param: [upVO]
* @return: java.util.List<com.hzs.member.base.vo.UpPolicyCurrencyVO>
**/
@Override @Override
public List<UpPolicyCurrencyVO> upPolicyCurrencyList(UpPolicyCurrencyVO upVO) { public List<UpPolicyCurrencyVO> upPolicyCurrencyList(UpPolicyCurrencyVO upVO) {
return baseMapper.upPolicyCurrencyList(upVO); return baseMapper.upPolicyCurrencyList(upVO);
} }
/**
* @description: 特殊业务-批量修改结算国
* @param: [upseCountryVO]
* @return: com.hzs.member.base.vo.UpdateSettleCountryVO
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpdateSettleCountryVO updateSettleCountry(UpdateSettleCountryVO upseCountryVO) { public UpdateSettleCountryVO updateSettleCountry(UpdateSettleCountryVO upseCountryVO) {
@ -2391,11 +2268,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return upseCountryVO; return upseCountryVO;
} }
/**
* @description: 特殊业务-修改政策币
* @param: [upseCountryVO]
* @return: com.hzs.member.base.vo.UpdateSettleCountryVO
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpPolicyCurrencyVO upPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO) { public UpPolicyCurrencyVO upPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO) {
@ -2462,11 +2334,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return policyCurrencyVO; return policyCurrencyVO;
} }
/**
* @description: 特殊业务-删除政策币业务
* @param: [policyCurrencyVO]
* @return: com.hzs.member.base.vo.UpPolicyCurrencyVO
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpPolicyCurrencyVO delPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO) { public UpPolicyCurrencyVO delPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO) {
@ -2565,12 +2432,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return policyCurrencyVO; return policyCurrencyVO;
} }
/**
* @description: 特殊业务-修改结算国-审核通过
* @param: [approvalBusinessResultDTO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean updateSettleCountryAdopt(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean updateSettleCountryAdopt(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -2653,11 +2514,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 特殊业务-修改结算国-审核驳回
* @param: [approvalBusinessResultDTO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean updateSettleCountryReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public boolean updateSettleCountryReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
@ -2713,62 +2569,31 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return true; return true;
} }
/**
* @description: 校验会员是否有充值审核
* @param: [pkMember]
* @return: java.lang.Integer
**/
@Override @Override
public Integer checkCecharge(Long pkMember) { public Integer checkCecharge(Long pkMember) {
return baseMapper.checkCecharge(pkMember); return baseMapper.checkCecharge(pkMember);
} }
/**
* @description: 校验会员是否有提现审核
* @param: [pkMember]
* @return: java.lang.Integer
**/
@Override @Override
public Integer checkWithdraw(Long pkMember) { public Integer checkWithdraw(Long pkMember) {
return baseMapper.checkWithdraw(pkMember); return baseMapper.checkWithdraw(pkMember);
} }
/**
* @description: 校验会员所有账户是否有余额
* @param: [pkMember]
* @return: java.lang.Integer
**/
@Override @Override
public Integer checkAccount(Long pkMember) { public Integer checkAccount(Long pkMember) {
return baseMapper.checkAccount(pkMember); return baseMapper.checkAccount(pkMember);
} }
/**
* @description: 查询会员是否存在未完成基础业务办理
* @param: [pkMember]
* @return: java.lang.Integer
**/
@Override @Override
public Integer checkmsLogCount(Long pkMember, Integer editType) { public Integer checkmsLogCount(Long pkMember, Integer editType) {
return baseMapper.checkmsLogCount(pkMember, editType); return baseMapper.checkmsLogCount(pkMember, editType);
} }
/**
* @description: 查询会员是否存在未完成注水业绩业务
* @param: [pkMember]
* @return: java.lang.Integer
**/
@Override @Override
public Integer checkMemberAchieveCount(Long pkMember) { public Integer checkMemberAchieveCount(Long pkMember) {
return baseMapper.checkMemberAchieveCount(pkMember); return baseMapper.checkMemberAchieveCount(pkMember);
} }
/**
* 查询汇总
*
* @param censusSummaryParam 表格名称
* @return
*/
@Override @Override
public List<CensusSummaryVo> selectCensusSummary(CensusSummaryParam censusSummaryParam, List<String> days) { public List<CensusSummaryVo> selectCensusSummary(CensusSummaryParam censusSummaryParam, List<String> days) {
Integer loginUserCountry = SecurityUtils.getPkCountry(); Integer loginUserCountry = SecurityUtils.getPkCountry();
@ -2812,7 +2637,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setRegisterPv(computeUSDToRMBRate(reAchieve.add(lxReachieve), chinaInExchangeRate)); censusSummaryVo.setRegisterPv(computeUSDToRMBRate(reAchieve.add(lxReachieve), chinaInExchangeRate));
censusSummaryVo.setRegisterAmountDollar(computeUSDExchangeRate(reAmount.add(lxReamount), inExchangeRate)); censusSummaryVo.setRegisterAmountDollar(computeUSDExchangeRate(reAmount.add(lxReamount), inExchangeRate));
censusSummaryVo.setRegisterPvDollar(checkIsDecimalNull(reAchieve.add(lxReachieve))); censusSummaryVo.setRegisterPvDollar(checkIsDecimalNull(reAchieve.add(lxReachieve)));
// 本地币
censusSummaryVo.setRegisterAmountLocality(checkIsDecimalNull(reAmount.add(lxReamount))); censusSummaryVo.setRegisterAmountLocality(checkIsDecimalNull(reAmount.add(lxReamount)));
censusSummaryVo.setRegisterPvLocality(USDToRMB(loginUserCountry, reAchieve.add(lxReachieve), inExchangeRate)); censusSummaryVo.setRegisterPvLocality(USDToRMB(loginUserCountry, reAchieve.add(lxReachieve), inExchangeRate));
@ -2820,7 +2644,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
BigDecimal lxamount = BigDecimal.ZERO; BigDecimal lxamount = BigDecimal.ZERO;
BigDecimal lxachieve = BigDecimal.ZERO; BigDecimal lxachieve = BigDecimal.ZERO;
if (memberMeritsSummaryMap.get(EOrderType.SPECIAL_UPGRADE_ORDER.getValue()) != null) { if (memberMeritsSummaryMap.get(EOrderType.SPECIAL_UPGRADE_ORDER.getValue()) != null) {
lxamount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_UPGRADE_ORDER.getValue()).getAmount(); lxamount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_UPGRADE_ORDER.getValue()).getAmount();
if (lxamount == null) { if (lxamount == null) {
lxamount = BigDecimal.ZERO; lxamount = BigDecimal.ZERO;
@ -2841,7 +2664,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setUpgradePv(computeUSDToRMBRate(upAchieve.add(lxachieve), chinaInExchangeRate)); censusSummaryVo.setUpgradePv(computeUSDToRMBRate(upAchieve.add(lxachieve), chinaInExchangeRate));
censusSummaryVo.setUpgradeAmountDollar(computeUSDExchangeRate(upAmount.add(lxamount), inExchangeRate)); censusSummaryVo.setUpgradeAmountDollar(computeUSDExchangeRate(upAmount.add(lxamount), inExchangeRate));
censusSummaryVo.setUpgradePvDollar(checkIsDecimalNull(upAchieve.add(lxachieve))); censusSummaryVo.setUpgradePvDollar(checkIsDecimalNull(upAchieve.add(lxachieve)));
//本地币
censusSummaryVo.setUpgradeAmountLocality(checkIsDecimalNull(upAmount.add(lxamount))); censusSummaryVo.setUpgradeAmountLocality(checkIsDecimalNull(upAmount.add(lxamount)));
censusSummaryVo.setUpgradePvLocality(USDToRMB(loginUserCountry, upAchieve.add(lxachieve), inExchangeRate)); censusSummaryVo.setUpgradePvLocality(USDToRMB(loginUserCountry, upAchieve.add(lxachieve), inExchangeRate));
//特殊升级 //特殊升级
@ -2852,7 +2674,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setSpecialUpgradePv(computeUSDToRMBRate(achieve, chinaInExchangeRate)); censusSummaryVo.setSpecialUpgradePv(computeUSDToRMBRate(achieve, chinaInExchangeRate));
censusSummaryVo.setSpecialUpgradeAmountDollar(computeUSDExchangeRate(amount, inExchangeRate)); censusSummaryVo.setSpecialUpgradeAmountDollar(computeUSDExchangeRate(amount, inExchangeRate));
censusSummaryVo.setSpecialUpgradePvDollar(checkIsDecimalNull(achieve)); censusSummaryVo.setSpecialUpgradePvDollar(checkIsDecimalNull(achieve));
//本地币
censusSummaryVo.setSpecialUpgradeAmountLocality(checkIsDecimalNull(amount)); censusSummaryVo.setSpecialUpgradeAmountLocality(checkIsDecimalNull(amount));
censusSummaryVo.setSpecialUpgradePvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate)); censusSummaryVo.setSpecialUpgradePvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate));
} else { } else {
@ -2860,7 +2681,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setSpecialUpgradePv(BigDecimal.ZERO); censusSummaryVo.setSpecialUpgradePv(BigDecimal.ZERO);
censusSummaryVo.setSpecialUpgradeAmountDollar(BigDecimal.ZERO); censusSummaryVo.setSpecialUpgradeAmountDollar(BigDecimal.ZERO);
censusSummaryVo.setSpecialUpgradePvDollar(BigDecimal.ZERO); censusSummaryVo.setSpecialUpgradePvDollar(BigDecimal.ZERO);
//本地币
censusSummaryVo.setSpecialUpgradeAmountLocality(BigDecimal.ZERO); censusSummaryVo.setSpecialUpgradeAmountLocality(BigDecimal.ZERO);
censusSummaryVo.setSpecialUpgradePvLocality(BigDecimal.ZERO); censusSummaryVo.setSpecialUpgradePvLocality(BigDecimal.ZERO);
} }
@ -2869,7 +2689,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setFirstPurchaseAmountDollar(censusSummaryVo.getRegisterAmountDollar().add(censusSummaryVo.getUpgradeAmountDollar())); censusSummaryVo.setFirstPurchaseAmountDollar(censusSummaryVo.getRegisterAmountDollar().add(censusSummaryVo.getUpgradeAmountDollar()));
censusSummaryVo.setFirstPurchasePv(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv())); censusSummaryVo.setFirstPurchasePv(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv()));
censusSummaryVo.setFirstPurchasePvDollar(censusSummaryVo.getRegisterPvDollar().add(censusSummaryVo.getUpgradePvDollar())); censusSummaryVo.setFirstPurchasePvDollar(censusSummaryVo.getRegisterPvDollar().add(censusSummaryVo.getUpgradePvDollar()));
// 本地币
censusSummaryVo.setFirstPurchaseAmountLocality(censusSummaryVo.getRegisterAmountLocality().add(censusSummaryVo.getUpgradeAmountLocality())); censusSummaryVo.setFirstPurchaseAmountLocality(censusSummaryVo.getRegisterAmountLocality().add(censusSummaryVo.getUpgradeAmountLocality()));
censusSummaryVo.setFirstPurchasePvLocality(censusSummaryVo.getRegisterPvLocality().add(censusSummaryVo.getUpgradePvLocality())); censusSummaryVo.setFirstPurchasePvLocality(censusSummaryVo.getRegisterPvLocality().add(censusSummaryVo.getUpgradePvLocality()));
// 三方 // 三方
@ -2882,7 +2701,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setTripartitePv(computeUSDToRMBRate(achieve, chinaInExchangeRate)); censusSummaryVo.setTripartitePv(computeUSDToRMBRate(achieve, chinaInExchangeRate));
censusSummaryVo.setTripartiteAmountDollar(computeUSDExchangeRate(amount, inExchangeRate)); censusSummaryVo.setTripartiteAmountDollar(computeUSDExchangeRate(amount, inExchangeRate));
censusSummaryVo.setTripartitePvDollar(checkIsDecimalNull(achieve)); censusSummaryVo.setTripartitePvDollar(checkIsDecimalNull(achieve));
// 本地币
censusSummaryVo.setTripartiteAmountLocality(checkIsDecimalNull(amount)); censusSummaryVo.setTripartiteAmountLocality(checkIsDecimalNull(amount));
censusSummaryVo.setTripartitePvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate)); censusSummaryVo.setTripartitePvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate));
} else { } else {
@ -2890,7 +2708,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setTripartitePv(BigDecimal.ZERO); censusSummaryVo.setTripartitePv(BigDecimal.ZERO);
censusSummaryVo.setTripartiteAmountDollar(BigDecimal.ZERO); censusSummaryVo.setTripartiteAmountDollar(BigDecimal.ZERO);
censusSummaryVo.setTripartitePvDollar(BigDecimal.ZERO); censusSummaryVo.setTripartitePvDollar(BigDecimal.ZERO);
// 本地币
censusSummaryVo.setTripartiteAmountLocality(BigDecimal.ZERO); censusSummaryVo.setTripartiteAmountLocality(BigDecimal.ZERO);
censusSummaryVo.setTripartitePvLocality(BigDecimal.ZERO); censusSummaryVo.setTripartitePvLocality(BigDecimal.ZERO);
} }
@ -2899,7 +2716,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setHiFunPv(BigDecimal.ZERO); censusSummaryVo.setHiFunPv(BigDecimal.ZERO);
censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO); censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO);
censusSummaryVo.setHiFunPvDollar(BigDecimal.ZERO); censusSummaryVo.setHiFunPvDollar(BigDecimal.ZERO);
// 本地币
censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO); censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO);
censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO); censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO);
@ -2915,15 +2731,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
BigDecimal haiFunUpgradeAmount = BigDecimal.ZERO; BigDecimal haiFunUpgradeAmount = BigDecimal.ZERO;
// 海粉升级 // 海粉升级
BigDecimal haiFunUpgradeAchieve = BigDecimal.ZERO; BigDecimal haiFunUpgradeAchieve = BigDecimal.ZERO;
// 云学院订单
BigDecimal cloudCollegeAmount = BigDecimal.ZERO;
BigDecimal cloudCollegeAchieve = BigDecimal.ZERO;
// 直播订单 // 直播订单
BigDecimal mallOrderAmount = BigDecimal.ZERO; BigDecimal mallOrderAmount = BigDecimal.ZERO;
BigDecimal mallOrderAchieve = BigDecimal.ZERO; BigDecimal mallOrderAchieve = BigDecimal.ZERO;
// 赋能礼包
BigDecimal empowermentAmount = BigDecimal.ZERO;
BigDecimal empowermentAchieve = BigDecimal.ZERO;
// 合作订单 // 合作订单
BigDecimal cooperateAmount = BigDecimal.ZERO; BigDecimal cooperateAmount = BigDecimal.ZERO;
BigDecimal cooperateAchieve = BigDecimal.ZERO; BigDecimal cooperateAchieve = BigDecimal.ZERO;
@ -2946,19 +2756,18 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
specialRepurchaseAmount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAmount(); specialRepurchaseAmount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAmount();
specialRepurchaseAchieve = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAchieve(); specialRepurchaseAchieve = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAchieve();
} }
// 复购金额+海粉金额+海粉升级+云学院订单+直播订单+赋能礼包+合作订单+特殊复购 // 复购金额+海粉金额+海粉升级+直播订单+合作订单+特殊复购
BigDecimal amount = repurchaseAmount.add(fansAmount).add(haiFunUpgradeAmount).add(cloudCollegeAmount) BigDecimal amount = repurchaseAmount.add(fansAmount).add(haiFunUpgradeAmount)
.add(mallOrderAmount).add(empowermentAmount).add(cooperateAmount).add(specialRepurchaseAmount); .add(mallOrderAmount).add(cooperateAmount).add(specialRepurchaseAmount);
censusSummaryVo.setRepurchaseAmount(computeChinaExchangeRate(loginUserCountry, amount, inExchangeRate, chinaInExchangeRate)); censusSummaryVo.setRepurchaseAmount(computeChinaExchangeRate(loginUserCountry, amount, inExchangeRate, chinaInExchangeRate));
censusSummaryVo.setRepurchaseAmountDollar(computeUSDExchangeRate(amount, inExchangeRate)); censusSummaryVo.setRepurchaseAmountDollar(computeUSDExchangeRate(amount, inExchangeRate));
censusSummaryVo.setRepurchaseAmountLocality(checkIsDecimalNull(amount)); censusSummaryVo.setRepurchaseAmountLocality(checkIsDecimalNull(amount));
BigDecimal repurchasePvSum = repurchaseAchieve.add(fansAchieve).add(haiFunUpgradeAchieve).add(cloudCollegeAchieve) BigDecimal repurchasePvSum = repurchaseAchieve.add(fansAchieve).add(haiFunUpgradeAchieve)
.add(mallOrderAchieve).add(empowermentAchieve).add(cooperateAchieve).add(specialRepurchaseAchieve); .add(mallOrderAchieve).add(cooperateAchieve).add(specialRepurchaseAchieve);
censusSummaryVo.setRepurchasePv(computeUSDToRMBRate(repurchasePvSum, chinaInExchangeRate)); censusSummaryVo.setRepurchasePv(computeUSDToRMBRate(repurchasePvSum, chinaInExchangeRate));
censusSummaryVo.setRepurchasePvDollar(checkIsDecimalNull(repurchasePvSum)); censusSummaryVo.setRepurchasePvDollar(checkIsDecimalNull(repurchasePvSum));
// 本地币
censusSummaryVo.setRepurchasePvLocality(USDToRMB(loginUserCountry, repurchasePvSum, inExchangeRate)); censusSummaryVo.setRepurchasePvLocality(USDToRMB(loginUserCountry, repurchasePvSum, inExchangeRate));
// 金额总计 // 金额总计
censusSummaryVo.setAmountTotal(checkIsDecimalNull(censusSummaryVo.getFirstPurchaseAmount()) censusSummaryVo.setAmountTotal(checkIsDecimalNull(censusSummaryVo.getFirstPurchaseAmount())
@ -2981,37 +2790,21 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setPvTotalDollar(checkIsDecimalNull(censusSummaryVo.getFirstPurchasePvDollar()) censusSummaryVo.setPvTotalDollar(checkIsDecimalNull(censusSummaryVo.getFirstPurchasePvDollar())
.add(checkIsDecimalNull(censusSummaryVo.getRepurchasePvDollar())) .add(checkIsDecimalNull(censusSummaryVo.getRepurchasePvDollar()))
.add(checkIsDecimalNull(censusSummaryVo.getTripartitePvDollar()))); .add(checkIsDecimalNull(censusSummaryVo.getTripartitePvDollar())));
// 业绩汇总（本地币） // 业绩汇总（本地币）
censusSummaryVo.setPvTotalLocality(checkIsDecimalNull(censusSummaryVo.getFirstPurchasePvLocality()) censusSummaryVo.setPvTotalLocality(checkIsDecimalNull(censusSummaryVo.getFirstPurchasePvLocality())
.add(checkIsDecimalNull(censusSummaryVo.getRepurchasePvLocality())) .add(checkIsDecimalNull(censusSummaryVo.getRepurchasePvLocality()))
.add(checkIsDecimalNull(censusSummaryVo.getTripartitePvLocality()))); .add(checkIsDecimalNull(censusSummaryVo.getTripartitePvLocality())));
censusSummaryList.add(censusSummaryVo); censusSummaryList.add(censusSummaryVo);
} }
return censusSummaryList; return censusSummaryList;
} }
/**
* 获取等级的翻译KEY值
*
* @param pkId ID
* @return Integer
*/
@Override @Override
public Integer getGradeTranslateValue(Integer pkId) { public Integer getGradeTranslateValue(Integer pkId) {
R<GradeDTO> grade = iGradeServiceApi.getGrade(pkId); R<GradeDTO> grade = iGradeServiceApi.getGrade(pkId);
return grade.getData().getPkTransaction(); return grade.getData().getPkTransaction();
} }
/**
* 获取奖衔的翻译KEY值
*
* @param pkCountry 国家
* @param pkId ID
* @return Integer
*/
@Override @Override
public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) { public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) {
R<BdAwards> awards = iAwardsServiceApi.getAwardsOne(pkId); R<BdAwards> awards = iAwardsServiceApi.getAwardsOne(pkId);
@ -3040,102 +2833,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.queryMemberSelect(param, pkCountry); return baseMapper.queryMemberSelect(param, pkCountry);
} }
@Override
public CuMember confirmShareMemberByMemberParam(MemberParam memberParam) {
CuMember parentMember = getMember(memberParam.getPkParent());
CuMember cuMember = packageSaveUser(memberParam, parentMember);
String memberCode = memberParam.getMemberCode();
if (StringUtils.isEmpty(memberCode)) {
memberCode = createUserNameByPremix(parentMember.getPkSettleCountry(), Boolean.TRUE, MagicNumberConstants.DIGIT);
}
cuMember.setPkId(baseMapper.createMemberId());
memberParam.setMemberCode(memberCode);
// 处理等级
GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), parentMember.getPkSettleCountry()).getData();
if (gradeDTO == null) {
return null;
}
cuMember.setPkRegisterGrade(gradeDTO.getPkId());
cuMember.setPkSettleGrade(gradeDTO.getPkId());
cuMember.setPkAwards(gradeDTO.getPkAwards());
// 等级对应的结算值
cuMember.setConsumeMoney(BigDecimal.ZERO);
cuMember.setConsumeAchieve(BigDecimal.ZERO);
cuMember.setRegisterAuthority(gradeDTO.getRegisterAuthority());
iCuMemberBusinessService.saveShareMember(cuMember);
return cuMember;
}
/**
* @param memberParam 参数
* @Description: 生成用户
* @return: void
*/
CuMember packageSaveUser(MemberParam memberParam, CuMember parentMember) {
// 获取新的订单编号
CuMember cuMember = CuMember.builder()
.memberCode(memberParam.getMemberCode())
.memberName(memberParam.getMemberName())
.pkSettleCountry(parentMember.getPkSettleCountry())
.phone(memberParam.getPhone())
.loginPwd(SecurityUtils.encryptPassword(memberParam.getLoginPassword()))
.loginPassword(memberParam.getLoginPassword())
.payPwd(SecurityUtils.encryptPassword(memberParam.getPayPassword()))
.payPassword(memberParam.getPayPassword())
.source(EDataSource.APP.getValue())
.pkParent(parentMember.getPkId())
.accountStatus(EAccountStatus.NORMAL.getValue())
// 这个时候是待支付，等支付的时候变为支付，可以跟待支付公用
.payStatus(EPayStatus.PAID.getValue())
.category(ECategory.NORMAL.getValue())
.orderSource(EOrderSource.SOLID.getValue())
.consumeMoney(BigDecimal.ZERO)
.consumeAchieve(BigDecimal.ZERO)
.customerType(ECustomerType.HAI_FANS.getValue())
.registerAuthority(ERegistrationAuthority.ORDINARY.getValue())
.build();
// 自动上树，验证推荐人等级，推荐人是海粉，验证左右区人数，否则验证业绩
CuMember placeCuMember = repeatTryTree(cuMember);
cuMember.setPkPlaceParent(placeCuMember.getPkPlaceParent());
cuMember.setPlaceDept(placeCuMember.getPlaceDept());
cuMember.setPkCountry(parentMember.getPkCountry());
Date currentTime = DateUtils.currentDateTime();
cuMember.setCreationTime(currentTime);
cuMember.setPayStatus(EPayStatus.PAID.getValue());
cuMember.setPayTime(currentTime);
// 2024.05.29 会员续约需求，【有效期】为购买时间次年的上月最后一天
cuMember.setExpireDate(DateUtils.beforeMonthLastDate(DateUtils.addYears(currentTime, 1)));
// 【休止期】普通会员6个月，奖衔会员12个月 -- 分享自注册，肯定是普通会员直接给6个月
cuMember.setStopDate(DateUtils.addMonths(cuMember.getExpireDate(), 6));
cuMember.setPkCreator(parentMember.getPkId());
if (parentMember.getPkTeamCode() == null) {
// 验证父级是不是团队
CuMemberTeamExt memberTeamExt = iCuMemberTeamService.getCuMemberTeamById(parentMember.getPkId());
if (memberTeamExt != null) {
cuMember.setPkTeamCode(memberTeamExt.getPkId());
}
} else {
cuMember.setPkTeamCode(parentMember.getPkTeamCode());
}
cuMember.setPkVertex(parentMember.getPkVertex());
return cuMember;
}
private CuMember repeatTryTree(CuMember cuMember) {
CuMember placeCuMember = iCuMemberBusinessService.queryCuMemberPlaceDept(cuMember, false, false);
if (!redisService.lockKeyOnce(CacheConstants.POSITION + placeCuMember.getPkPlaceParent() + placeCuMember.getPlaceDept(), Constants.FIVE_TIMEOUT_SECOND)) {
try {
Thread.sleep(300);
repeatTryTree(cuMember);
} catch (Exception e) {
e.printStackTrace();
}
}
return placeCuMember;
}
@Override @Override
public void deleteCuMemberByPkMember(Long pkMember, Long pkApprove, Date currentDateTime) { public void deleteCuMemberByPkMember(Long pkMember, Long pkApprove, Date currentDateTime) {
LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();
@ -3146,7 +2843,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
update(updateWrapper); update(updateWrapper);
} }
@Override @Override
public boolean updateMemberNameAndPhone(Long pkMember, String memberName, String phone, Long pkModified) { public boolean updateMemberNameAndPhone(Long pkMember, String memberName, String phone, Long pkModified) {
LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();
@ -3163,38 +2859,16 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.queryCuMemberLastPlaceParent(pkMember); return baseMapper.queryCuMemberLastPlaceParent(pkMember);
} }
/**
* 查询会员真实信息
*
* @return
*/
@Override @Override
public List<MemberRealInfoVO> selectByMemberRealInfo(MemberRealInfoParam memberRealInfoParam) { public List<MemberRealInfoVO> selectByMemberRealInfo(MemberRealInfoParam memberRealInfoParam) {
return baseMapper.selectByMemberRealInfo(memberRealInfoParam); return baseMapper.selectByMemberRealInfo(memberRealInfoParam);
} }
/**
* 查询推荐列表
*
* @param pkParent 会员主键
* @param memberCode 会员编号
* @param memberName 会员名称
* @param startCreateTime 开始时间
* @param endCreateTime 结束时间
* @param memberInfo 会员信息
* @return
*/
@Override @Override
public List<ParentMemberVo> parentList(Long pkParent, String memberCode, String memberName, Date startCreateTime, Date endCreateTime, String memberInfo) { public List<ParentMemberVo> parentList(Long pkParent, String memberCode, String memberName, Date startCreateTime, Date endCreateTime, String memberInfo) {
return baseMapper.parentList(pkParent, memberCode, memberName, startCreateTime, endCreateTime, memberInfo); return baseMapper.parentList(pkParent, memberCode, memberName, startCreateTime, endCreateTime, memberInfo);
} }
/**
* 查询注册列表
*
* @param marketNewsParam
* @return
*/
@Override @Override
public List<UserInvestmentVo> selectRegList(MarketNewsParam marketNewsParam) { public List<UserInvestmentVo> selectRegList(MarketNewsParam marketNewsParam) {
return baseMapper.selectRegList(marketNewsParam); return baseMapper.selectRegList(marketNewsParam);
@ -3205,13 +2879,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.findNoPayMember(memberCodes, pkCountry); return baseMapper.findNoPayMember(memberCodes, pkCountry);
} }
/**
* 计算明星用时
*/
public String getStarTime() {
return RandomUtil.randomDouble(5, 10) + "";
}
@Override @Override
public int checkParent(String topCode, Long pkMember) { public int checkParent(String topCode, Long pkMember) {
return baseMapper.checkParent(topCode, pkMember); return baseMapper.checkParent(topCode, pkMember);
@ -3235,23 +2902,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return resultMap; return resultMap;
} }
/**
* 查询全部用户
*
* @return
*/
@Override @Override
public List<CuMemberExt> findAll() { public List<CuMemberExt> findAll() {
return baseMapper.findAll(); return baseMapper.findAll();
} }
/**
* 查询左右区人数统计
*
* @param pkMember
* @param placeDept
* @return
*/
@Override @Override
public Long selectByDeptNumberCount(Long pkMember, Integer placeDept) { public Long selectByDeptNumberCount(Long pkMember, Integer placeDept) {
return baseMapper.selectByDeptNumberCount(pkMember, placeDept); return baseMapper.selectByDeptNumberCount(pkMember, placeDept);
@ -3262,20 +2917,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.selectMemberByMemberCode(memberCode, memberName, pkCountry); return baseMapper.selectMemberByMemberCode(memberCode, memberName, pkCountry);
} }
/**
* @description: 查询表是否存在
**/
@Override @Override
public Integer selectExistTable(String tableName) { public Integer selectExistTable(String tableName) {
return baseMapper.selectExistTable(tableName); return baseMapper.selectExistTable(tableName);
} }
/**
* 校验商品团队信息是否可见
*
* @param showWaresDTOS
* @return
*/
@Override @Override
public Map<Integer, Boolean> checkIsShowWares(List<ShowWaresDTO> showWaresDTOS) { public Map<Integer, Boolean> checkIsShowWares(List<ShowWaresDTO> showWaresDTOS) {
Map<Integer, Boolean> resultMap = new HashMap<>(); Map<Integer, Boolean> resultMap = new HashMap<>();
@ -3358,13 +3004,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.queryPlaceSponsorUnderUmbrella(waresAuthorityParentParamList); return baseMapper.queryPlaceSponsorUnderUmbrella(waresAuthorityParentParamList);
} }
/**
* 查询编号是否在登录用户伞下
*
* @param pkMember
* @param memberCode
* @return
*/
@Override @Override
public Long checkPlaceSponsorUnderUmbrella(Long pkMember, String memberCode) { public Long checkPlaceSponsorUnderUmbrella(Long pkMember, String memberCode) {
return baseMapper.checkPlaceSponsorUnderUmbrella(pkMember, memberCode); return baseMapper.checkPlaceSponsorUnderUmbrella(pkMember, memberCode);
@ -3395,11 +3034,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.insertBatchCuMember(memberList); return baseMapper.insertBatchCuMember(memberList);
} }
/**
* 修改直推审批
*
* @param updateParentPetitionParam
*/
@Override @Override
public UpdateParentPetitionParam petitionUpdateParent(UpdateParentPetitionParam updateParentPetitionParam) { public UpdateParentPetitionParam petitionUpdateParent(UpdateParentPetitionParam updateParentPetitionParam) {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
@ -3476,11 +3110,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return updateParentPetitionParam; return updateParentPetitionParam;
} }
/**
* 修改安置审批
*
* @param updatePlaceParentPetitionParam
*/
@Override @Override
public UpdatePlaceParentPetitionParam petitionUpdatePlaceParent(UpdatePlaceParentPetitionParam updatePlaceParentPetitionParam) { public UpdatePlaceParentPetitionParam petitionUpdatePlaceParent(UpdatePlaceParentPetitionParam updatePlaceParentPetitionParam) {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
@ -3569,11 +3198,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return updatePlaceParentPetitionParam; return updatePlaceParentPetitionParam;
} }
/**
* 修改直推（通过）
*
* @param approvalBusinessResultDTO
*/
@Override @Override
public void updateParentByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public void updateParentByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
//修改直推 //修改直推
@ -3596,11 +3220,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
} }
/**
* 修改直推（驳回）
*
* @param approvalBusinessResultDTO
*/
@Override @Override
public void updateParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public void updateParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
//修改直推 //修改直推
@ -3646,11 +3265,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
} }
/**
* 修改安置（通过）
*
* @param approvalBusinessResultDTO
*/
@Override @Override
public void updatePlaceParentByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public void updatePlaceParentByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
//修改安置 //修改安置
@ -3670,14 +3284,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
iCuMemberServiceLogService.updateById(memberServiceLog); iCuMemberServiceLogService.updateById(memberServiceLog);
} }
} }
} }
/**
* 修改安置（驳回）
*
* @param approvalBusinessResultDTO
*/
@Override @Override
public void updatePlaceParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { public void updatePlaceParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
String businessCode = approvalBusinessResultDTO.getBusinessCode(); String businessCode = approvalBusinessResultDTO.getBusinessCode();
@ -3751,7 +3359,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return this.update(updateWrapper); return this.update(updateWrapper);
} }
@Override @Override
public List<CuMemberExt> selectPlaceErrorCode() { public List<CuMemberExt> selectPlaceErrorCode() {
return baseMapper.selectPlaceErrorCode(); return baseMapper.selectPlaceErrorCode();
@ -3763,45 +3370,21 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return cuMemberList != null && cuMemberList.size() > 0; return cuMemberList != null && cuMemberList.size() > 0;
} }
/**
* @description: 校验会员是否存在三方订单
**/
@Override @Override
public Integer checkThreeOrder(Long pkMember) { public Integer checkThreeOrder(Long pkMember) {
return baseMapper.checkThreeOrder(pkMember); return baseMapper.checkThreeOrder(pkMember);
} }
/**
* 校验新安置部门和安置编号下是否已存在节点
*
* @param placeDeptMemberCode
* @param placeDept
* @return
*/
@Override @Override
public Long checkPlaceDeptAndMemberCode(String placeDeptMemberCode, Integer placeDept) { public Long checkPlaceDeptAndMemberCode(String placeDeptMemberCode, Integer placeDept) {
return baseMapper.checkPlaceDeptAndMemberCode(placeDeptMemberCode, placeDept); return baseMapper.checkPlaceDeptAndMemberCode(placeDeptMemberCode, placeDept);
} }
/**
* 校验会员体系伞下
*
* @param vertexIdList
* @param memberCode
* @return
*/
@Override @Override
public List<CuMemberExt> checkMemberVertex(List<Integer> vertexIdList, String memberCode) { public List<CuMemberExt> checkMemberVertex(List<Integer> vertexIdList, String memberCode) {
return baseMapper.checkMemberVertex(vertexIdList, memberCode); return baseMapper.checkMemberVertex(vertexIdList, memberCode);
} }
/**
* 校验修改直推 memberCode 是否在自己血缘伞下
*
* @param pkMember
* @param memberCode
* @return
*/
@Override @Override
public Long checkMemberParent(Long pkMember, String memberCode) { public Long checkMemberParent(Long pkMember, String memberCode) {
return baseMapper.checkMemberParent(pkMember, memberCode); return baseMapper.checkMemberParent(pkMember, memberCode);
@ -3813,23 +3396,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.updateMemberEditNumber(pkMemberList, updatePkMember); return baseMapper.updateMemberEditNumber(pkMemberList, updatePkMember);
} }
/**
* 查询会员安置伞上
*
* @param pkMember
* @param editNewPlaceMemberCode
* @return
*/
@Override @Override
public List<CuMember> checkMemberPlaceParent(Long pkMember, String editNewPlaceMemberCode) { public List<CuMember> checkMemberPlaceParent(Long pkMember, String editNewPlaceMemberCode) {
return baseMapper.checkMemberPlaceParent(pkMember, editNewPlaceMemberCode); return baseMapper.checkMemberPlaceParent(pkMember, editNewPlaceMemberCode);
} }
/**
* @param pkMember 推荐人
* @param editNewPlaceMemberCode 安置后会员编号
* @return
*/
@Override @Override
public Long checkPlaceMemberList(Long pkMember, String editNewPlaceMemberCode) { public Long checkPlaceMemberList(Long pkMember, String editNewPlaceMemberCode) {
return baseMapper.checkPlaceMemberList(pkMember, editNewPlaceMemberCode); return baseMapper.checkPlaceMemberList(pkMember, editNewPlaceMemberCode);
@ -3850,11 +3421,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.updateMemberExpireDate(); return baseMapper.updateMemberExpireDate();
} }
/**
* 用户消费统计
*
* @return
*/
@Override @Override
public List<MemberConsumptionStatVo> getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam) { public List<MemberConsumptionStatVo> getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam) {
return baseMapper.getMemberConsumptionStat(memberConsumptionStatParam); return baseMapper.getMemberConsumptionStat(memberConsumptionStatParam);
@ -3940,16 +3506,4 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry); return baseMapper.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry);
} }
private boolean validateFirstOrder(Long pkParent, Integer pkCountry) {
String validateFirstOrder = querySystemConfigByKey(pkCountry, ESystemConfig.FIRST_ORDER.getKey());
if (EYesNo.YES.getIntValue() == Integer.parseInt(validateFirstOrder)) {
Integer count = queryCuMemberByPkMember(pkParent);
return count == 0;
}
return false;
}
private String querySystemConfigByKey(Integer pkCountry, String key) {
return iSystemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData();
}
} }

95
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java
View File

@ -1,108 +1,53 @@
package com.hzs.member.base.service.impl; package com.hzs.member.base.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.constant.SystemFieldConstants;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.base.CuMemberTeam;
import com.hzs.common.domain.member.ext.CuMemberTeamExt; import com.hzs.common.domain.member.ext.CuMemberTeamExt;
import com.hzs.member.base.mapper.CuMemberTeamMapper; import com.hzs.member.base.mapper.CuMemberTeamMapper;
import com.hzs.member.base.param.MemberTeamInfoParam; import com.hzs.member.base.param.MemberTeamInfoParam;
import com.hzs.member.base.service.ICuMemberService;
import com.hzs.member.base.service.ICuMemberTeamService; import com.hzs.member.base.service.ICuMemberTeamService;
import com.hzs.member.base.vo.MemberTeamVo; import com.hzs.member.base.vo.MemberTeamVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
/** /**
* <p>
* 隶属团队列表 服务实现类 * 隶属团队列表 服务实现类
* </p>
*
* @author hzs
* @since 2022-09-01
*/ */
@Service @Service
public class CuMemberTeamServiceImpl extends ServiceImpl<CuMemberTeamMapper, CuMemberTeam> implements ICuMemberTeamService { public class CuMemberTeamServiceImpl extends ServiceImpl<CuMemberTeamMapper, CuMemberTeam> implements ICuMemberTeamService {
private RedisService redisService;
private ICuMemberService cuMemberService;
@Autowired
public void setCuMemberService(ICuMemberService cuMemberService) {
this.cuMemberService = cuMemberService;
}
@Autowired
public void setRedisService(RedisService redisService) {
this.redisService = redisService;
}
@Override @Override
public CuMemberTeamExt getCuMemberTeamById(Long pkMember) { public CuMemberTeamExt getCuMemberTeamById(Long pkMember) {
CuMemberTeamExt cuMemberTeamExt = redisService.getCacheObject(CacheConstants.CU_MEMBER_TEAM_ID + pkMember); CuMemberTeamExt cuMemberTeamExtParam = new CuMemberTeamExt();
if(cuMemberTeamExt == null){
CuMemberTeamExt cuMemberTeamExtParam=new CuMemberTeamExt();
cuMemberTeamExtParam.setPkMember(pkMember); cuMemberTeamExtParam.setPkMember(pkMember);
List<CuMemberTeamExt> cmtExtList=baseMapper.queryCuMemberTeam(cuMemberTeamExtParam); List<CuMemberTeamExt> cmtExtList = baseMapper.queryCuMemberTeam(cuMemberTeamExtParam);
if(null != cmtExtList && cmtExtList.size() > 0){
cuMemberTeamExt = cmtExtList.get(0); if (CollectionUtil.isNotEmpty(cmtExtList)) {
redisService.setCacheObject(CacheConstants.CU_MEMBER_TEAM_ID + pkMember, cuMemberTeamExt, CacheConstants.MEMBER_REFRESH_TIME, TimeUnit.DAYS); return cmtExtList.get(0);
} }
} return null;
return cuMemberTeamExt;
} }
/**
* @description: 隶属团队列表
* @author: zhang jing
* @date: 2022/11/9 14:13
* @param: [cuMemberTeamExt]
* @return: java.util.List<com.hzs.common.domain.member.ext.CuMemberTeamExt>
**/
@Override @Override
public List<CuMemberTeamExt> queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt) { public List<CuMemberTeamExt> queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt) {
return baseMapper.queryCuMemberTeam(cuMemberTeamExt); return baseMapper.queryCuMemberTeam(cuMemberTeamExt);
} }
/**
* @description: 根据国家查询隶属团队配置列表
* @author: zhang jing
* @date: 2022/11/10 19:31
* @param: [pkCountry]
* @return: java.util.List<com.hzs.common.domain.member.ext.CuMemberTeamExt>
**/
@Override @Override
public List<CuMemberTeamExt> queryCuMemberTeam(Integer pkCountry) { public List<CuMemberTeamExt> queryCuMemberTeam(Integer pkCountry) {
CuMemberTeamExt cuMemberTeamExt = new CuMemberTeamExt();
List<CuMemberTeamExt> cmtExtList = redisService.getCacheList(CacheConstants.CU_MEMBER_TEAM + pkCountry);
if(cmtExtList == null || cmtExtList.size() == 0){
CuMemberTeamExt cuMemberTeamExt=new CuMemberTeamExt();
cuMemberTeamExt.setPkCountry(pkCountry); cuMemberTeamExt.setPkCountry(pkCountry);
cmtExtList=baseMapper.queryCuMemberTeam(cuMemberTeamExt); return baseMapper.queryCuMemberTeam(cuMemberTeamExt);
if(null != cmtExtList && cmtExtList.size() != 0){
redisService.setCacheList(CacheConstants.CU_MEMBER_TEAM + pkCountry, cmtExtList);
} }
}
return cmtExtList;
}
/**
* 根据体系id 查询是否有团队占用该体系
* @param pkVertex
* @return
*/
@Override @Override
public Boolean checkVertex(Integer pkVertex) { public Boolean checkVertex(Integer pkVertex) {
QueryWrapper<CuMemberTeam> queryWrapper = new QueryWrapper<>(); LambdaQueryWrapper<CuMemberTeam> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq("PK_BD_VERTEX",pkVertex); queryWrapper.eq(CuMemberTeam::getPkBdVertex, pkVertex);
return this.count(queryWrapper) > 0; return this.count(queryWrapper) > 0;
} }
@ -111,7 +56,7 @@ public class CuMemberTeamServiceImpl extends ServiceImpl<CuMemberTeamMapper, CuM
public Boolean updateCuMemberTeamByVertex(Long pkTeamCode) { public Boolean updateCuMemberTeamByVertex(Long pkTeamCode) {
// 查询体系下的所有团队，团队的编号代表没有团队 // 查询体系下的所有团队，团队的编号代表没有团队
CuMemberTeam cuMemberTeam = baseMapper.selectById(pkTeamCode); CuMemberTeam cuMemberTeam = baseMapper.selectById(pkTeamCode);
if(cuMemberTeam != null){ if (cuMemberTeam != null) {
// 更新自己 // 更新自己
baseMapper.updateSelfCuMemberTeam(cuMemberTeam.getPkMember()); baseMapper.updateSelfCuMemberTeam(cuMemberTeam.getPkMember());
// 查询自己及伞下的团队 // 查询自己及伞下的团队
@ -128,23 +73,15 @@ public class CuMemberTeamServiceImpl extends ServiceImpl<CuMemberTeamMapper, CuM
} }
return Boolean.TRUE; return Boolean.TRUE;
} }
/**
* 查询会员团队信息
* @param memberTeamInfoParam
* @return
*/
@Override @Override
public List<MemberTeamVo> queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam) { public List<MemberTeamVo> queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam) {
return baseMapper.queryMemberTeamInfoList(memberTeamInfoParam); return baseMapper.queryMemberTeamInfoList(memberTeamInfoParam);
} }
/**
* 查询会员安置团队信息
* @param memberTeamInfoParam
* @return
*/
@Override @Override
public List<MemberTeamVo> queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam) { public List<MemberTeamVo> queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam) {
return baseMapper.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); return baseMapper.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam);
} }
} }

36
bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java
View File

@ -7,6 +7,7 @@ import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.web.domain.BaseApprovalEntity; import com.hzs.common.core.web.domain.BaseApprovalEntity;
import com.hzs.member.account.dto.MemberAmountDTO; import com.hzs.member.account.dto.MemberAmountDTO;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -14,13 +15,9 @@ import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
* <p>
* 注水业绩记录表VO * 注水业绩记录表VO
* </p>
*
* @author hzs
* @since 2022-08-22
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
public class CuMemberAchieveLogVO extends BaseApprovalEntity { public class CuMemberAchieveLogVO extends BaseApprovalEntity {
@ -83,52 +80,52 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
* 变更后左区真实业绩 * 变更后左区真实业绩
*/ */
@Excel(name = "变更后左区真实业绩(PV)") @Excel(name = "变更后左区真实业绩(PV)")
private BigDecimal asumRealModifyPv=BigDecimal.ZERO; private BigDecimal asumRealModifyPv = BigDecimal.ZERO;
/** /**
* 变更后右区真实业绩 * 变更后右区真实业绩
*/ */
@Excel(name = "变更后右区真实业绩(PV)") @Excel(name = "变更后右区真实业绩(PV)")
private BigDecimal bsumRealModifyPv=BigDecimal.ZERO; private BigDecimal bsumRealModifyPv = BigDecimal.ZERO;
/** /**
* 变更后左区首购业绩 * 变更后左区首购业绩
*/ */
@Excel(name = "变更后左区首购业绩(PV)") @Excel(name = "变更后左区首购业绩(PV)")
private BigDecimal afirstModifyPv=BigDecimal.ZERO; private BigDecimal afirstModifyPv = BigDecimal.ZERO;
/** /**
* 变更后右区首购业绩 * 变更后右区首购业绩
*/ */
@Excel(name = "变更后右区首购业绩(PV)") @Excel(name = "变更后右区首购业绩(PV)")
private BigDecimal bfirstModifyPv=BigDecimal.ZERO; private BigDecimal bfirstModifyPv = BigDecimal.ZERO;
/** /**
* 变更后左区首购结余 * 变更后左区首购结余
*/ */
@Excel(name = "变更后左区首购结余") @Excel(name = "变更后左区首购结余")
private BigDecimal repAFirstModifyBalance=BigDecimal.ZERO; private BigDecimal repAFirstModifyBalance = BigDecimal.ZERO;
/** /**
* 变更后右区首购结余 * 变更后右区首购结余
*/ */
@Excel(name = "变更后右区首购结余") @Excel(name = "变更后右区首购结余")
private BigDecimal repBFirstModifyBalance=BigDecimal.ZERO; private BigDecimal repBFirstModifyBalance = BigDecimal.ZERO;
/** /**
* 变更后左区复购业绩 * 变更后左区复购业绩
*/ */
@Excel(name = "变更后左区复购业绩(PV)") @Excel(name = "变更后左区复购业绩(PV)")
private BigDecimal repAModifySumPv=BigDecimal.ZERO; private BigDecimal repAModifySumPv = BigDecimal.ZERO;
/** /**
* 变更后右区复购业绩 * 变更后右区复购业绩
*/ */
@Excel(name = "变更后右区复购业绩(PV)") @Excel(name = "变更后右区复购业绩(PV)")
private BigDecimal repBModifySumPv=BigDecimal.ZERO; private BigDecimal repBModifySumPv = BigDecimal.ZERO;
/** /**
* 变更后左区复购结余 * 变更后左区复购结余
*/ */
@Excel(name = "变更后左区复购结余") @Excel(name = "变更后左区复购结余")
private BigDecimal repAModifyBalance=BigDecimal.ZERO; private BigDecimal repAModifyBalance = BigDecimal.ZERO;
/** /**
* 变更后右区复购结余 * 变更后右区复购结余
*/ */
@Excel(name = "变更后右区复购结余") @Excel(name = "变更后右区复购结余")
private BigDecimal repBModifyBalance=BigDecimal.ZERO; private BigDecimal repBModifyBalance = BigDecimal.ZERO;
/** /**
* 变更前左区真实业绩 * 变更前左区真实业绩
*/ */
@ -194,7 +191,7 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
/** /**
* 结算日期 注水日期（年-月-日） * 结算日期 注水日期（年-月-日）
*/ */
@Excel(name = "注水日期",dateFormat = "yyyy-MM-dd") @Excel(name = "注水日期", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date settleDate; private Date settleDate;
private String settleDateStr; private String settleDateStr;
@ -202,7 +199,7 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
/** /**
* 到期日期 * 到期日期
*/ */
@Excel(name = "结束日期",dateFormat = "yyyy-MM-dd") @Excel(name = "结束日期", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date dueDate; private Date dueDate;
private String dueDateStr; private String dueDateStr;
@ -326,7 +323,6 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
private Date endDueDate; private Date endDueDate;
/** /**
* 修改时间 * 修改时间
*/ */
@ -349,8 +345,4 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
private String tableName; private String tableName;
} }

71
bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java
View File

@ -5,13 +5,6 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
/**
* @Description:
* @Author: yuhui
* @Time: 2023/2/6 15:36
* @Classname: censusSummaryVo
* @PackageName: com.hzs.member.censusSummary.vo
*/
@Data @Data
public class CensusSummaryVo { public class CensusSummaryVo {
@ -36,13 +29,13 @@ public class CensusSummaryVo {
/** /**
* 注册金额($) * 注册金额($)
*/ */
@Excel(name = "注册金额($)") // @Excel(name = "注册金额($)")
private BigDecimal registerAmountDollar; private BigDecimal registerAmountDollar;
/** /**
* 注册金额(本地币) * 注册金额(本地币)
*/ */
@Excel(name = "注册金额") // @Excel(name = "注册金额")
private BigDecimal registerAmountLocality; private BigDecimal registerAmountLocality;
/** /**
@ -54,13 +47,13 @@ public class CensusSummaryVo {
/** /**
* 注册业绩($) * 注册业绩($)
*/ */
@Excel(name = "注册业绩($)") // @Excel(name = "注册业绩($)")
private BigDecimal registerPvDollar; private BigDecimal registerPvDollar;
/** /**
* 注册业绩（本地币） * 注册业绩（本地币）
*/ */
@Excel(name = "注册业绩") // @Excel(name = "注册业绩")
private BigDecimal registerPvLocality; private BigDecimal registerPvLocality;
/** /**
@ -102,13 +95,13 @@ public class CensusSummaryVo {
/** /**
* 升级金额($) * 升级金额($)
*/ */
@Excel(name = "升级金额($)") // @Excel(name = "升级金额($)")
private BigDecimal upgradeAmountDollar; private BigDecimal upgradeAmountDollar;
/** /**
* 升级金额(本地币) * 升级金额(本地币)
*/ */
@Excel(name = "升级金额") // @Excel(name = "升级金额")
private BigDecimal upgradeAmountLocality; private BigDecimal upgradeAmountLocality;
@ -121,13 +114,13 @@ public class CensusSummaryVo {
/** /**
* 升级业绩($) * 升级业绩($)
*/ */
@Excel(name = "升级业绩($)") // @Excel(name = "升级业绩($)")
private BigDecimal upgradePvDollar; private BigDecimal upgradePvDollar;
/** /**
* 升级业绩（本地币） * 升级业绩（本地币）
*/ */
@Excel(name = "升级业绩") // @Excel(name = "升级业绩")
private BigDecimal upgradePvLocality; private BigDecimal upgradePvLocality;
/** /**
@ -171,12 +164,12 @@ public class CensusSummaryVo {
/** /**
* 首购金额 * 首购金额
*/ */
@Excel(name = "首购金额($)") // @Excel(name = "首购金额($)")
private BigDecimal firstPurchaseAmountDollar; private BigDecimal firstPurchaseAmountDollar;
/** /**
* 首购金额(本地币) * 首购金额(本地币)
*/ */
@Excel(name = "首购金额") // @Excel(name = "首购金额")
private BigDecimal firstPurchaseAmountLocality; private BigDecimal firstPurchaseAmountLocality;
/** /**
@ -188,49 +181,49 @@ public class CensusSummaryVo {
/** /**
* 首购业绩($) * 首购业绩($)
*/ */
@Excel(name = "首购业绩($)") // @Excel(name = "首购业绩($)")
private BigDecimal firstPurchasePvDollar; private BigDecimal firstPurchasePvDollar;
/** /**
* 首购业绩(本地币) * 首购业绩(本地币)
*/ */
@Excel(name = "首购业绩") // @Excel(name = "首购业绩")
private BigDecimal firstPurchasePvLocality; private BigDecimal firstPurchasePvLocality;
/** /**
* 三方金额 * 三方金额
*/ */
@Excel(name = "三方金额(￥)") // @Excel(name = "三方金额(￥)")
private BigDecimal tripartiteAmount; private BigDecimal tripartiteAmount;
/** /**
* 三方金额 * 三方金额
*/ */
@Excel(name = "三方金额($)") // @Excel(name = "三方金额($)")
private BigDecimal tripartiteAmountDollar; private BigDecimal tripartiteAmountDollar;
/** /**
* 三方金额(本地币) * 三方金额(本地币)
*/ */
@Excel(name = "三方金额") // @Excel(name = "三方金额")
private BigDecimal tripartiteAmountLocality; private BigDecimal tripartiteAmountLocality;
/** /**
* 三方业绩 * 三方业绩
*/ */
@Excel(name = "三方业绩(￥)") // @Excel(name = "三方业绩(￥)")
private BigDecimal tripartitePv; private BigDecimal tripartitePv;
/** /**
* 三方业绩($) * 三方业绩($)
*/ */
@Excel(name = "三方业绩($)") // @Excel(name = "三方业绩($)")
private BigDecimal tripartitePvDollar; private BigDecimal tripartitePvDollar;
/** /**
* 三方业绩（本地币） * 三方业绩（本地币）
*/ */
@Excel(name = "三方业绩") // @Excel(name = "三方业绩")
private BigDecimal tripartitePvLocality; private BigDecimal tripartitePvLocality;
@ -276,35 +269,35 @@ public class CensusSummaryVo {
/** /**
* 海粉金额 * 海粉金额
*/ */
@Excel(name = "海粉金额(￥)") // @Excel(name = "海粉金额(￥)")
private BigDecimal fansAmount; private BigDecimal fansAmount;
/** /**
* 海粉金额($) * 海粉金额($)
*/ */
@Excel(name = "海粉金额($)") // @Excel(name = "海粉金额($)")
private BigDecimal fansAmountDollar; private BigDecimal fansAmountDollar;
/** /**
* 海粉金额（本地币） * 海粉金额（本地币）
*/ */
@Excel(name = "海粉金额") // @Excel(name = "海粉金额")
private BigDecimal fansAmountLocality; private BigDecimal fansAmountLocality;
/** /**
* 海粉业绩 * 海粉业绩
*/ */
@Excel(name = "海粉业绩(￥)") // @Excel(name = "海粉业绩(￥)")
private BigDecimal hiFunPv; private BigDecimal hiFunPv;
/** /**
* 海粉业绩 * 海粉业绩
*/ */
@Excel(name = "海粉业绩($)") // @Excel(name = "海粉业绩($)")
private BigDecimal hiFunPvDollar; private BigDecimal hiFunPvDollar;
/** /**
* 海粉业绩(本地币) * 海粉业绩(本地币)
*/ */
@Excel(name = "海粉业绩") // @Excel(name = "海粉业绩")
private BigDecimal hiFunPvLocality; private BigDecimal hiFunPvLocality;
/** /**
@ -316,13 +309,13 @@ public class CensusSummaryVo {
/** /**
* 复购金额($) * 复购金额($)
*/ */
@Excel(name = "复购金额($)") // @Excel(name = "复购金额($)")
private BigDecimal repurchaseAmountDollar; private BigDecimal repurchaseAmountDollar;
/** /**
* 复购金额（本地币） * 复购金额（本地币）
*/ */
@Excel(name = "复购金额") // @Excel(name = "复购金额")
private BigDecimal repurchaseAmountLocality; private BigDecimal repurchaseAmountLocality;
@ -336,13 +329,13 @@ public class CensusSummaryVo {
/** /**
* 复购pv * 复购pv
*/ */
@Excel(name = "复购业绩($)") // @Excel(name = "复购业绩($)")
private BigDecimal repurchasePvDollar; private BigDecimal repurchasePvDollar;
/** /**
* 复购pv（本地币） * 复购pv（本地币）
*/ */
@Excel(name = "复购业绩") // @Excel(name = "复购业绩")
private BigDecimal repurchasePvLocality; private BigDecimal repurchasePvLocality;
@ -355,13 +348,13 @@ public class CensusSummaryVo {
/** /**
* 金额总计($) * 金额总计($)
*/ */
@Excel(name = "金额总计($)") // @Excel(name = "金额总计($)")
private BigDecimal amountTotalDollar; private BigDecimal amountTotalDollar;
/** /**
* 金额总计(本地币) * 金额总计(本地币)
*/ */
@Excel(name = "金额总计") // @Excel(name = "金额总计")
private BigDecimal amountTotalLocality; private BigDecimal amountTotalLocality;
/** /**
@ -373,13 +366,13 @@ public class CensusSummaryVo {
/** /**
* 业绩汇总($) * 业绩汇总($)
*/ */
@Excel(name = "业绩汇总($)") // @Excel(name = "业绩汇总($)")
private BigDecimal pvTotalDollar; private BigDecimal pvTotalDollar;
/** /**
* 业绩汇总(本地币) * 业绩汇总(本地币)
*/ */
@Excel(name = "业绩汇总") // @Excel(name = "业绩汇总")
private BigDecimal pvTotalLocality; private BigDecimal pvTotalLocality;
} }

35
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java
View File

@ -115,10 +115,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
private CuBonusStatisVO addOrderAmount(CuBonusStatisVO oldSo, Integer pkCountry, Integer pkVertex, List<CuBonusStatisVO> orachList, int type) { private CuBonusStatisVO addOrderAmount(CuBonusStatisVO oldSo, Integer pkCountry, Integer pkVertex, List<CuBonusStatisVO> orachList, int type) {
for (CuBonusStatisVO newSo : orachList) { for (CuBonusStatisVO newSo : orachList) {
// 修改统计数据 // 修改统计数据
if ( if ((pkCountry == null && pkVertex != null && pkVertex.equals(newSo.getPkVertex()))
(pkCountry == null && pkVertex != null && pkVertex.equals(newSo.getPkVertex())) || (pkCountry != null && pkVertex == null && pkCountry.equals(newSo.getPkCountry()))
||
(pkCountry != null && pkVertex == null && pkCountry.equals(newSo.getPkCountry()))
) { ) {
// 国家国空，体系不为 并且 体系相同 // 国家国空，体系不为 并且 体系相同
// 国家不为空，体系为空 并且 国家相同 // 国家不为空，体系为空 并且 国家相同
@ -222,20 +220,6 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
// 复购直推收益 // 复购直推收益
oldBon.setRepurPushIncome(addOrInitializeAmount(oldBon.getRepurPushIncome(), newBon.getRealIncome(), 2)); oldBon.setRepurPushIncome(addOrInitializeAmount(oldBon.getRepurPushIncome(), newBon.getRealIncome(), 2));
break; break;
// //云代
// case CLOUD_AGENT_DIRECT_PUSH:
// oldBon.setAgentIntroduceBonus(addOrInitializeAmount(oldBon.getAgentIntroduceBonus(), newBon.getRealIncome(), 2));
// break;
// case CLOUD_AGENT_FIRST_PURCHASE:
// oldBon.setCloudAgentFirstPurchase(addOrInitializeAmount(oldBon.getCloudAgentFirstPurchase(), newBon.getRealIncome(), 2));
// break;
// case CLOUD_AGENT_REPURCHASE:
// oldBon.setCloudAgentRepurchase(addOrInitializeAmount(oldBon.getCloudAgentRepurchase(), newBon.getRealIncome(), 2));
// break;
// //嗨粉直推收益
// case HI_PINK:
// oldBon.setHiFunIncome(addOrInitializeAmount(oldBon.getHiFunIncome(), newBon.getRealIncome(), 2));
// break;
} }
return oldBon; return oldBon;
} }
@ -427,8 +411,7 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
// 先查中国订单 // 先查中国订单
List<CuBonusStatisVO> orachList = baseMapper.querySaOrderByLessDay(cbs); List<CuBonusStatisVO> orachList = baseMapper.querySaOrderByLessDay(cbs);
// 按支付时间（年月日）把订单进行分组（key:支付时间（年月日），value：订单统计数据列表） // 按支付时间（年月日）把订单进行分组（key:支付时间（年月日），value：订单统计数据列表）
Map<Date, List<CuBonusStatisVO>> orachListMap = orachList.stream() Map<Date, List<CuBonusStatisVO>> orachListMap = orachList.stream().collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime));
.collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime));
if (CollectionUtil.isNotEmpty(orachList)) { if (CollectionUtil.isNotEmpty(orachList)) {
if (CollectionUtil.isNotEmpty(vertexlist)) { if (CollectionUtil.isNotEmpty(vertexlist)) {
for (Map.Entry<Date, List<CuBonusStatisVO>> entry : orachListMap.entrySet()) { for (Map.Entry<Date, List<CuBonusStatisVO>> entry : orachListMap.entrySet()) {
@ -476,33 +459,21 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
return true; return true;
} }
/**
* @description: 删除奖金拨比统计表数据
**/
@Override @Override
public Boolean delStatis(String startDate, String endDate) { public Boolean delStatis(String startDate, String endDate) {
return baseMapper.delStatis(startDate, endDate); return baseMapper.delStatis(startDate, endDate);
} }
/**
* @description: 查询奖金扣项配置参数
**/
@Override @Override
public List<CuBonusStatisVO> bonusDeductlist(CuBonusStatisVO cuBonusStatisVO) { public List<CuBonusStatisVO> bonusDeductlist(CuBonusStatisVO cuBonusStatisVO) {
return baseMapper.bonusDeductlist(cuBonusStatisVO); return baseMapper.bonusDeductlist(cuBonusStatisVO);
} }
/**
* @description: 查询分红比例配置
**/
@Override @Override
public List<CuBonusStatisVO> bonusDividendRatiolist(CuBonusStatisVO cuBonusStatisVO) { public List<CuBonusStatisVO> bonusDividendRatiolist(CuBonusStatisVO cuBonusStatisVO) {
return baseMapper.bonusDividendRatiolist(cuBonusStatisVO); return baseMapper.bonusDividendRatiolist(cuBonusStatisVO);
} }
/**
* @description: 查询有效体系
**/
@Override @Override
public List<CuBonusStatisVO> vertexList() { public List<CuBonusStatisVO> vertexList() {
return baseMapper.vertexList(); return baseMapper.vertexList();

89
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
View File

@ -14,7 +14,6 @@ import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.constant.MemberConstants; import com.hzs.common.core.constant.MemberConstants;
import com.hzs.common.core.constant.MemberFrameworkConstants; import com.hzs.common.core.constant.MemberFrameworkConstants;
import com.hzs.common.core.constant.TableNameConstants; import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EPlaceDept; import com.hzs.common.core.enums.EPlaceDept;
@ -26,7 +25,6 @@ import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.base.BdCountry;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
@ -77,48 +75,34 @@ public class MemberStructureController extends BaseController {
*/ */
@AccessPermissions("Arcgurecture") @AccessPermissions("Arcgurecture")
@GetMapping("/az-framework") @GetMapping("/az-framework")
public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level) {
if (level == null) { if (level == null) {
level = 7; level = 7;
} }
// 体系 // 体系
UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList(); List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList();
List<Long> userVertexList = userAuthorityDTO.getUserVertexList();
Date date = new Date(); Date date = new Date();
String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
Long pkMember = null; Long pkMember;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = iCuMemberService.getMemberByCode(memberCode); CuMember member = iCuMemberService.getMemberByCode(memberCode);
if (member == null) { if (null == member) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS));
} }
pkMember = member.getPkId(); pkMember = member.getPkId();
} else { } else {
if (userVertexList != null && userVertexList.size() > 0) { return AjaxResult.error("请输入会员编号");
CuMember member = iCuMemberService.getMemberById(userVertexList.get(0));
pkMember = member.getPkId();
memberCode = member.getMemberCode();
} else {
R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) {
if (be.getKey().equals(SecurityUtils.getPkCountry())) {
memberCode = be.getValue().getCode() + "30720201";
CuMember member = iCuMemberService.getMemberByCode(memberCode);
pkMember = member.getPkId();
}
}
}
} }
if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { // if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) {
// 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 // // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的
List<CuMemberExt> memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); // List<CuMemberExt> memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode);
if (memberExtList.size() == 0) { // if (memberExtList.size() == 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); // return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE));
} // }
} // }
Integer period = null; Integer period = null;
Date settleDate = null; Date settleDate = null;
@ -134,8 +118,8 @@ public class MemberStructureController extends BaseController {
} }
} }
// 查询当天 (秒结) // 查询当天 (秒结)
if (settleDate != null && if (settleDate != null
DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { && DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) {
// 会员结算秒结表 // 会员结算秒结表
String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period;
// 查询所有用户表数据 id // 查询所有用户表数据 id
@ -363,8 +347,7 @@ public class MemberStructureController extends BaseController {
// 体系 // 体系
UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList(); List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList();
List<Long> userVertexList = userAuthorityDTO.getUserVertexList(); Long pkMember;
Long pkMember = null;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = iCuMemberService.getMember(memberCode); CuMember member = iCuMemberService.getMember(memberCode);
if (member == null) { if (member == null) {
@ -372,20 +355,7 @@ public class MemberStructureController extends BaseController {
} }
pkMember = member.getPkId(); pkMember = member.getPkId();
} else { } else {
return AjaxResult.error("请输入会员编号");
if (userVertexList != null && userVertexList.size() > 0) {
CuMember member = iCuMemberService.getMember(userVertexList.get(0));
pkMember = member.getPkId();
} else {
R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) {
if (be.getKey().equals(SecurityUtils.getPkCountry())) {
memberCode = be.getValue().getCode() + "30720201";
CuMember member = iCuMemberService.getMember(memberCode);
pkMember = member.getPkId();
}
}
}
} }
Integer period = null; Integer period = null;
@ -506,7 +476,7 @@ public class MemberStructureController extends BaseController {
* @return * @return
*/ */
@GetMapping("/az-framework-five") @GetMapping("/az-framework-five")
public AjaxResult azFrameWorkFive(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { public AjaxResult azFrameWorkFive(String memberCode, Integer level) {
if (level == null) { if (level == null) {
level = 10; level = 10;
} }
@ -514,7 +484,7 @@ public class MemberStructureController extends BaseController {
UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList(); List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList();
List<Long> userVertexList = userAuthorityDTO.getUserVertexList(); List<Long> userVertexList = userAuthorityDTO.getUserVertexList();
Long pkMember = null; Long pkMember;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = iCuMemberService.getMemberByCode(memberCode); CuMember member = iCuMemberService.getMemberByCode(memberCode);
if (member == null) { if (member == null) {
@ -525,26 +495,19 @@ public class MemberStructureController extends BaseController {
if (userVertexList != null && userVertexList.size() > 0) { if (userVertexList != null && userVertexList.size() > 0) {
CuMember member = iCuMemberService.getMemberById(userVertexList.get(0)); CuMember member = iCuMemberService.getMemberById(userVertexList.get(0));
pkMember = member.getPkId(); pkMember = member.getPkId();
memberCode = member.getMemberCode(); // memberCode = member.getMemberCode();
} else { } else {
R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap(); return AjaxResult.error("请输入会员编号");
for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) {
if (be.getKey().equals(SecurityUtils.getPkCountry())) {
memberCode = be.getValue().getCode() + "30720201";
CuMember member = iCuMemberService.getMemberByCode(memberCode);
pkMember = member.getPkId();
}
}
} }
} }
if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { // if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) {
// 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 // // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的
List<CuMemberExt> memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); // List<CuMemberExt> memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode);
if (memberExtList.size() == 0) { // if (memberExtList.size() == 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); // return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE));
} // }
} // }
// 查询当天 (秒结) // 查询当天 (秒结)
// 会员结算秒结表 // 会员结算秒结表

3
bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml
View File

@ -57,9 +57,6 @@
<if test="approveState != null"> <if test="approveState != null">
and r.APPROVE_STATE = #{approveState} and r.APPROVE_STATE = #{approveState}
</if> </if>
<if test="batch != null and batch != ''">
and r.BATCH like '%' || #{batch} || '%'
</if>
<if test="approver != null and approver != ''"> <if test="approver != null and approver != ''">
and r.APPROVER like '%' || #{approver} || '%' and r.APPROVER like '%' || #{approver} || '%'
</if> </if>

19
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -2757,25 +2757,6 @@
</foreach> </foreach>
</if> </if>
group by sa.ORDER_TYPE group by sa.ORDER_TYPE
union all
select 99 orderType,
sum(sa.ORDER_AMOUNT) amount,
sum(sa.ORDER_ACHIEVE) achieve
from SA_T_ORDER sa
inner join cu_member cm on sa.pk_member=cm.pk_id and cm.DEL_FLAG = 0 and cm.CATEGORY=0
where sa.ORDER_STATUS = 1
and sa.del_flag = 0
and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
and sa.PK_COUNTRY = #{pkCountry}
<if test="pkVertex!=null and pkVertex.size> 0 ">
and cm.PK_VERTEX in
<foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
group by sa.ORDER_TYPE
</select> </select>
<select id="selectPlaceErrorCode" resultType="com.hzs.common.domain.member.ext.CuMemberExt"> <select id="selectPlaceErrorCode" resultType="com.hzs.common.domain.member.ext.CuMemberExt">

11
bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml
View File

@ -741,17 +741,16 @@
resultType="com.hzs.member.statis.vo.CuBonusStatisVO"> resultType="com.hzs.member.statis.vo.CuBonusStatisVO">
select a.PK_ID, select a.PK_ID,
b.PK_ID as pkId, b.PK_ID as pkId,
(a.BACK_RATIO+a.PLATFORM_RATIO)/100 backRatio (a.BACK_RATIO + a.PLATFORM_RATIO) / 100 backRatio
from BD_BONUS_ITEMS b from BD_BONUS_ITEMS b
left JOIN BD_BONUS_DEDUCT a on a.PK_BONUS_ITEMS=b.PK_ID left JOIN BD_BONUS_DEDUCT a on a.PK_BONUS_ITEMS=b.PK_ID
where where b.DEL_FLAG =0
b.DEL_FLAG =0 and a.BACK_RATIO > 0
and a.BACK_RATIO>0 and a.PLATFORM_RATIO > 0
and a.PLATFORM_RATIO>0
<if test="pkCountry != null "> <if test="pkCountry != null ">
AND b.PK_COUNTRY = #{pkCountry} AND b.PK_COUNTRY = #{pkCountry}
</if> </if>
ORDER BY a.BACK_RATIO,a.PLATFORM_RATIO DESC ORDER BY a.BACK_RATIO, a.PLATFORM_RATIO DESC
</select> </select>
<!--查询个人奖金拨比--> <!--查询个人奖金拨比-->

14
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
View File

@ -115,8 +115,6 @@ public class BdWaresController extends BaseController {
waresParams.setPkCountry(SecurityUtils.getPkCountry()); waresParams.setPkCountry(SecurityUtils.getPkCountry());
List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams); List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams);
if (CollectionUtil.isNotEmpty(resultList)) { if (CollectionUtil.isNotEmpty(resultList)) {
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
resultList.parallelStream().forEach(waresVo -> { resultList.parallelStream().forEach(waresVo -> {
WaresAuthorityVo waresAuthorityVo = waresService.getWaresAuthorityFirst(waresVo.getPkWares()); WaresAuthorityVo waresAuthorityVo = waresService.getWaresAuthorityFirst(waresVo.getPkWares());
if (waresAuthorityVo != null) { if (waresAuthorityVo != null) {
@ -130,10 +128,6 @@ public class BdWaresController extends BaseController {
if (waresVo.getIsMakerGift() != null) { if (waresVo.getIsMakerGift() != null) {
waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel()); waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel());
} }
if (null != waresVo.getMakerIncome()) {
// 处理发起人收益
waresVo.setMakerIncome(waresVo.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
}
}); });
} }
return getDataTable(resultList); return getDataTable(resultList);
@ -149,7 +143,6 @@ public class BdWaresController extends BaseController {
List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams); List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams);
if (CollectionUtil.isNotEmpty(resultList)) { if (CollectionUtil.isNotEmpty(resultList)) {
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
// 获取需要翻译的枚举翻译 // 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ESpecialArea.values(), EYesNo.values(), ESupplyWay.values(), EPresaleStatus.values()); Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ESpecialArea.values(), EYesNo.values(), ESupplyWay.values(), EPresaleStatus.values());
@ -186,10 +179,6 @@ public class BdWaresController extends BaseController {
waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel()); waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel());
} }
} }
if (null != waresVo.getMakerIncome()) {
// 处理发起人收益
waresVo.setMakerIncome(waresVo.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
}
}); });
} }
ExcelUtil<WaresVo> util = new ExcelUtil<>(WaresVo.class); ExcelUtil<WaresVo> util = new ExcelUtil<>(WaresVo.class);
@ -653,7 +642,7 @@ public class BdWaresController extends BaseController {
} }
if (wares.getSpecialArea() == ESpecialArea.REPURCHASE_AREA.getValue()) { if (wares.getSpecialArea() == ESpecialArea.REPURCHASE_AREA.getValue()) {
if (wares.getWaresRangeList() == null || wares.getWaresRangeList().size() == 0) { if (wares.getWaresRangeList() == null || wares.getWaresRangeList().size() == 0) {
return AjaxResult.error("极差明细不能为空"); return AjaxResult.error("级差明细不能为空");
} }
} }
@ -677,7 +666,6 @@ public class BdWaresController extends BaseController {
} }
wares.setSort(0); wares.setSort(0);
waresService.saveWares(wares, userTokenService.getLoginUser()); waresService.saveWares(wares, userTokenService.getLoginUser());
// waresService.saveWaresModifyRecord(wares, userTokenService.getLoginUser(),EModifyRecordType.WARES_ADD.getValue());
return AjaxResult.success(wares.getWaresCode()); return AjaxResult.success(wares.getWaresCode());
} }

21
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java
View File

@ -14,9 +14,6 @@ import java.util.Set;
/** /**
* 规格sku表 Mapper 接口 * 规格sku表 Mapper 接口
*
* @author hzs
* @since 2022-09-09
*/ */
public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> { public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
@ -25,9 +22,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
* *
* @param specialArea 专区 * @param specialArea 专区
* @param waresCode 商品编号 * @param waresCode 商品编号
* @return: List<BdWaresSpecsSkuExt>
* @Author: sui q
* @Date: 2022/9/19 11:21
*/ */
List<BdWaresSpecsSkuExt> queryWaresSpecsSku(@Param("specialArea") Integer specialArea, List<BdWaresSpecsSkuExt> queryWaresSpecsSku(@Param("specialArea") Integer specialArea,
@Param("waresCode") String waresCode); @Param("waresCode") String waresCode);
@ -37,8 +31,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
* *
* @param pkSkuId sku主键 * @param pkSkuId sku主键
* @return: List<BdWaresSpecsSku> * @return: List<BdWaresSpecsSku>
* @Author: sui q
* @Date: 2023/1/13 15:25
*/ */
List<BdWaresSpecsSkuExt> queryWaresSpecsNameSku(@Param("pkSkuIdList") Set<Integer> pkSkuId); List<BdWaresSpecsSkuExt> queryWaresSpecsNameSku(@Param("pkSkuIdList") Set<Integer> pkSkuId);
@ -47,8 +39,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
* *
* @param cuWaresItemsParams 专区 * @param cuWaresItemsParams 专区
* @return: SpecsSkuParam * @return: SpecsSkuParam
* @Author: sui q
* @Date: 2022/9/19 16:26
*/ */
BdWaresSpecsSkuExt queryWaresDetailSkuBySpecs(@Param("cuWaresItemsParams") CuWaresItemsParams cuWaresItemsParams); BdWaresSpecsSkuExt queryWaresDetailSkuBySpecs(@Param("cuWaresItemsParams") CuWaresItemsParams cuWaresItemsParams);
@ -85,9 +75,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
/* /*
* @description: 查询商品封装为返回到会员端商品信息 * @description: 查询商品封装为返回到会员端商品信息
* @author: sui q
* @date: 2023/5/10 19:57
* @param: null null
**/ **/
WaresItemVo selectWaresItemsVO(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode, WaresItemVo selectWaresItemsVO(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode,
@Param("productGroup") List<ProductGroup> productGroup); @Param("productGroup") List<ProductGroup> productGroup);
@ -118,14 +105,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
*/ */
List<BdWaresSpecsSkuExt> queryWaresSpecsRangeSku(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode, @Param("pkRange") Integer pkRange); List<BdWaresSpecsSkuExt> queryWaresSpecsRangeSku(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode, @Param("pkRange") Integer pkRange);
/**
* 查询SKU价格等信息
*
* @param skuIdList skuID列表
* @return
*/
List<BdWaresSpecsSkuExt> queryWaresSpecsSkuList(@Param("skuIdList") List<Long> skuIdList);
/** /**
* 根据商品id查询规格价格最小值 排除赠品 * 根据商品id查询规格价格最小值 排除赠品
* *

24
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresDetailParams.java
View File

@ -1,51 +1,36 @@
package com.hzs.sale.wares.param; package com.hzs.sale.wares.param;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.hzs.common.core.web.domain.BaseEntity; import com.hzs.common.core.web.domain.BaseEntity;
import com.hzs.common.domain.sale.wares.BdWaresSpecs;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List; @EqualsAndHashCode(callSuper = true)
/**
* @Description:
* @Author: yuhui
* @Time: 2022/9/19 13:57
* @Classname: WaresDetailParams
* @PackageName: com.hzs.sale.wares.controller.manage.params
*/
@Data @Data
public class WaresDetailParams extends BaseEntity { public class WaresDetailParams extends BaseEntity {
/** /**
* 主键 * 主键
*/ */
private Integer pkId; private Integer pkId;
/** /**
* 主表主键 * 主表主键
*/ */
private Integer pkWares; private Integer pkWares;
/** /**
* 产品主键 * 产品主键
*/ */
private Integer pkProduct; private Integer pkProduct;
/** /**
* 数量 文档为number 但是number为关键字 * 数量 文档为number 但是number为关键字
*/ */
private Integer quantity; private Integer quantity;
/** /**
* 是否赠品（销售状态 ） * 是否赠品（销售状态 ）
*/ */
private Integer isGift; private Integer isGift;
/** /**
@ -60,11 +45,6 @@ public class WaresDetailParams extends BaseEntity {
/** /**
* 封面主图 * 封面主图
*/ */
private String cover; private String cover;
} }

7
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java
View File

@ -9,13 +9,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* @Description:
* @Author: yuhui
* @Time: 2022/9/9 14:14
* @Classname: WaresParams
* @PackageName: com.hzs.sale.wares.controller.manage.params
*/
@Data @Data
public class WaresParams implements Serializable { public class WaresParams implements Serializable {
/** /**

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresSpecsSkuParams.java
View File

@ -19,7 +19,6 @@ public class WaresSpecsSkuParams {
private Integer pkProduct; private Integer pkProduct;
/** /**
* 产品价格 * 产品价格
*/ */
@ -46,7 +45,6 @@ public class WaresSpecsSkuParams {
private BigDecimal assAchieve; private BigDecimal assAchieve;
/** /**
* /**
* 规格明细表 * 规格明细表
*/ */
private List<BdWaresSpecs> waresSpecsList; private List<BdWaresSpecs> waresSpecsList;

3
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java
View File

@ -1,12 +1,9 @@
package com.hzs.sale.wares.service; package com.hzs.sale.wares.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.sale.ext.BdWaresDetailExt; import com.hzs.common.domain.sale.ext.BdWaresDetailExt;
import com.hzs.common.domain.sale.wares.BdWaresDetail; import com.hzs.common.domain.sale.wares.BdWaresDetail;
import com.hzs.common.domain.scm.ic.IcAvailableNum;
import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.order.param.OrderItemsParam;
import com.hzs.sale.product.vo.WaresDetailVo;
import com.hzs.sale.wares.param.CuProductParams; import com.hzs.sale.wares.param.CuProductParams;
import com.hzs.sale.wares.vo.WaresProductDetailVo; import com.hzs.sale.wares.vo.WaresProductDetailVo;

41
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java
View File

@ -16,9 +16,6 @@ import java.util.Set;
/** /**
* 规格sku表 服务类 * 规格sku表 服务类
*
* @author hzs
* @since 2022-09-09
*/ */
public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> { public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
@ -29,27 +26,16 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
* @param waresCode 商品编号 * @param waresCode 商品编号
* @param loginMemberId 登录用户主键 * @param loginMemberId 登录用户主键
* @param pkCountry 前端传递结算国（） * @param pkCountry 前端传递结算国（）
* @return: List<BdWaresSpecsSkuExt>
* @Author: sui q
* @Date: 2022/9/19 11:21
*/ */
CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry); CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry);
/** /**
* @description: 购物车查询数量专用 * 购物车查询数量专用
* @author: zhang jing
* @date: 2024/3/28 10:41
* @param: [specialArea, waresCode, loginMemberId, pkCountry]
* @return: com.hzs.sale.wares.param.CuWaresParams
**/ **/
CuWaresParams queryWaresSpecsSkuCount(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry); CuWaresParams queryWaresSpecsSkuCount(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry);
/** /**
* @description: 查询商品sku信息购物车专用 * 查询商品sku信息购物车专用
* @author: zhang jing
* @date: 2024/3/28 14:35
* @param: [specialArea, waresCode, loginMemberId, pkCountry]
* @return: com.hzs.sale.wares.param.CuWaresParams
**/ **/
CuWaresParams queryWaresSpecsSkuShopping(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry); CuWaresParams queryWaresSpecsSkuShopping(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry);
@ -59,8 +45,6 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
* *
* @param cuWaresItemsParams 明细参数，产品明细， * @param cuWaresItemsParams 明细参数，产品明细，
* @return: SpecsSkuParam * @return: SpecsSkuParam
* @Author: sui q
* @Date: 2022/9/19 16:26
*/ */
SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams); SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams);
@ -97,9 +81,6 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
/* /*
* @description: 查询商品封装为返回到会员端商品信息 * @description: 查询商品封装为返回到会员端商品信息
* @author: sui q
* @date: 2023/5/10 19:57
* @param: null null
**/ **/
WaresItemVo selectWaresItemsVO(Long pkMember, Integer pkCountry, Integer specialArea, String waresCode, List<ProductGroup> productGroup, Integer quantity); WaresItemVo selectWaresItemsVO(Long pkMember, Integer pkCountry, Integer specialArea, String waresCode, List<ProductGroup> productGroup, Integer quantity);
@ -127,22 +108,4 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
*/ */
BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku); BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku);
/**
* 查询SKU价格等信息
*
* @param skuIdList skuID列表
* @return
*/
Map<Long, BdWaresSpecsSkuExt> queryWaresSpecsSkuList(List<Long> skuIdList);
/**
* 根据sku主键查询规格名称
*
* @param pkSkuId sku主键
* @return: List<BdWaresSpecsSku>
* @Author: sui q
* @Date: 2023/1/13 15:25
*/
List<BdWaresSpecsSkuExt> queryWaresSpecsNameSku(Set<Integer> pkSkuId);
} }

25
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java
View File

@ -25,13 +25,6 @@ import java.util.Map;
@Service @Service
public class BdWaresDetailServiceImpl extends ServiceImpl<BdWaresDetailMapper, BdWaresDetail> implements IBdWaresDetailService { public class BdWaresDetailServiceImpl extends ServiceImpl<BdWaresDetailMapper, BdWaresDetail> implements IBdWaresDetailService {
/**
* 根据条件查询商品信息
*
* @param specialArea 专区
* @param transType 运输方式
* @return: List<BdWaresExt>
*/
@Override @Override
public List<BdWaresDetailExt> queryWaresDetailByCondition(Integer specialArea, Integer transType, List<OrderItemsParam> orderItemsParams) { public List<BdWaresDetailExt> queryWaresDetailByCondition(Integer specialArea, Integer transType, List<OrderItemsParam> orderItemsParams) {
List<BdWaresDetailExt> bdWaresDetailExtList = new ArrayList<>(); List<BdWaresDetailExt> bdWaresDetailExtList = new ArrayList<>();
@ -66,34 +59,16 @@ public class BdWaresDetailServiceImpl extends ServiceImpl<BdWaresDetailMapper, B
return bdWaresDetailExtList; return bdWaresDetailExtList;
} }
/**
* 查询商品编号
*
* @param waresCode
* @return
*/
@Override @Override
public List<CuProductParams> selectByWaresCode(String waresCode, Integer specialArea, Integer isGift) { public List<CuProductParams> selectByWaresCode(String waresCode, Integer specialArea, Integer isGift) {
return baseMapper.selectByWaresCode(waresCode, specialArea, isGift); return baseMapper.selectByWaresCode(waresCode, specialArea, isGift);
} }
/**
* 根据商品主键查询
*
* @param pkWares
* @return
*/
@Override @Override
public List<BdWaresDetailExt> selectByPkWares(Integer pkWares) { public List<BdWaresDetailExt> selectByPkWares(Integer pkWares) {
return baseMapper.selectByPkWares(pkWares); return baseMapper.selectByPkWares(pkWares);
} }
/**
* 商品下产品查询
*
* @param pkWares
* @return
*/
@Override @Override
public List<WaresProductDetailVo> selectByList(Integer pkWares) { public List<WaresProductDetailVo> selectByList(Integer pkWares) {
return baseMapper.selectByList(pkWares); return baseMapper.selectByList(pkWares);

105
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
View File

@ -46,50 +46,43 @@ import java.util.stream.Collectors;
/** /**
* 规格sku表 服务实现类 * 规格sku表 服务实现类
*
* @author hzs
* @since 2022-09-09
*/ */
@Service @Service
public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMapper, BdWaresSpecsSku> implements IBdWaresSpecsSkuService { public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMapper, BdWaresSpecsSku> implements IBdWaresSpecsSkuService {
@Autowired @Autowired
private IBdWaresSpecsRelationService waresSpecsRelationService; private IBdWaresSpecsRelationService iBdWaresSpecsRelationService;
@Autowired @Autowired
private IBdWaresLabelService waresLabelService; private IBdWaresLabelService iBdWaresLabelService;
@Autowired @Autowired
private IBdWaresDetailService waresDetailService; private IBdWaresDetailService iBdWaresDetailService;
@Autowired @Autowired
private IBdWaresRangeService bdWaresRangeService; private IBdWaresRangeService iBdWaresRangeService;
@Autowired @Autowired
private ISaOrderService saOrderService; private ISaOrderService iSaOrderService;
@DubboReference @DubboReference
ICurrencyServiceApi currencyServiceApi; ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference @DubboReference
IRangeServiceApi rangeServiceApi; IRangeServiceApi iRangeServiceApi;
@DubboReference @DubboReference
IMemberServiceApi memberServiceApi; IMemberServiceApi iMemberServiceApi;
@DubboReference @DubboReference
IAwardsServiceApi awardsServiceApi; IAwardsServiceApi iAwardsServiceApi;
@DubboReference @DubboReference
IGradeServiceApi gradeServiceApi; IGradeServiceApi iGradeServiceApi;
@Override @Override
public CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) { public CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) {
List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList; List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList;
R<CuMember> memberDate = memberServiceApi.getMember(loginMemberId); R<CuMember> memberDate = iMemberServiceApi.getMember(loginMemberId);
CuMember cuMember = memberDate.getData(); CuMember cuMember = memberDate.getData();
if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea
|| EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
int level = cuMember.getPkSettleGrade(); int level = cuMember.getPkSettleGrade();
int rangeType = ERangeType.GRADE.getValue(); int rangeType = ERangeType.GRADE.getValue();
// BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
// if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
// level = cuMember.getPkAwards();
// rangeType = ERangeType.AWARDS.getValue();
// }
RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
if (rangeDTO == null) { if (rangeDTO == null) {
return new CuWaresParams(); return new CuWaresParams();
} }
@ -98,8 +91,9 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
} else { } else {
bdWaresSpecsSkuExtList = baseMapper.queryWaresSpecsSku(specialArea, waresCode); bdWaresSpecsSkuExtList = baseMapper.queryWaresSpecsSku(specialArea, waresCode);
} }
if (bdWaresSpecsSkuExtList.size() > 0) { if (bdWaresSpecsSkuExtList.size() > 0) {
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
Set<Integer> pkSkuIdList = new HashSet<>(); Set<Integer> pkSkuIdList = new HashSet<>();
bdWaresSpecsSkuExtList.forEach(bdWaresSpecsSkuExt -> bdWaresSpecsSkuExtList.forEach(bdWaresSpecsSkuExt ->
@ -120,7 +114,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
//查询标签合集 //查询标签合集
BdWaresLabel waresLabel = new BdWaresLabel(); BdWaresLabel waresLabel = new BdWaresLabel();
waresLabel.setPkWares(bdWaresSpecsSkuExtList.get(0).getPkWares()); waresLabel.setPkWares(bdWaresSpecsSkuExtList.get(0).getPkWares());
List<BdLabelExt> labelList = waresLabelService.selectByList(waresLabel); List<BdLabelExt> labelList = iBdWaresLabelService.selectByList(waresLabel);
// 保证标签 // 保证标签
List<BdLabel> ensureLabelList = new ArrayList<>(); List<BdLabel> ensureLabelList = new ArrayList<>();
// 卖点标签 // 卖点标签
@ -149,12 +143,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
List<CuWaresItemsParams> cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); List<CuWaresItemsParams> cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate());
// 前台传递结算国 跨国报单计算价格使用 // 前台传递结算国 跨国报单计算价格使用
R<CurrencyDTO> kgCurrency = null; R<CurrencyDTO> kgCurrency = null;
if (pkCountry != null) { if (pkCountry != null) {
kgCurrency = currencyServiceApi.getCurrency(pkCountry); kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry);
} }
List<CuProductParams> productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); List<CuProductParams> productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null);
List<CuProductParams> productParamsResultList = new ArrayList<>(); List<CuProductParams> productParamsResultList = new ArrayList<>();
for (CuProductParams cuProductParams : productParams) { for (CuProductParams cuProductParams : productParams) {
List<CuWaresItemsParams> list = new ArrayList<>(); List<CuWaresItemsParams> list = new ArrayList<>();
@ -189,7 +182,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
// 乐学复购，价格根据等级固定 // 乐学复购，价格根据等级固定
// 等级 // 等级
R<List<GradeDTO>> gradeDTO = gradeServiceApi.queryGradeList(pkCountry); R<List<GradeDTO>> gradeDTO = iGradeServiceApi.queryGradeList(pkCountry);
List<GradeDTO> gradeList = gradeDTO.getData(); List<GradeDTO> gradeList = gradeDTO.getData();
Map<Integer, GradeDTO> gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity())); Map<Integer, GradeDTO> gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity()));
@ -233,12 +226,12 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea
|| EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
R<CuMember> memberDate = memberServiceApi.getMember(loginMemberId); R<CuMember> memberDate = iMemberServiceApi.getMember(loginMemberId);
CuMember cuMember = memberDate.getData(); CuMember cuMember = memberDate.getData();
int level = cuMember.getPkSettleGrade(); int level = cuMember.getPkSettleGrade();
int rangeType = ERangeType.GRADE.getValue(); int rangeType = ERangeType.GRADE.getValue();
RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
if (rangeDTO == null) { if (rangeDTO == null) {
return new CuWaresParams(); return new CuWaresParams();
} }
@ -251,10 +244,10 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
Map<Integer, String> specsNameMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdWaresSpecsSkuExtList.size())); Map<Integer, String> specsNameMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdWaresSpecsSkuExtList.size()));
CuWaresParams cuWaresParams = BeanUtil.copyProperties(bdWaresSpecsSkuExtList.get(0), CuWaresParams.class); CuWaresParams cuWaresParams = BeanUtil.copyProperties(bdWaresSpecsSkuExtList.get(0), CuWaresParams.class);
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
List<CuWaresItemsParams> cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); List<CuWaresItemsParams> cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate());
// 前台传递结算国 跨国报单计算价格使用 // 前台传递结算国 跨国报单计算价格使用
List<CuProductParams> productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); List<CuProductParams> productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null);
List<CuProductParams> productParamsResultList = new ArrayList<>(); List<CuProductParams> productParamsResultList = new ArrayList<>();
for (CuProductParams cuProductParams : productParams) { for (CuProductParams cuProductParams : productParams) {
List<CuWaresItemsParams> list = new ArrayList<>(); List<CuWaresItemsParams> list = new ArrayList<>();
@ -291,22 +284,22 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
**/ **/
@Override @Override
public CuWaresParams queryWaresSpecsSkuShopping(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) { public CuWaresParams queryWaresSpecsSkuShopping(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) {
CuMember cuMember = memberServiceApi.getMember(loginMemberId).getData(); CuMember cuMember = iMemberServiceApi.getMember(loginMemberId).getData();
// 获取货币信息 // 获取货币信息
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList; List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList;
if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
int level = cuMember.getPkSettleGrade(); int level = cuMember.getPkSettleGrade();
int rangeType = ERangeType.GRADE.getValue(); int rangeType = ERangeType.GRADE.getValue();
// BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); // BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
// if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) { // if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
// level = cuMember.getPkAwards(); // level = cuMember.getPkAwards();
// rangeType = ERangeType.AWARDS.getValue(); // rangeType = ERangeType.AWARDS.getValue();
// } // }
RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
if (rangeDTO == null) { if (rangeDTO == null) {
return new CuWaresParams(); return new CuWaresParams();
} }
@ -337,7 +330,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
// 处理跨国报单价格 // 处理跨国报单价格
R<CurrencyDTO> kgCurrency; R<CurrencyDTO> kgCurrency;
if (pkCountry != null && !pkCountry.equals(SecurityUtils.getPkCountry())) { if (pkCountry != null && !pkCountry.equals(SecurityUtils.getPkCountry())) {
kgCurrency = currencyServiceApi.getCurrency(pkCountry); kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry);
BigDecimal inExchangeRate = cuWaresParams.getInExchangeRate(); BigDecimal inExchangeRate = cuWaresParams.getInExchangeRate();
BigDecimal kgInExchangeRate = kgCurrency.getData().getInExchangeRate(); BigDecimal kgInExchangeRate = kgCurrency.getData().getInExchangeRate();
cuWaresItemsParamsList.forEach(item -> { cuWaresItemsParamsList.forEach(item -> {
@ -347,7 +340,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
} }
// 获取商品详情 // 获取商品详情
List<CuProductParams> productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); List<CuProductParams> productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null);
List<CuProductParams> productParamsResultList = productParams.stream() List<CuProductParams> productParamsResultList = productParams.stream()
.peek(param -> { .peek(param -> {
List<CuWaresItemsParams> list = cuWaresItemsParamsList.stream() List<CuWaresItemsParams> list = cuWaresItemsParamsList.stream()
@ -361,7 +354,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
// 处理特殊情况下的价格修改 // 处理特殊情况下的价格修改
if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
// 获取等级信息 // 获取等级信息
Map<Integer, GradeDTO> gradeMap = gradeServiceApi.queryGradeList(pkCountry).getData().stream() Map<Integer, GradeDTO> gradeMap = iGradeServiceApi.queryGradeList(pkCountry).getData().stream()
.collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity())); .collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity()));
BigDecimal price; BigDecimal price;
if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) { if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) {
@ -391,11 +384,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
/** /**
* 设置返回到前台的商品明细表 * 设置返回到前台的商品明细表
*
* @param bdWaresSpecsSkuExtList 商品待sku
* @return: List<CuWaresItemsParams>
* @Author: sui q
* @Date: 2022/9/27 10:51
*/ */
private List<CuWaresItemsParams> setUpWaresItemsParams(List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList, Map<Integer, String> specsNameMap, BigDecimal inExchangeRate) { private List<CuWaresItemsParams> setUpWaresItemsParams(List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList, Map<Integer, String> specsNameMap, BigDecimal inExchangeRate) {
List<CuWaresItemsParams> cuWaresItemsParamsList = new ArrayList<>(); List<CuWaresItemsParams> cuWaresItemsParamsList = new ArrayList<>();
@ -524,22 +512,22 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
waresItemVo.getWaresItemsParamList().forEach(waresItemWaresInfo -> { waresItemVo.getWaresItemsParamList().forEach(waresItemWaresInfo -> {
waresDetailExtMap.put(waresItemWaresInfo.getPkWaresDetail().toString() + waresItemWaresInfo.getPkWaresSpecsSku(), waresItemWaresInfo); waresDetailExtMap.put(waresItemWaresInfo.getPkWaresDetail().toString() + waresItemWaresInfo.getPkWaresSpecsSku(), waresItemWaresInfo);
// 设置规格值 名称拼接 // 设置规格值 名称拼接
List<BdWaresSpecsRelationExt> waresSpecsRelationExts = waresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku()); List<BdWaresSpecsRelationExt> waresSpecsRelationExts = iBdWaresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku());
Set<String> specsNames = waresSpecsRelationExts.stream().map(BdWaresSpecsRelationExt::getSpecsName).collect(Collectors.toSet()); Set<String> specsNames = waresSpecsRelationExts.stream().map(BdWaresSpecsRelationExt::getSpecsName).collect(Collectors.toSet());
waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ",")); waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ","));
}); });
if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
CuMember cuMember = saOrderService.getCuMemberByKey(pkMember); CuMember cuMember = iSaOrderService.getCuMemberByKey(pkMember);
int level = cuMember.getPkSettleGrade(); int level = cuMember.getPkSettleGrade();
int rangeType = ERangeType.GRADE.getValue(); int rangeType = ERangeType.GRADE.getValue();
// BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); // BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
// if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) { // if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
// level = cuMember.getPkAwards(); // level = cuMember.getPkAwards();
// rangeType = ERangeType.AWARDS.getValue(); // rangeType = ERangeType.AWARDS.getValue();
// } // }
List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList()); List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList());
List<BdWaresRange> bdWaresRangeList = bdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku); List<BdWaresRange> bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku);
bdWaresRangeList.forEach(bdWaresRange -> { bdWaresRangeList.forEach(bdWaresRange -> {
String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku(); String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku();
if (waresDetailExtMap.containsKey(key)) { if (waresDetailExtMap.containsKey(key)) {
@ -559,12 +547,12 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
// 复购乐学专区 无奖衔 或者 是 vip 或者是 svip 价格改为2680 // 复购乐学专区 无奖衔 或者 是 vip 或者是 svip 价格改为2680
if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
// 等级 // 等级
R<List<GradeDTO>> gradeDTO = gradeServiceApi.queryGradeList(pkCountry); R<List<GradeDTO>> gradeDTO = iGradeServiceApi.queryGradeList(pkCountry);
List<GradeDTO> gradeList = gradeDTO.getData(); List<GradeDTO> gradeList = gradeDTO.getData();
Map<Integer, GradeDTO> gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity())); Map<Integer, GradeDTO> gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity()));
// 查询会员信息 // 查询会员信息
R<CuMember> memberDate = memberServiceApi.getMember(pkMember); R<CuMember> memberDate = iMemberServiceApi.getMember(pkMember);
CuMember cuMemberDate = memberDate.getData(); CuMember cuMemberDate = memberDate.getData();
// 价格 // 价格
@ -582,11 +570,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
} }
// 前台传递结算国 跨国报单计算价格使用 // 前台传递结算国 跨国报单计算价格使用
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
if (pkCountry != null) { if (pkCountry != null) {
// 当登陆人的结算国和前端结算国不一致 即为跨国报单 // 当登陆人的结算国和前端结算国不一致 即为跨国报单
if (!pkCountry.equals(SecurityUtils.getPkCountry())) { if (!pkCountry.equals(SecurityUtils.getPkCountry())) {
R<CurrencyDTO> kgCurrency = currencyServiceApi.getCurrency(pkCountry); R<CurrencyDTO> kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry);
BigDecimal price = waresItemVo.getPrice(); BigDecimal price = waresItemVo.getPrice();
waresItemVo.setPrice(price.multiply(currency.getData().getInExchangeRate()).divide(kgCurrency.getData().getInExchangeRate(), 2, BigDecimal.ROUND_HALF_UP)); waresItemVo.setPrice(price.multiply(currency.getData().getInExchangeRate()).divide(kgCurrency.getData().getInExchangeRate(), 2, BigDecimal.ROUND_HALF_UP));
@ -638,19 +626,4 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
return baseMapper.selectByPkWaresSpecsSku(pkWaresSpecsSku); return baseMapper.selectByPkWaresSpecsSku(pkWaresSpecsSku);
} }
@Override
public Map<Long, BdWaresSpecsSkuExt> queryWaresSpecsSkuList(List<Long> skuIdList) {
Map<Long, BdWaresSpecsSkuExt> resultMap = new HashMap<>();
List<BdWaresSpecsSkuExt> list = baseMapper.queryWaresSpecsSkuList(skuIdList);
for (BdWaresSpecsSkuExt waresSpecsSku : list) {
resultMap.put(waresSpecsSku.getPkId().longValue(), waresSpecsSku);
}
return resultMap;
}
@Override
public List<BdWaresSpecsSkuExt> queryWaresSpecsNameSku(Set<Integer> pkSkuId) {
return baseMapper.queryWaresSpecsNameSku(pkSkuId);
}
} }

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java
View File

@ -83,19 +83,19 @@ public class WaresVo {
* 商品权限类型 * 商品权限类型
*/ */
private Integer authorityType; private Integer authorityType;
@Excel(name = "可见类型") // @Excel(name = "可见类型")
private String authorityTypeVal; private String authorityTypeVal;
/** /**
* 团队编号 * 团队编号
*/ */
@Excel(name = "团队编号") // @Excel(name = "团队编号")
private String memberCode; private String memberCode;
/** /**
* 团队姓名 * 团队姓名
*/ */
@Excel(name = "团队姓名") // @Excel(name = "团队姓名")
private String memberName; private String memberName;

9
bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml
View File

@ -108,8 +108,13 @@
<select id="selectByWaresCode" resultType="com.hzs.sale.wares.param.CuProductParams"> <select id="selectByWaresCode" resultType="com.hzs.sale.wares.param.CuProductParams">
select select
p.cover,p.PK_ID productId ,p.PRODUCT_CODE productCode ,p.PRODUCT_NAME productName,wd.QUANTITY quantity, p.cover,
be.is_maker_gift isMakerGift,wd.IS_GIFT isGift p.PK_ID productId ,
p.PRODUCT_CODE productCode ,
p.PRODUCT_NAME productName,
be.is_maker_gift isMakerGift,
wd.QUANTITY quantity,
wd.IS_GIFT isGift
from BD_WARES_DETAIL wd from BD_WARES_DETAIL wd
left join BD_PRODUCT p on p.PK_ID = wd.PK_PRODUCT left join BD_PRODUCT p on p.PK_ID = wd.PK_PRODUCT
inner join BD_WARES w on w.PK_ID = wd.PK_WARES inner join BD_WARES w on w.PK_ID = wd.PK_WARES

45
bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml
View File

@ -95,19 +95,6 @@
bw.VIDEO_URL, bw.VIDEO_URL,
bw.AFTER_GUARANTEE, bw.AFTER_GUARANTEE,
bk.ASS_ACHIEVE bk.ASS_ACHIEVE
<!-- 2024.05.24 查询会有问题，先注释掉，后续有问题再放开处理
(
select listagg(bp.PRODUCT_NAME, ',') within
group (order by bp.pk_id)
from BD_WARES_DETAIL wd
left join BD_PRODUCT bp
on bp.PK_ID = wd.PK_PRODUCT
where wd.PK_WARES = bw.PK_ID
and wd.DEL_FLAG = '0'
and wd.IS_GIFT = '0'
and bp.DEL_FLAG=0
) giftNames
-->
, be.ARRIVAL_TIME , be.ARRIVAL_TIME
, be.CREATION_TIME , be.CREATION_TIME
, be.PRE_SALE_STATUS , be.PRE_SALE_STATUS
@ -305,19 +292,6 @@
bw.VIDEO_URL, bw.VIDEO_URL,
bw.AFTER_GUARANTEE, bw.AFTER_GUARANTEE,
bk.ASS_ACHIEVE bk.ASS_ACHIEVE
<!-- 2024.05.24 查询会有问题，先注释掉，后续有问题再放开处理
(
select listagg(bp.PRODUCT_NAME, ',') within
group (order by bp.pk_id)
from BD_WARES_DETAIL wd
left join BD_PRODUCT bp
on bp.PK_ID = wd.PK_PRODUCT
where wd.PK_WARES = bw.PK_ID
and wd.DEL_FLAG = '0'
and wd.IS_GIFT = '0'
and bp.DEL_FLAG=0
) giftNames
-->
, be.ARRIVAL_TIME , be.ARRIVAL_TIME
, be.CREATION_TIME , be.CREATION_TIME
, be.PRE_SALE_STATUS , be.PRE_SALE_STATUS
@ -369,23 +343,4 @@
</foreach> </foreach>
</select> </select>
<!-- 查询SKU价格等信息 -->
<select id="queryWaresSpecsSkuList" resultType="com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt">
select bwss.pk_id,
bwd.pk_product,
bwss.pk_wares_detail,
bwss.price,
bwss.achieve,
bwss.ass_achieve
from bd_wares_specs_sku bwss
left join BD_WARES_DETAIL bwd
on bwd.del_flag = 0
and bwd.pk_id = bwss.pk_wares_detail
where bwss.del_flag = 0
and bwss.pk_id in
<foreach collection="skuIdList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
</mapper> </mapper>

64
bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java
View File

@ -3,7 +3,6 @@ package com.hzs.system.base.provider;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.domain.system.base.BdCubasdoc;
import com.hzs.common.domain.system.base.BdCurrency; import com.hzs.common.domain.system.base.BdCurrency;
import com.hzs.common.domain.system.base.BdStorehouse; import com.hzs.common.domain.system.base.BdStorehouse;
import com.hzs.common.domain.system.base.ext.BdCubasdocExt; import com.hzs.common.domain.system.base.ext.BdCubasdocExt;
@ -24,8 +23,6 @@ import java.util.stream.Collectors;
/** /**
* @Description: * @Description:
* @Author: sui q
* @Time: 2022/9/8 15:13
* @Classname: ICurrencyServiceProvider * @Classname: ICurrencyServiceProvider
* @PackageName: com.hzs.system.base.provider * @PackageName: com.hzs.system.base.provider
*/ */
@ -33,23 +30,19 @@ import java.util.stream.Collectors;
public class CurrencyServiceProvider implements ICurrencyServiceApi { public class CurrencyServiceProvider implements ICurrencyServiceApi {
@Autowired @Autowired
private IBdCurrencyService currencyService; private IBdCurrencyService iBdCurrencyService;
@Autowired @Autowired
private IBdStorehouseAreaMiddleService storehouseAreaMiddleService; private IBdStorehouseAreaMiddleService iBdStorehouseAreaMiddleService;
@Autowired @Autowired
private IBdCubasdocService bdCubasdocService; private IBdCubasdocService iBdCubasdocService;
@Autowired @Autowired
private ISysCorpService sysCorpService; private ISysCorpService iSysCorpService;
@Autowired @Autowired
private IBdStorehouseService storehouseService; private IBdStorehouseService iBdStorehouseService;
@Override @Override
public R<CurrencyDTO> getCurrency(Integer pkCountry) { public R<CurrencyDTO> getCurrency(Integer pkCountry) {
BdCurrency bdCurrency = currencyService.getCurrency(pkCountry); BdCurrency bdCurrency = iBdCurrencyService.getCurrency(pkCountry);
return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class)); return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
} }
@ -57,7 +50,7 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
public R<List<CurrencyDTO>> getCurrencyByPkCountryList(Set<Integer> pkCountryList) { public R<List<CurrencyDTO>> getCurrencyByPkCountryList(Set<Integer> pkCountryList) {
List<CurrencyDTO> currencyDTOList = new ArrayList<>(); List<CurrencyDTO> currencyDTOList = new ArrayList<>();
for (Integer pkCountry : pkCountryList) { for (Integer pkCountry : pkCountryList) {
BdCurrency bdCurrency = currencyService.getCurrency(pkCountry); BdCurrency bdCurrency = iBdCurrencyService.getCurrency(pkCountry);
currencyDTOList.add(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class)); currencyDTOList.add(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
} }
return R.ok(currencyDTOList); return R.ok(currencyDTOList);
@ -67,51 +60,40 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
public R<List<CurrencyDTO>> getCurrencyById(Set<Integer> currencyIdSet) { public R<List<CurrencyDTO>> getCurrencyById(Set<Integer> currencyIdSet) {
List<CurrencyDTO> currencyDTOList = new ArrayList<>(); List<CurrencyDTO> currencyDTOList = new ArrayList<>();
for (Integer currencyId : currencyIdSet) { for (Integer currencyId : currencyIdSet) {
BdCurrency bdCurrency = currencyService.getByPkId(currencyId); BdCurrency bdCurrency = iBdCurrencyService.getByPkId(currencyId);
currencyDTOList.add(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class)); currencyDTOList.add(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
} }
return R.ok(currencyDTOList); return R.ok(currencyDTOList);
} }
/**
* 根据id查询汇率
*
* @param currencyId
* @return
*/
@Override @Override
public R<CurrencyDTO> getCurrencyByPkId(Integer currencyId) { public R<CurrencyDTO> getCurrencyByPkId(Integer currencyId) {
BdCurrency bdCurrency = currencyService.getByPkId(currencyId); BdCurrency bdCurrency = iBdCurrencyService.getByPkId(currencyId);
return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class)); return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
} }
@Override @Override
public R<BdStorehouse> queryBdStorehouseByProvince(Integer province, Integer... type) { public R<BdStorehouse> queryBdStorehouseByProvince(Integer province, Integer... type) {
int storeType = 1; int storeType = 1;
if(type != null && type.length>0){ if (type != null && type.length > 0) {
storeType = type[0]; storeType = type[0];
} }
return R.ok(storehouseAreaMiddleService.queryBdStorehouseByProvince(province, storeType)); return R.ok(iBdStorehouseAreaMiddleService.queryBdStorehouseByProvince(province, storeType));
} }
@Override @Override
public R<BdStorehouse> queryBdStorehouseById(Integer pkId) { public R<BdStorehouse> queryBdStorehouseById(Integer pkId) {
return R.ok(storehouseService.getById(pkId)); return R.ok(iBdStorehouseService.getById(pkId));
} }
@Override @Override
public R<List<BdStorehouse>> queryBdStorehouseMapByProvince(Collection<Integer> provinceList) { public R<List<BdStorehouse>> queryBdStorehouseMapByProvince(Collection<Integer> provinceList) {
return R.ok(storehouseAreaMiddleService.queryStorehouseListByProvince(provinceList)); return R.ok(iBdStorehouseAreaMiddleService.queryStorehouseListByProvince(provinceList));
} }
/**
* 根据id 查询所属历史币种
*
* @return
*/
@Override @Override
public R<CurrencyDTO> getByHistoryPkId(Integer currencyId) { public R<CurrencyDTO> getByHistoryPkId(Integer currencyId) {
BdCurrency bdCurrency = currencyService.getByHistoryPkid(currencyId); BdCurrency bdCurrency = iBdCurrencyService.getByHistoryPkid(currencyId);
return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class)); return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
} }
@ -120,10 +102,8 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
*/ */
@Override @Override
public R<List<CurrencyDTO>> findAll() { public R<List<CurrencyDTO>> findAll() {
List<BdCurrency> currencyList = currencyService.list(); List<BdCurrency> currencyList = iBdCurrencyService.list();
List<CurrencyDTO> currencyDtoList = currencyList.stream().map(currency -> { List<CurrencyDTO> currencyDtoList = currencyList.stream().map(currency -> BeanUtil.copyProperties(currency, CurrencyDTO.class)).collect(Collectors.toList());
return BeanUtil.copyProperties(currency, CurrencyDTO.class);
}).collect(Collectors.toList());
return R.ok(currencyDtoList); return R.ok(currencyDtoList);
} }
@ -133,8 +113,8 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
.pkCountry(pkCountry) .pkCountry(pkCountry)
.pkId(pkId) .pkId(pkId)
.build(); .build();
List<BdCubasdocExt> bdCubasdocList = bdCubasdocService.querySupplierByCondition(cubasdocParam); List<BdCubasdocExt> bdCubasdocList = iBdCubasdocService.querySupplierByCondition(cubasdocParam);
if(CollectionUtil.isNotEmpty(bdCubasdocList)){ if (CollectionUtil.isNotEmpty(bdCubasdocList)) {
return R.ok(bdCubasdocList.get(0)); return R.ok(bdCubasdocList.get(0));
} }
return R.ok(null); return R.ok(null);
@ -146,8 +126,8 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
.pkCountry(pkCountry) .pkCountry(pkCountry)
.pkId(pkId) .pkId(pkId)
.build(); .build();
List<BdCubasdocExt> bdCubasdocList = bdCubasdocService.queryCustomerByCondition(customerParam); List<BdCubasdocExt> bdCubasdocList = iBdCubasdocService.queryCustomerByCondition(customerParam);
if(CollectionUtil.isNotEmpty(bdCubasdocList)){ if (CollectionUtil.isNotEmpty(bdCubasdocList)) {
return R.ok(bdCubasdocList.get(0)); return R.ok(bdCubasdocList.get(0));
} }
return R.ok(null); return R.ok(null);
@ -155,11 +135,11 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
@Override @Override
public R<SysCorp> querySysCorp(Integer pkId, Integer pkCountry) { public R<SysCorp> querySysCorp(Integer pkId, Integer pkCountry) {
return R.ok(sysCorpService.getSysCorp(pkId, pkCountry)); return R.ok(iSysCorpService.getSysCorp(pkId, pkCountry));
} }
@Override @Override
public R<List<BdStorehouse>> queryStorehouseByIds(Set<Integer> storehouseIdSet, Integer pkCountry, Integer pkCorp) { public R<List<BdStorehouse>> queryStorehouseByIds(Set<Integer> storehouseIdSet, Integer pkCountry, Integer pkCorp) {
return R.ok(storehouseService.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp)); return R.ok(iBdStorehouseService.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp));
} }
} }

23
bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/SystemConfigServiceProvider.java
View File

@ -21,26 +21,16 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* @Description:
* @Author: sui q
* @Time: 2022/11/10 11:29
* @Classname: SystemConfigServiceProvider
* @PackageName: com.hzs.system.base.provider
*/
@DubboService @DubboService
public class SystemConfigServiceProvider implements ISystemConfigServiceApi { public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
@Autowired @Autowired
private IBdSystemConfigService systemConfigService; private IBdSystemConfigService systemConfigService;
@Autowired @Autowired
private IBdCountryService bdCountryService; private IBdCountryService bdCountryService;
@Autowired @Autowired
private IBdCubasdocService bdCubasdocService; private IBdCubasdocService bdCubasdocService;
@Override @Override
public R<String> getBonusSystemConfig(Integer pkCountry, String key) { public R<String> getBonusSystemConfig(Integer pkCountry, String key) {
return R.ok(systemConfigService.getSystemConfig(pkCountry, key)); return R.ok(systemConfigService.getSystemConfig(pkCountry, key));
@ -83,10 +73,6 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
/** /**
* 批量查询所有国家的订单时间参数 * 批量查询所有国家的订单时间参数
*
* @return: R<Map < String, String>>
* @Author: yh
* @Date: 2022/11/10 14:04
*/ */
@Override @Override
public R<Map<String, String>> getSystemConfig() { public R<Map<String, String>> getSystemConfig() {
@ -101,7 +87,6 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
}); });
} }
} }
return R.ok(systemConfigMap); return R.ok(systemConfigMap);
} }
@ -109,17 +94,11 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
public R<BdCubasdocDTO> queryBdCubasdocByUser(Long pkUser) { public R<BdCubasdocDTO> queryBdCubasdocByUser(Long pkUser) {
BdCubasdocParam bdCubasdocParam = BdCubasdocParam.builder().pkUser(pkUser).build(); BdCubasdocParam bdCubasdocParam = BdCubasdocParam.builder().pkUser(pkUser).build();
List<BdCubasdocExt> cuBasDocList = bdCubasdocService.queryCubasdocByCondition(bdCubasdocParam); List<BdCubasdocExt> cuBasDocList = bdCubasdocService.queryCubasdocByCondition(bdCubasdocParam);
if(CollectionUtil.isNotEmpty(cuBasDocList)){ if (CollectionUtil.isNotEmpty(cuBasDocList)) {
BdCubasdocDTO bdCubasdocDTO = BeanUtil.copyProperties(cuBasDocList.get(0), BdCubasdocDTO.class); BdCubasdocDTO bdCubasdocDTO = BeanUtil.copyProperties(cuBasDocList.get(0), BdCubasdocDTO.class);
return R.ok(bdCubasdocDTO); return R.ok(bdCubasdocDTO);
} }
return R.fail(); return R.fail();
} }
@Override
public R<Boolean> saveCubasdoc(BdCubasdocDTO cubasdocDto) {
BdCubasdocParam bdCubasdocParam = BeanUtil.copyProperties(cubasdocDto, BdCubasdocParam.class);
bdCubasdocService.saveCubasdoc(bdCubasdocParam, cubasdocDto.getPkUser());
return R.ok();
}
} }

10
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java
View File

@ -235,16 +235,6 @@ public class CacheConstants {
*/ */
public static final String BD_AWARDS_COACH = CACHE_PREFIX + "awards:coach:"; public static final String BD_AWARDS_COACH = CACHE_PREFIX + "awards:coach:";
/**
* 隶属团队配置
*/
public static final String CU_MEMBER_TEAM = CACHE_PREFIX + "member:team:";
/**
* 隶属团队配置
*/
public static final String CU_MEMBER_TEAM_ID = CACHE_PREFIX + "member:team:id";
/** /**
* 币种配置 * 币种配置
*/ */

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java
View File

@ -398,10 +398,6 @@ public class ConfigMsgConstants {
*/ */
public static final String PK_GRADE_NOT_NULL = "等级不能为空"; public static final String PK_GRADE_NOT_NULL = "等级不能为空";
/**
* 只能查询伞下体系会员编号
*/
public static final String QUERY_VERTEX_CODE = "只能查询伞下体系会员编号";
/** /**
* 修改后推荐编号不能是本身或者血缘伞下 * 修改后推荐编号不能是本身或者血缘伞下
*/ */
@ -1273,11 +1269,9 @@ public class ConfigMsgConstants {
*/ */
public static final String MEMBER_EXIST = "会员已存在"; public static final String MEMBER_EXIST = "会员已存在";
/** /**
* 请选择要删除的信息 * 请选择要删除的信息
*/ */
public static final String DELETE_INFO = "请选择要删除的信息"; public static final String DELETE_INFO = "请选择要删除的信息";
} }

40
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderPrefix.java
View File

@ -4,12 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
/** /**
* Description: 订单前缀 * 单号前缀
* Author: sui q
* Time: 2022/9/8 11:09
* Classname: EOrderPrefix
* PackageName: com.hzs.common.core.enums
* @author sshcode
*/ */
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
@ -23,7 +18,7 @@ public enum EOrderPrefix {
/** /**
* 销售订单 * 销售订单
*/ */
ORDER_CODE("SO", "销售订单"), ORDER_CODE("LXSO", "销售订单"),
/** /**
* 采购订单 * 采购订单
@ -75,15 +70,10 @@ public enum EOrderPrefix {
*/ */
IO_ORDER_CODE("BO", "业务领用订单"), IO_ORDER_CODE("BO", "业务领用订单"),
/**
* 三方订单
*/
THIRD_ORDER_CODE("TH", "订单"),
/** /**
* 发货单 * 发货单
*/ */
DELIVERY_CODE("SD", "发货单"), DELIVERY_CODE("LXSD", "发货单"),
/** /**
* 充值 * 充值
@ -100,12 +90,6 @@ public enum EOrderPrefix {
*/ */
WITHDRAWAL_CODE("WR", "提现"), WITHDRAWAL_CODE("WR", "提现"),
/**
* 店务会员卡
*/
SHOP_TRADE_CODE("ST", "店务会员卡"),
/** /**
* 冻结金额 * 冻结金额
*/ */
@ -139,7 +123,7 @@ public enum EOrderPrefix {
/** /**
* 在线支付 * 在线支付
*/ */
ON_LINE("OL","非订单在线支付"), ON_LINE("OL", "非订单在线支付"),
/** /**
* 修改安置 * 修改安置
@ -165,12 +149,6 @@ public enum EOrderPrefix {
* 注水业绩 * 注水业绩
*/ */
MEMBER_ACHIEVE("MH", "注水业绩"), MEMBER_ACHIEVE("MH", "注水业绩"),
/**
* 设备相关（解绑设备）
*/
DEVICE("DE", "设备相关"),
/** /**
* 公告 * 公告
@ -202,20 +180,14 @@ public enum EOrderPrefix {
SUPPLIER("SR", "供应商相关"), SUPPLIER("SR", "供应商相关"),
/** /**
* 沙棘权益配置 * K值风控
*/
EQUITY("SJ", "沙棘权益配置"),
/**
* 沙棘权益配置
*/ */
RISK_CONTROL("KZ", "K值风控"), RISK_CONTROL("KZ", "K值风控"),
/** /**
* 产品相关 * 产品相关
*/ */
PRODUCT("CP", "产品相关") PRODUCT("CP", "产品相关");
;
/** /**
* 实际值 * 实际值

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdUnit.java
View File

@ -11,12 +11,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 单位配置表 * 单位配置表
* </p>
*
* @author hzs
* @since 2023-03-11
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java
View File

@ -14,9 +14,6 @@ import lombok.experimental.Accessors;
/** /**
* 商品发布 * 商品发布
*
* @author hzs
* @since 2022-09-08
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthority.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* *
* </p>
*
* @author hzs
* @since 2022-09-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthorize.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 商品用户权限配置 * 商品用户权限配置
* </p>
*
* @author hzs
* @since 2023-09-06
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAwards.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 商品奖衔配置 * 商品奖衔配置
* </p>
*
* @author hzs
* @since 2023-08-24
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java
View File

@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 商品发布明细表 * 商品发布明细表
* </p>
*
* @author hzs
* @since 2022-09-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java
View File

@ -13,9 +13,6 @@ import org.apache.ibatis.type.JdbcType;
/** /**
* 商品发布扩展表 * 商品发布扩展表
*
* @author hzs
* @since 2022-09-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresGrade.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 等级配置 * 等级配置
* </p>
*
* @author hzs
* @since 2023-03-13
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresLabel.java
View File

@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
/** /**
* <p>
* 商品标签表 * 商品标签表
* </p>
*
* @author hzs
* @since 2022-10-21
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresRange.java
View File

@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* <p>
* 极差明细表 * 极差明细表
* </p>
*
* @author hzs
* @since 2022-09-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 商品特殊邮费配置 * 商品特殊邮费配置
* </p>
*
* @author hzs
* @since 2023-10-27
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecs.java
View File

@ -9,12 +9,7 @@ import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 规格明细表 * 规格明细表
* </p>
*
* @author hzs
* @since 2022-09-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsPack.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 规格和包装 * 规格和包装
* </p>
*
* @author hzs
* @since 2022-10-21
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsRelation.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* <p>
* 规格明细值 * 规格明细值
* </p>
*
* @author hzs
* @since 2022-09-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -45,7 +40,7 @@ public class BdWaresSpecsRelation extends BaseEntity {
private Integer pkWaresSpecsSku; private Integer pkWaresSpecsSku;
/** /**
*商品明细主键 * 商品明细主键
*/ */
@TableField("PK_WARES_DETAIL") @TableField("PK_WARES_DETAIL")
private Integer pkWaresDetail; private Integer pkWaresDetail;

9
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java
View File

@ -13,9 +13,6 @@ import lombok.experimental.Accessors;
/** /**
* 规格sku表 * 规格sku表
*
* @author hzs
* @since 2022-09-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -86,4 +83,10 @@ public class BdWaresSpecsSku extends BaseEntity {
@TableField("RETAIL_PRICE") @TableField("RETAIL_PRICE")
private BigDecimal retailPrice; private BigDecimal retailPrice;
/**
* 新直销sku
*/
@TableField("SKU_CODE")
private String skuCode;
} }