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

Merge remote-tracking branch 'origin/lx_dev' into lx_dev

This commit is contained in:
cabbage 2025-10-10 15:50:00 +08:00
parent 38f0668d99 60bae2af96
commit 45beb6e846
22 changed files with 276 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java
View File

@ -109,7 +109,7 @@ public interface IActivityService {
* @param recommendParam
* @return
*/
Boolean onLinePetition(AcRecommendParam recommendParam);
String onLinePetition(AcRecommendParam recommendParam);
/**
* 活动签呈审核通过

40
bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java
View File

@ -631,7 +631,8 @@ public class ActivityServiceImpl implements IActivityService {
* @return
*/
@Override
public Boolean onLinePetition(AcRecommendParam recommendParam) {
public String onLinePetition(AcRecommendParam recommendParam) {
log.info("旅游活动新增参数{}",JSONUtil.toJsonStr(recommendParam));
//业务单号
String code = CommonUtil.createSerialNumber(EOrderPrefix.ACTIVITY_CODE.getValue());
EApprovalBusiness approvalBusiness = null;
@ -643,7 +644,40 @@ public class ActivityServiceImpl implements IActivityService {
approvalBusiness = EApprovalBusiness.TOURISM_DELETE;
}
recommendParam.getActivityParam().setBusinessCode(code);
Boolean b = submitApproval(recommendParam, approvalBusiness);
Integer controlType = recommendParam.getControlType();
if (controlType.equals(EControlType.SAVE.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(recommendParam.getPkCountry());
activityParam.setPkCreator(recommendParam.getPkMember());
activityParam.setActType(EActType.TOURISM.getValue());
// 增加基础配置
AcBaseConfig baseConfig = saveBaseConfig(activityParam);
// 目标群体配置
saveGoalMemberConfig(activityParam, baseConfig);
} else if (controlType.equals(EControlType.MODIFY.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setActType(EActType.TOURISM.getValue());
activityParam.setPkCountry(recommendParam.getPkCountry());
activityParam.setPkCreator(recommendParam.getPkMember());
//目标用户群删除
LambdaQueryWrapper<AcGoalMemberConfig> qe = new LambdaQueryWrapper<>();
qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId());
goalMemberConfigService.remove(qe);
// 增加基础配置
AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class);
baseConfigService.updateById(baseConfig);
// 目标群体配置
saveGoalMemberConfig(activityParam, baseConfig);
} else if (controlType.equals(EControlType.DELETE.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
//目标用户群删除
LambdaQueryWrapper<AcGoalMemberConfig> qe = new LambdaQueryWrapper<>();
qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId());
goalMemberConfigService.remove(qe);
baseConfigService.removeById(activityParam.getPkId());
drawGiftConfigService.removeDrawGiftConfig(activityParam.getPkId().intValue());
}
//日志
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(SecurityUtils.getPkCountry());
@ -651,7 +685,7 @@ public class ActivityServiceImpl implements IActivityService {
activityParam.setActType(EActType.TOURISM.getValue());
activityParam.setBusinessCode(recommendParam.getActivityParam().getBusinessCode());
this.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
return b;
return null;
}
/**

9
bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java
View File

@ -172,13 +172,16 @@ public class AcConsumeRuleConfigController extends BaseController {
* @param recommendParam 消费赠送参数
* @return AjaxResult
*/
@Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
@PostMapping("/online-petition")
@Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "消费赠送")
@PostMapping("/submit")
public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
recommendParam.setPkCountry(SecurityUtils.getPkCountry());
recommendParam.setPkMember(SecurityUtils.getUserId());
recommendParam.setLoginUser(userTokenService.getLoginUser());
consumeRuleConfigService.onLinePetition(recommendParam);
String str = consumeRuleConfigService.onLinePetition(recommendParam);
if (str != null) {
return AjaxResult.error(str);
}
return AjaxResult.success();
}

9
bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java
View File

@ -111,11 +111,14 @@ public class AcMemberConsumeRuleController extends BaseController {
* @param memberConsumeRuleVo 会员消费赠送参数
* @return AjaxResult
*/
@Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
@PostMapping("/online-petition")
@Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "会员消费赠送")
@PostMapping("/submit")
public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) {
memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser());
iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo);
String str = iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo);
if (str != null) {
return AjaxResult.error(str);
}
return AjaxResult.success();
}

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java
View File

