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

## 注水添加判断，不能早于会员支付时间；

This commit is contained in:
cabbage 2025-05-12 16:06:46 +08:00
parent 1324b2e70f
commit 4f0472ff42
2 changed files with 79 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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));
} }

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;
} }