## 乐学注册、升级代金券补全规格信息；
This commit is contained in:
parent
f89695cf9f
commit
700e7ca20e
|
|
@ -918,31 +918,6 @@ public class ActivityServiceImpl implements IActivityService {
|
|||
pickUpConfigService.save(pickUpConfig);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void specialRegisterOrder(SaOrderExt saOrderExt) {
|
||||
// List<CuMemberExt> cuMemberExtList = iMemberServiceApi.querySponsorOnUmbrella(saOrderExt.getPkMember(), SysConstants.CHINA_LEX_REPURCHASE_LIST).getData();
|
||||
// if (cuMemberExtList.size() > 0) {
|
||||
// 查询订单的产品有没有 复购类型为乐学易考的，乐学易考的是赠送的代金券，价格是金额
|
||||
Set<Integer> productIdList = saOrderExt.getOrderItemsList().stream().map(SaOrderItems::getPkProduct).collect(Collectors.toSet());
|
||||
List<BdProductExt> productExtList = productService.queryProductById(productIdList, saOrderExt.getPkCountry(), ERepurchaseType.LE_XUE_REGISTER.getValue());
|
||||
if (CollectionUtil.isNotEmpty(productExtList)) {
|
||||
Map<Integer, BdProductExt> productDtoMap = new HashMap<>(ComputeUtil.mapInitCapacity(productExtList.size()));
|
||||
productExtList.forEach(productDTO ->
|
||||
productDtoMap.put(productDTO.getPkId(), productDTO));
|
||||
// 记录数量
|
||||
for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) {
|
||||
if (productDtoMap.containsKey(saOrderItems.getPkProduct())) {
|
||||
BdProductExt productDTO = productDtoMap.get(saOrderItems.getPkProduct());
|
||||
// 加入提货单
|
||||
iAcPickService.addPickByActivity(saOrderExt.getPkMember(), EPickType.COUPON.getValue(), 0L, saOrderItems.getPkProduct().longValue(),
|
||||
saOrderItems.getQuantity(), productDTO.getCover(), null, null,
|
||||
saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null);
|
||||
}
|
||||
}
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ public class AcDrawRewardRecordServiceImpl extends ServiceImpl<AcDrawRewardRecor
|
|||
// 加入提货单
|
||||
acPickService.addPickByActivity(acDrawRewardNum.getPkMember(), EActType.LOTTERY_DRAW.getValue(), acPickUpConfig.getPkId(), rewardRecordId,
|
||||
1, acDrawGiftRuleConfig.getGiftCover(), receiveTime, acPickUpConfig.getPkPostage(),
|
||||
acDrawRewardNum.getPkMember(), acDrawRewardNum.getPkCountry(), acDrawRewardNum.getPkBaseId());
|
||||
acDrawRewardNum.getPkMember(), acDrawRewardNum.getPkCountry(), acDrawRewardNum.getPkBaseId(), null, null);
|
||||
}
|
||||
return acDrawGiftRuleConfig;
|
||||
} catch (Exception e) {
|
||||
|
|
|
|||
|
|
@ -36,11 +36,13 @@ public interface IAcPickService extends IService<AcPick> {
|
|||
* @param pkCreator 创建人
|
||||
* @param pkCountry 所属国家
|
||||
* @param pkBaseId 活动ID（活动必填，非活动可传null）
|
||||
* @param specsNameId 规格ID
|
||||
* @param specsName 规格名称
|
||||
* @return
|
||||
*/
|
||||
boolean addPickByActivity(Long pkMember, Integer pickType, Long pkBaseConfig, Long pkDataId,
|
||||
Integer usableQuantity, String pickCover, Date receiveTime, Integer pkPostage,
|
||||
Long pkCreator, Integer pkCountry, Long pkBaseId);
|
||||
Long pkCreator, Integer pkCountry, Long pkBaseId, String specsNameId, String specsName);
|
||||
|
||||
/**
|
||||
* 根据会员和类型回退使用数量
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
|
|||
@Override
|
||||
public boolean addPickByActivity(Long pkMember, Integer pickType, Long pkBaseConfig, Long pkDataId,
|
||||
Integer usableQuantity, String pickCover, Date receiveTime, Integer pkPostage,
|
||||
Long pkCreator, Integer pkCountry, Long pkBaseId) {
|
||||
Long pkCreator, Integer pkCountry, Long pkBaseId, String specsNameId, String specsName) {
|
||||
if (baseMapper.addQuantityByActivity(pickType, pkBaseConfig, pkDataId, pkMember, usableQuantity, pkPostage, receiveTime, pkCreator) == 0) {
|
||||
AcPick acPick = new AcPick();
|
||||
acPick.setPkMember(pkMember);
|
||||
|
|
@ -115,6 +115,12 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
|
|||
if (null != pkBaseId) {
|
||||
acPick.setPkBaseId(pkBaseId);
|
||||
}
|
||||
if (null != specsNameId) {
|
||||
acPick.setSpecsNameId(specsNameId);
|
||||
}
|
||||
if (null != specsName) {
|
||||
acPick.setSpecsName(specsName);
|
||||
}
|
||||
return baseMapper.insert(acPick) > 0;
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -711,12 +711,10 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
|
|||
Long pkBaseId = baseConfig.getPkId();
|
||||
//推荐人
|
||||
Long pkMember = saOrderExt.getPkReference();
|
||||
log.info("推荐人编号：" + pkMember);
|
||||
//推荐人等级ID
|
||||
Integer pkSettleGrade = memberServiceApi.queryMember(pkMember).getData().getPkSettleGrade();
|
||||
//被推荐人等级ID
|
||||
Integer pkRecommendGrade = memberServiceApi.queryMember(saOrderExt.getPkMember()).getData().getPkSettleGrade();
|
||||
log.info("被推荐人编号：" + saOrderExt.getPkMember());
|
||||
//国家
|
||||
Integer pkCountry = saOrderExt.getPkCountry();
|
||||
AcRecommendUpgradeVO recommendUpgradeVO = AcRecommendUpgradeVO.builder().pkCountry(pkCountry)
|
||||
|
|
@ -725,7 +723,6 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
|
|||
//查询规则
|
||||
List<AcRecomUpgradeRuleConfig> recomUpgradeRuleConfigList = recomUpgradeRuleConfigService.selectRuleConfig(recommendUpgradeVO);
|
||||
if (CollUtil.isNotEmpty(recomUpgradeRuleConfigList)) {
|
||||
log.info("===插入业务表");
|
||||
AcRecomUpgradeRuleConfig recomUpgradeRuleConfig = recomUpgradeRuleConfigList.get(0);
|
||||
//正常报单
|
||||
Long pkRuleId = recomUpgradeRuleConfig.getPkId();
|
||||
|
|
@ -778,7 +775,7 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
|
|||
AcGiftConfigExt acGiftConfigExt = acGiftConfigList.get(0);
|
||||
acPickService.addPickByActivity(pkMember, EActType.DIRECT_PUSH_GIFT.getValue(),
|
||||
baseConfig.getPkId(), pkRuleId, acGiftConfigExt.getQuantity(), baseConfig.getActCover(), null,
|
||||
null, pkMember, pkCountry, baseConfig.getPkId());
|
||||
null, pkMember, pkCountry, baseConfig.getPkId(), null, null);
|
||||
}
|
||||
//调用升级接口
|
||||
return memberServiceApi.updateMemberLevel(cuMember, saOrder, pkSettleGrade).getData();
|
||||
|
|
|
|||
|
|
@ -2787,7 +2787,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
// 加入提货单
|
||||
iAcPickService.addPickByActivity(saOrderExt.getPkMember(), EPickType.COUPON.getValue(), 0L, saOrderItems.getPkProduct().longValue(),
|
||||
saOrderItems.getQuantity(), productDTO.getCover(), null, null,
|
||||
saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null);
|
||||
saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null, saOrderItems.getSpecsNameId(), saOrderItems.getSpecsName());
|
||||
|
||||
// 法宝券数量冗余在订单主表
|
||||
saOrderExt.setBoxNum(saOrderItems.getQuantity());
|
||||
|
|
|
|||
Loading…
Reference in New Issue