@ -38,7 +38,7 @@ public interface IAcConsumeRuleConfigService extends IService<AcConsumeRuleConfi
* @param recommendParam
*/
Boolean onLinePetition(AcRecommendParam recommendParam);
String onLinePetition(AcRecommendParam recommendParam);
/**
* 消费赠送审批/修改/删除

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcMemberConsumeRuleService.java
View File

@ -28,7 +28,7 @@ public interface IAcMemberConsumeRuleService extends IService<AcMemberConsumeRul
* @param: [memberConsumeRuleVo]
* @return: java.lang.Boolean
**/
Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);
String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);
/**
* @description: 会员消费赠审批

32
bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java
View File

@ -33,6 +33,7 @@ import com.hzs.system.sys.IApprovalServiceApi;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import com.hzs.system.sys.dto.ApprovalSubmitDTO;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -47,6 +48,7 @@ import java.util.List;
* @since 2023-04-20
*/
@Service
@Slf4j
public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleConfigMapper, AcConsumeRuleConfig> implements IAcConsumeRuleConfigService {
@Autowired
@ -106,7 +108,9 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
* @param recommendParam
*/
@Override
public Boolean onLinePetition(AcRecommendParam recommendParam) {
@Transactional(rollbackFor = Exception.class)
public String onLinePetition(AcRecommendParam recommendParam) {
log.info("消费赠送入参{}", recommendParam);
EApprovalBusiness approvalBusiness = null;
if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
approvalBusiness = EApprovalBusiness.CONSUME_GIFT_ADD;
@ -115,7 +119,29 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
} else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
approvalBusiness = EApprovalBusiness.CONSUME_GIFT_REMOVE;
}
Boolean b = submitApproval(recommendParam, approvalBusiness);
LoginUser loginUser = recommendParam.getLoginUser();
if (loginUser == null) {
log.error("登录用户信息为空");
return "登录用户信息为空";
}
if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(loginUser.getDataCountry());
activityParam.setPkCreator(loginUser.getUserId());
activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
iActivityService.saveConsumptionGift(activityParam);
} else if (recommendParam.getControlType().equals(EControlType.MODIFY.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(loginUser.getDataCountry());
activityParam.setPkCreator(loginUser.getUserId());
activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
iActivityService.updateConsumptionGift(activityParam);
} else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
Long pkId = activityParam.getPkId();
this.removeActivity(pkId.intValue());
}
// Boolean b = submitApproval(recommendParam, approvalBusiness);
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(SecurityUtils.getPkCountry());
activityParam.setPkCreator(SecurityUtils.getUserId());
@ -123,7 +149,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
//日志
iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
return b;
return null;
}
/**

35
bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java
View File

@ -37,6 +37,7 @@ import com.hzs.system.sys.IApprovalServiceApi;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import com.hzs.system.sys.dto.ApprovalSubmitDTO;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -56,6 +57,7 @@ import java.util.List;
* @return:
**/
@Service
@Slf4j
public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeRuleMapper, AcMemberConsumeRule> implements IAcMemberConsumeRuleService {
@Autowired
@ -80,7 +82,9 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
* @return: java.lang.Boolean
**/
@Override
public Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
@Transactional(rollbackFor = Exception.class)
public String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
log.info("商品赠送入参{}",JSONUtil.toJsonStr(memberConsumeRuleVo));
EApprovalBusiness approvalBusiness = null;
if (memberConsumeRuleVo.getControlType() == EControlType.SAVE.getValue()) {
approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_ADD;
@ -89,14 +93,39 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
} else if (memberConsumeRuleVo.getControlType() == EControlType.DELETE.getValue()) {
approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_REMOVE;
}
Boolean b = submitApproval(memberConsumeRuleVo, approvalBusiness);
LoginUser loginUser = memberConsumeRuleVo.getLoginUser();
if (loginUser == null) {
log.error("登录用户信息为空");
return "登录用户信息为空";
}
if (memberConsumeRuleVo.getControlType().equals(EControlType.SAVE.getValue())) {
ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
activityParam.setPkCountry(loginUser.getDataCountry());
activityParam.setPkCreator(loginUser.getUserId());
activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
memberConsumeRuleVo.setActivityParam(activityParam);
saveMemberConsumeRule(memberConsumeRuleVo);
} else if (memberConsumeRuleVo.getControlType().equals(EControlType.MODIFY.getValue())) {
ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
activityParam.setPkCountry(loginUser.getDataCountry());
activityParam.setPkCreator(loginUser.getUserId());
activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
memberConsumeRuleVo.setActivityParam(activityParam);
updateConsumptionGift(memberConsumeRuleVo);
}else if (memberConsumeRuleVo.getControlType().equals(EControlType.DELETE.getValue())) {
ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
Long pkId = activityParam.getPkId();
removeActivity(pkId.intValue());
}
// Boolean b = submitApproval(memberConsumeRuleVo, approvalBusiness);
ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
activityParam.setPkCountry(SecurityUtils.getPkCountry());
activityParam.setPkCreator(SecurityUtils.getUserId());
activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
//日志
iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
return b;
return null;
}
/**

8
bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java
View File

@ -86,7 +86,7 @@ public class AcDrawGiftRuleConfigController extends BaseController {
* @return AjaxResult
*/
@Log(module = EOperationModule.AC_RECOMMEEND_CONFIG, method = EOperationMethod.INSERT, remark = "抽奖在线配置")
@PostMapping("/online-petition")
@PostMapping("/submit")
public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
if (recommendParam.getActivityParam().getDrawGiftConfigList() != null) {
for (AcDrawGiftRuleConfigVo acDrawGiftRuleConfigVo : recommendParam.getActivityParam().getDrawGiftConfigList()) {
@ -99,7 +99,11 @@ public class AcDrawGiftRuleConfigController extends BaseController {
recommendParam.setPkCountry(SecurityUtils.getPkCountry());
recommendParam.setPkMember(SecurityUtils.getUserId());
recommendParam.setLoginUser(userTokenService.getLoginUser());
return toAjax(drawGiftConfigService.onLinePetition(recommendParam));
String str = drawGiftConfigService.onLinePetition(recommendParam);
if (str != null) {
return AjaxResult.error(str);
}
return AjaxResult.success();
}
/**

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java
View File

@ -118,6 +118,7 @@ public class AcDrawRewardRecordController extends BaseController {
* 充值已购买次数按钮 (审批)
*/
@PostMapping("/purchased-times")
@Log(module = EOperationModule.DRAW_PURCHASED,business = EOperationBusiness.DRAW_PURCHASED,method = EOperationMethod.INSERT,remark = "充值已购买次数")
public AjaxResult purchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
Integer pkCountry = SecurityUtils.getPkCountry();
if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {
@ -145,6 +146,7 @@ public class AcDrawRewardRecordController extends BaseController {
* 充值未购买次数 (走审批)
*/
@PostMapping("/unpurchased-times")
@Log(module = EOperationModule.DRAW_UNPURCHASED,business = EOperationBusiness.DRAW_UNPURCHASED,method = EOperationMethod.INSERT,remark = "充值未购买次数")
public AjaxResult unpurchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
Integer pkCountry = SecurityUtils.getPkCountry();
if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java
View File

@ -62,5 +62,5 @@ public interface IAcDrawGiftRuleConfigService extends IService<AcDrawGiftRuleCon
* @param recommendParam
* @return
*/
Boolean onLinePetition(AcRecommendParam recommendParam);
String onLinePetition(AcRecommendParam recommendParam);
}

32
bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawGiftRuleConfigServiceImpl.java
View File

@ -29,10 +29,12 @@ import com.hzs.common.domain.activity.base.AcPickUpConfig;
import com.hzs.common.domain.activity.draw.AcDrawGiftRuleConfig;
import com.hzs.common.domain.activity.draw.AcDrawRuleConfig;
import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.system.sys.IApprovalServiceApi;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import com.hzs.system.sys.dto.ApprovalSubmitDTO;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -47,6 +49,7 @@ import java.util.List;
* @since 2023-04-21
*/
@Service
@Slf4j
public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl<AcDrawGiftRuleConfigMapper, AcDrawGiftRuleConfig> implements IAcDrawGiftRuleConfigService {
@Autowired
@ -181,7 +184,9 @@ public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl<AcDrawGiftRuleC
}
@Override
public Boolean onLinePetition(AcRecommendParam recommendParam) {
@Transactional(rollbackFor = Exception.class)
public String onLinePetition(AcRecommendParam recommendParam) {
log.info("抽奖配置入参{}",JSONUtil.toJsonStr(recommendParam));
EApprovalBusiness approvalBusiness = null;
if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
approvalBusiness = EApprovalBusiness.LOTTERY_DRAW_ADD;
@ -190,8 +195,31 @@ public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl<AcDrawGiftRuleC
} else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
approvalBusiness = EApprovalBusiness.LOTTERY_DRAW_REMOVE;
}
Integer controlType = recommendParam.getControlType();
if (controlType.equals(EControlType.SAVE.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(recommendParam.getPkCountry());
activityParam.setPkCreator(recommendParam.getPkMember());
activityParam.setActType(EActType.LOTTERY_DRAW.getValue());
iActivityService.saveRaffleActivity(activityParam);
} else if (controlType.equals(EControlType.MODIFY.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setActType(EActType.LOTTERY_DRAW.getValue());
activityParam.setPkCountry(recommendParam.getPkCountry());
activityParam.setPkCreator(recommendParam.getPkMember());
drawGiftConfigService.updateDrawGiftConfig(activityParam);
} else if (controlType.equals(EControlType.DELETE.getValue())) {
drawGiftConfigService.removeDrawGiftConfig(recommendParam.getActivityParam().getPkBaseId().intValue());
}
// 日志
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(SecurityUtils.getPkCountry());
activityParam.setPkCreator(SecurityUtils.getUserId());
activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
return submitApproval(recommendParam, approvalBusiness);
//日志
iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
return null;
}
/**

60
bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java
View File

@ -39,6 +39,7 @@ import com.hzs.member.detail.ICuMemberServiceLogServiceApi;
import com.hzs.system.sys.IApprovalServiceApi;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import com.hzs.system.sys.dto.ApprovalSubmitDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -55,6 +56,7 @@ import java.util.concurrent.TimeUnit;
* @since 2023-04-21
*/
@Service
@Slf4j
public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMapper, AcDrawRewardNum> implements IAcDrawRewardNumService {
@Autowired
@ -239,10 +241,32 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMappe
@Override
@Transactional(rollbackFor = Exception.class)
public void purchasedTimes(PurchasedTimesParam purchasedTimesParam) {
purchasedTimesParam.setControlType(EControlType.MODIFY.getValue());
//业务单号
EApprovalBusiness approvalBusiness = EApprovalBusiness.PUR_CHASED_TIMES;
submitApproval(purchasedTimesParam, approvalBusiness);
log.info("修改已购买次数入参{}",JSONUtil.toJsonStr(purchasedTimesParam));
String memberCode = purchasedTimesParam.getMemberCode();
Integer num = purchasedTimesParam.getNum();
Long pkBaseId = purchasedTimesParam.getPkBaseId();
R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
Long pkMember = memberDto.getData().getPkId();
LambdaQueryWrapper<AcDrawRewardNum> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId);
queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember);
AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper);
if (drawRewardNum != null) {
baseMapper.updatePurchasedTimesByBaseId(pkMember, num, pkBaseId);
} else {
drawRewardNum = new AcDrawRewardNum();
drawRewardNum.setPkBaseId(pkBaseId);
drawRewardNum.setPkMember(pkMember);
drawRewardNum.setTotalUsedNum(num);
drawRewardNum.setAvailableNum(num);
drawRewardNum.setTotalNum(num);
drawRewardNum.setAvailableSurplusNum(num);
drawRewardNum.setCreationTime(DateUtils.currentDateTime());
drawRewardNum.setPkCreator(memberDto.getData().getPkCreator());
drawRewardNum.setPkCountry(memberDto.getData().getPkCountry());
this.save(drawRewardNum);
}
}
/**
@ -364,10 +388,30 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMappe
*/
@Override
public void unpurchasedTimes(PurchasedTimesParam purchasedTimesParam) {
purchasedTimesParam.setControlType(EControlType.MODIFY.getValue());
//业务单号
EApprovalBusiness approvalBusiness = EApprovalBusiness.UN_PUR_CHASED_TIMES;
submitApproval(purchasedTimesParam, approvalBusiness);
log.info("修改未购买次数入参{}",JSONUtil.toJsonStr(purchasedTimesParam));
String memberCode = purchasedTimesParam.getMemberCode();
Integer num = purchasedTimesParam.getNum();
Long pkBaseId = purchasedTimesParam.getPkBaseId();
R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
Long pkMember = memberDto.getData().getPkId();
LambdaQueryWrapper<AcDrawRewardNum> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId);
queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember);
AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper);
if (drawRewardNum != null) {
baseMapper.updateUnpurchasedTimesByPkbaseId(pkMember, num, pkBaseId);
} else {
drawRewardNum = new AcDrawRewardNum();
drawRewardNum.setPkBaseId(pkBaseId);
drawRewardNum.setPkMember(pkMember);
drawRewardNum.setTotalNum(num);
drawRewardNum.setTotalSurplusNum(num);
drawRewardNum.setCreationTime(DateUtils.currentDateTime());
drawRewardNum.setPkCreator(memberDto.getData().getPkCreator());
drawRewardNum.setPkCountry(memberDto.getData().getPkCountry());
this.save(drawRewardNum);
}
}
/**

8
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java
View File

@ -44,12 +44,16 @@ public class AcRecommendConfigController extends BaseController {
* @return AjaxResult
*/
@Log(module = EOperationModule.AC_RECOMMEEND_CONFIG, business = EOperationBusiness.AC_RECOMMEEND_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
@PostMapping("/online-petition")
@PostMapping("/submit")
public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
recommendParam.setPkCountry(SecurityUtils.getPkCountry());
recommendParam.setPkMember(SecurityUtils.getUserId());
recommendParam.setLoginUser(userTokenService.getLoginUser());
return toAjax(acRepurCouponsRuleConfigService.onLinePetition(recommendParam));
String str = acRepurCouponsRuleConfigService.onLinePetition(recommendParam);
if (str != null) {
return AjaxResult.error(str);
}
return AjaxResult.success();
}

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurCouponsRuleConfigService.java
View File

