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

## 充值提货商品添加提货来源；

This commit is contained in:
cabbage 2025-04-29 09:23:46 +08:00
parent defe92fa25
commit be644782af
5 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java
View File

@ -1,13 +1,9 @@
package com.hzs.common.util;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.enums.ELanguages;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.SpringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component;
/**
@ -19,7 +15,7 @@ import org.springframework.stereotype.Component;
@Slf4j
public class TransactionUtils implements InitializingBean {
private static RedisService redisService;
// private static RedisService redisService;
/**
* 获取国际化翻译内容
@ -53,7 +49,7 @@ public class TransactionUtils implements InitializingBean {
@Override
public void afterPropertiesSet() {
redisService = SpringUtils.getBean(RedisService.class);
// redisService = SpringUtils.getBean(RedisService.class);
}
}

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

@ -280,8 +280,6 @@ public class AcPickController extends BaseController {
/**
* @description: 删除充值提货卡
* @author: zhang jing
* @date: 2023/10/17 17:35
* @param: [anpParam]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/

5
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java
View File

@ -76,4 +76,9 @@ public class AcPickSaveDetailParam implements Serializable {
*/
private String productName;
/**
* 提货类型
*/
private Integer pickType;
}

8
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java
View File

@ -73,16 +73,12 @@ public interface IAcPickService extends IService<AcPick> {
/*
* @description: 更新提货单
* @author: sui q
* @date: 2023/5/30 19:49
* @param: null null
**/
boolean updatePickUse(List<AcPickExt> acPickExtList, Integer signSource, List<AcPickMemberLog> acPickMemberLogList);
/*
* @description: 更新提货单
* @author: sui q
* @date: 2023/5/30 19:49
* @param: null null
**/
boolean updatePickUse(List<AcPickExt> acPickExtList, List<AcPickMemberLog> acPickMemberLogList);
@ -116,8 +112,6 @@ public interface IAcPickService extends IService<AcPick> {
/**
* @description: 删除充值提货卡发起签呈
* @author: zhang jing
* @date: 2023/10/17 18:00
* @param: [anpParam]
* @return: boolean
**/
@ -133,8 +127,6 @@ public interface IAcPickService extends IService<AcPick> {
/**
* @description: 审核删除充值提货卡
* @author: zhang jing
* @date: 2023/10/18 16:19
* @param: [resultDTO]
* @return: java.lang.String
**/

28
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java
View File

@ -265,13 +265,6 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED);
}
/**
* @description: 删除充值提货卡发起签呈
* @author: zhang jing
* @date: 2023/10/17 18:01
* @param: [anpParam]
* @return: boolean
**/
@Override
public boolean delPick(AcPickSaveParam param) {
// 会员ID
@ -380,13 +373,6 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
return true;
}
/**
* @description: 审核新增提货卡
* @author:
* @date: 2023/10/18 15:58
* @param: [resultDTO]
* @return: java.lang.String
**/
@Transactional(rollbackFor = Exception.class)
@Override
public String pickApprovalAgree(ApprovalBusinessResultDTO resultDTO) {
@ -419,9 +405,12 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
CuMember cuMember = iMemberServiceApi.getMember(detailParam.getMemberCode()).getData();
// 提货ID
Long pickId = null;
// 提货类型
Integer pickType = null != detailParam.getPickType() ? detailParam.getPickType() : EPickType.PICK_PRODUCT.getValue();
if (null == detailParam.getPkId()) {
LambdaQueryWrapper<AcPick> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AcPick::getPickType, EPickType.PICK_PRODUCT.getValue());
queryWrapper.eq(AcPick::getPickType, pickType);
queryWrapper.eq(AcPick::getPkBaseConfig, 0);
queryWrapper.eq(AcPick::getPkDataId, detailParam.getPkProduct());
queryWrapper.eq(AcPick::getSpecsNameId, detailParam.getSpecsNameId());
@ -438,7 +427,7 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
if (null == pickId) {
// 新增提货数据
acPick.setPkMember(cuMember.getPkId());
acPick.setPickType(EPickType.PICK_PRODUCT.getValue());
acPick.setPickType(pickType);
acPick.setPkDataId(detailParam.getPkProduct().longValue());
acPick.setSpecsName(detailParam.getSpecsName());
acPick.setSpecsNameId(detailParam.getSpecsNameId());
@ -506,13 +495,6 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
}
/**
* @description: 审核删除充值提货卡
* @author: zhang jing
* @date: 2023/10/18 16:01
* @param: [resultDTO]
* @return: java.lang.String
**/
@Transactional(rollbackFor = Exception.class)
@Override
public String delpickApprovalAgree(ApprovalBusinessResultDTO resultDTO) {