## 调整查询政策币类型;
This commit is contained in:
parent
f82152f7ad
commit
b038036627
|
@ -42,7 +42,7 @@ public class CuMemberServiceLogProvider implements ICuMemberServiceLogServiceApi
|
||||||
|
|
||||||
if (null == upPolicyCurrency) {
|
if (null == upPolicyCurrency) {
|
||||||
// 血缘上政策币
|
// 血缘上政策币
|
||||||
CuMemberServiceLog cuMemberServiceLog = iCuMemberServiceLogService.getBloodMemberServiceLog(pkMember, 1);
|
CuMemberServiceLog cuMemberServiceLog = iCuMemberServiceLogService.getBloodMemberServiceLog(pkMember, EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
|
||||||
if (null != cuMemberServiceLog) {
|
if (null != cuMemberServiceLog) {
|
||||||
try {
|
try {
|
||||||
upPolicyCurrency = JSONUtil.toBean(cuMemberServiceLog.getNewValue(), UpPolicyCurrency.class);
|
upPolicyCurrency = JSONUtil.toBean(cuMemberServiceLog.getNewValue(), UpPolicyCurrency.class);
|
||||||
|
|
|
@ -343,7 +343,11 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
}
|
}
|
||||||
|
|
||||||
// 个人政策币配置,政策币个人配置优先特殊配置
|
// 个人政策币配置,政策币个人配置优先特殊配置
|
||||||
UpPolicyCurrency upPolicyCurrency = iCuMemberServiceLogServiceApi.queryMaxCuMemberServiceLog(cuMemberAccount.getPkMember(), Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue())).getData();
|
UpPolicyCurrency upPolicyCurrency = null;
|
||||||
|
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType()
|
||||||
|
|| EOrderType.UPGRADE_ORDER.getValue() == saOrder.getOrderType()) {
|
||||||
|
upPolicyCurrency = iCuMemberServiceLogServiceApi.queryMaxCuMemberServiceLog(cuMemberAccount.getPkMember(), Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue())).getData();
|
||||||
|
}
|
||||||
|
|
||||||
// 验证商品是否存在特殊消费配置
|
// 验证商品是否存在特殊消费配置
|
||||||
if (CollectionUtil.isNotEmpty(orderItemList)) {
|
if (CollectionUtil.isNotEmpty(orderItemList)) {
|
||||||
|
|
Loading…
Reference in New Issue