@ -21,7 +21,7 @@ public interface IAcRepurCouponsRuleConfigService extends IService<AcRepurCoupon
* @param recommendParam
* @return
*/
Boolean onLinePetition(AcRecommendParam recommendParam);
String onLinePetition(AcRecommendParam recommendParam);
/**
* 查看详情

17
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java
View File

@ -96,7 +96,8 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean onLinePetition(AcRecommendParam recommendParam) {
public String onLinePetition(AcRecommendParam recommendParam) {
log.info("直推参数{}",JSONUtil.toJsonStr(recommendParam));
EApprovalBusiness approvalBusiness = EApprovalBusiness.DIRECT_PUSH_GIFT;
//根据产品ID查询产品名称
List<AcRecommendUpgradeVO> recommendUpgradeList = recommendParam.getRecommendUpgradeList();
@ -113,12 +114,20 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
}
}
}
Integer controlType = recommendParam.getControlType();
if (controlType.equals(EControlType.SAVE.getValue())) {
return saveRecommendData(recommendParam);
} else if (controlType.equals(EControlType.MODIFY.getValue())) {
deleteRecommendData(recommendParam);
return saveRecommendData(recommendParam);
} else {
deleteRecommendData(recommendParam);
}
//业务单号
String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.ACTIVITY_CODE.getValue());
//提交审批
Boolean result = submitApproval(recommendParam, approvalBusiness, businessCode);
//日志
packageRecommendOperationLog(recommendParam, approvalBusiness, businessCode);
return result;
return null;
}

8
bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/controller/manage/AcTourismController.java
View File

@ -60,12 +60,16 @@ public class AcTourismController extends BaseController {
* @return AjaxResult
*/
@Log(module = EOperationModule.AC_TOURISM_CONFIG, business = EOperationBusiness.AC_TOURISM_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
@PostMapping("/online-petition")
@PostMapping("/submit")
public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
recommendParam.setPkCountry(SecurityUtils.getPkCountry());
recommendParam.setPkMember(SecurityUtils.getUserId());
recommendParam.setLoginUser(userTokenService.getLoginUser());
return toAjax(activityService.onLinePetition(recommendParam));
String str = activityService.onLinePetition(recommendParam);
if (str != null) {
return AjaxResult.error(str);
}
return AjaxResult.success();
}

