dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
齐天大圣 2024-03-27 11:24:51 +08:00
parent eb0fe3b943
commit d31e230e8c
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -785,7 +785,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
//4. 3和优惠券比较 //4. 3和优惠券比较
if (ObjectUtils.isNotEmpty(activeDiscountPayVO3)) { if (ObjectUtils.isNotEmpty(activeDiscountPayVO3)) {
finalAmount = activeDiscountPayVO3.getDiscounts(); finalAmount = activeDiscountPayVO3.getDiscounts();
if (ObjectUtils.isNotEmpty(cardFavorableRecordVO) && finalAmount < cardFavorableRecordVO.getDiscountAmount()) { if (ObjectUtils.isNotEmpty(cardFavorableRecordVO) && ObjectUtils.isNotEmpty(cardFavorableRecordVO.getDiscountAmount()) && finalAmount < cardFavorableRecordVO.getDiscountAmount()) {
PaymentActiveVO paymentActiveVO1 = new PaymentActiveVO(); PaymentActiveVO paymentActiveVO1 = new PaymentActiveVO();
//单用优惠券优惠力度最大 //单用优惠券优惠力度最大
paymentActiveVO1.setCardFavorableId(cardFavorableRecordVO.getId()); paymentActiveVO1.setCardFavorableId(cardFavorableRecordVO.getId());

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeRecordServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.fuint.business.tag.mapper.TagCodeRecordMapper;
import com.fuint.business.tag.entity.TagCodeRecord; import com.fuint.business.tag.entity.TagCodeRecord;
import com.fuint.business.tag.service.OilTagService; import com.fuint.business.tag.service.OilTagService;
import com.fuint.business.tag.service.TagCodeRecordService; import com.fuint.business.tag.service.TagCodeRecordService;
import com.fuint.business.tag.service.TagCodeService;
import com.fuint.business.tag.vo.TagCodeRecordVO; import com.fuint.business.tag.vo.TagCodeRecordVO;
import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.AccountInfo;
import com.fuint.common.service.StaffService; import com.fuint.common.service.StaffService;
@ -51,6 +52,9 @@ public class TagCodeRecordServiceImpl extends ServiceImpl<TagCodeRecordMapper, T
@Resource @Resource
private ILJStaffService mtStaffService; private ILJStaffService mtStaffService;
@Resource
private TagCodeService tagCodeService;
@Override @Override
@Transactional @Transactional
public boolean add(TagCodeRecordDTO tagCodeRecordDTO) { public boolean add(TagCodeRecordDTO tagCodeRecordDTO) {
@ -59,6 +63,18 @@ public class TagCodeRecordServiceImpl extends ServiceImpl<TagCodeRecordMapper, T
TagCodeRecord tagCodeRecord = new TagCodeRecord(); TagCodeRecord tagCodeRecord = new TagCodeRecord();
if (ObjectUtils.isNotEmpty(tagCodeRecordDTO) && CollectionUtils.isNotEmpty(tagCodeRecordDTO.getOilTagList())){ if (ObjectUtils.isNotEmpty(tagCodeRecordDTO) && CollectionUtils.isNotEmpty(tagCodeRecordDTO.getOilTagList())){
for (Integer integer : tagCodeRecordDTO.getOilTagList()) { for (Integer integer : tagCodeRecordDTO.getOilTagList()) {
//码牌配置
OilTag byId = oilTagService.getById(integer);
//二维码id
Integer tagCodeId = byId.getTagCodeId();
//二维码
TagCode byId1 = tagCodeService.getById(tagCodeId);
String collection = byId1.getCollection();
collection += "&storeId=" + tagCodeRecordDTO.getStoreId();
byId1.setCollection(collection);
tagCodeService.updateById(byId1);
OilTag oilTag = new OilTag(); OilTag oilTag = new OilTag();
//码牌绑定店铺 //码牌绑定店铺
tagCodeRecord.setOilTagId(integer); tagCodeRecord.setOilTagId(integer);