diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java index 9f5e8046d..33a660fd7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java @@ -11,6 +11,8 @@ import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.service.AllOrderInfoService; import com.fuint.business.order.vo.AllOrderInfoVo; +import com.fuint.business.storeInformation.entity.LJStore; +import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.common.dto.AccountInfo; @@ -36,6 +38,9 @@ public class CardValueOrdersServiceImpl extends ServiceImpl queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(TagCodeRecord::getOilTagId,oilTagId); TagCodeRecord one = tagCodeRecordService.getOne(queryWrapper1); + OilTagVO oilTagVO = new OilTagVO(); BeanUtils.copyProperties(record,oilTagVO); if (ObjectUtils.isNotEmpty(one)){ oilTagVO.setStoreName(one.getStoreName()); + if (ObjectUtils.isNotEmpty(one.getStaffName())){ + oilTagVO.setMtStatus("1"); + oilTagVO.setStaffName(one.getStaffName()); + } } - oilTagVOArrayList.add(oilTagVO); } page1.setRecords(oilTagVOArrayList); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java index 7ca2ff7e2..82ef5b375 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java @@ -9,4 +9,5 @@ import java.io.Serializable; public class OilTagVO extends OilTag implements Serializable { //店铺名字 private String storeName; + private String staffName; }