9
bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java
View File

@ -163,13 +163,16 @@ public class WaresRuleConfigController extends BaseController {
* @param recommendParam 商品赠送参数
* @return AjaxResult
*/
@Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
@PostMapping("/online-petition")
@Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "商品赠送")
@PostMapping("/submit")
public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
recommendParam.setPkCountry(SecurityUtils.getPkCountry());
recommendParam.setPkMember(SecurityUtils.getUserId());
recommendParam.setLoginUser(userTokenService.getLoginUser());
waresRuleConfigService.onLinePetition(recommendParam);
String str = waresRuleConfigService.onLinePetition(recommendParam);
if (str != null) {
return AjaxResult.error(str);
}
return AjaxResult.success();
}

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java
View File

@ -54,7 +54,7 @@ public interface IAcWaresRuleConfigService extends IService<AcWaresRuleConfig> {
*
* @param recommendParam
*/
Boolean onLinePetition(AcRecommendParam recommendParam);
String onLinePetition(AcRecommendParam recommendParam);
/**
* 商品赠送 审核规则

34
bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java
View File

@ -30,9 +30,11 @@ import com.hzs.system.sys.IApprovalServiceApi;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import com.hzs.system.sys.dto.ApprovalSubmitDTO;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@ -43,6 +45,7 @@ import java.util.List;
* @since 2023-04-20
*/
@Service
@Slf4j
public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigMapper, AcWaresRuleConfig> implements IAcWaresRuleConfigService {
@Autowired
@ -108,7 +111,9 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
* @param recommendParam
*/
@Override
public Boolean onLinePetition(AcRecommendParam recommendParam) {
@Transactional(rollbackFor = Exception.class)
public String onLinePetition(AcRecommendParam recommendParam) {
log.info("商品赠送入参{}",recommendParam);
EApprovalBusiness approvalBusiness = null;
if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_ADD;
@ -117,7 +122,30 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
} else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_REMOVE;
}
Boolean b = submitApproval(recommendParam, approvalBusiness);
// Boolean b = submitApproval(recommendParam, approvalBusiness);
LoginUser loginUser = recommendParam.getLoginUser();
if (loginUser == null) {
log.error("登录用户信息为空");
return "登录用户信息为空";
}
if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(loginUser.getDataCountry());
activityParam.setPkCreator(loginUser.getUserId());
activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
iActivityService.saveActivity(activityParam);
} else if (recommendParam.getControlType().equals(EControlType.MODIFY.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(loginUser.getDataCountry());
activityParam.setPkCreator(loginUser.getUserId());
activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
waresRuleConfigService.updateWaresRuleConfig(activityParam);
} else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
ActivityParam activityParam = recommendParam.getActivityParam();
Long pkId = activityParam.getPkId();
waresRuleConfigService.removeWaresRuleConfig(pkId);
}
//日志
ActivityParam activityParam = recommendParam.getActivityParam();
activityParam.setPkCountry(SecurityUtils.getPkCountry());
@ -125,7 +153,7 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
activityParam.setBusinessCode(recommendParam.getActivityParam().getBusinessCode());
iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
return b;
return null;
}
/**

4
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
View File

@ -302,6 +302,10 @@ public enum EOperationBusiness {
DRAW_DETAIL("抽奖明细"),
DRAW_PURCHASED("充值已购买次数"),
DRAW_UNPURCHASED("充值未购买次数"),
AC_RECOMMEEND_CONFIG("直推赠送"),
AC_WARES_RULE_CONFIG("商品赠送"),

4
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
View File

@ -206,6 +206,10 @@ public enum EOperationModule {
DRAW_DETAIL("抽奖明细"),
DRAW_PURCHASED("充值已购买次数"),
DRAW_UNPURCHASED("充值未购买次数"),
RECOMMEND_GIVE("直推赠送"),
BENEFITS_GIVE("权益赠送"),
BENEFITS_GIVE_LOG("权益赠送记录"),