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

111

Browse Source
This commit is contained in:
齐天大圣 2024-01-20 10:44:36 +08:00
parent 6c1257e605
commit 397108077b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelDieselMapper; import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelDieselMapper;
import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel; import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel;
import com.fuint.business.marketingActivity.cardFule.service.CardFuelDieselService; import com.fuint.business.marketingActivity.cardFule.service.CardFuelDieselService;
import com.fuint.business.petrolStationManagement.entity.OilName;
import com.fuint.business.petrolStationManagement.service.OilNameService; import com.fuint.business.petrolStationManagement.service.OilNameService;
import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil; import com.fuint.common.util.TokenUtil;
@ -110,6 +111,8 @@ public class CardFuelDieselServiceImpl extends ServiceImpl<CardFuelDieselMapper,
List<CardFuelDiesel> records = page1.getRecords(); List<CardFuelDiesel> records = page1.getRecords();
ArrayList<CardFuelDiesel> cardFuelDiesels = new ArrayList<>(); ArrayList<CardFuelDiesel> cardFuelDiesels = new ArrayList<>();
for (CardFuelDiesel record : records) { for (CardFuelDiesel record : records) {
OilName oilName = oilNameService.selectOilNameById(Integer.parseInt(record.getOilType()));
record.setOilType(oilName.getOilName());
Date startTime = record.getStartTime(); Date startTime = record.getStartTime();
Date endTime = record.getEndTime(); Date endTime = record.getEndTime();
Date date = new Date(); Date date = new Date();

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
View File

@ -371,8 +371,8 @@
AND ad.STATUS = 0 AND ad.STATUS = 0
AND concat(',',ad.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',ad.adapt_oil,',') like concat('%',#{oilId},'%')
AND concat(',',ad.diesel_user_level,',') like concat('%',#{levelId},'%') AND concat(',',ad.diesel_user_level,',') like concat('%',#{levelId},'%')
HAVING sum(adr.id) <![CDATA[ < ]]> limitAcount
GROUP BY ad.id GROUP BY ad.id
HAVING IFNULL(sum(adr.id),0) <![CDATA[ < ]]> limitAcount
</select> </select>
<select id="selectActiveFule" resultType="com.fuint.business.marketingActivity.activeDiscount.vo.ActiveDiscountPayVO"> <select id="selectActiveFule" resultType="com.fuint.business.marketingActivity.activeDiscount.vo.ActiveDiscountPayVO">
@ -396,8 +396,8 @@
AND af.STATUS = 0 AND af.STATUS = 0
AND concat(',',af.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',af.adapt_oil,',') like concat('%',#{oilId},'%')
AND concat(',',af.diesel_user_level,',') like concat('%',#{levelId},'%') AND concat(',',af.diesel_user_level,',') like concat('%',#{levelId},'%')
HAVING sum(afr.id) <![CDATA[ < ]]> limitAcount
GROUP BY af.id GROUP BY af.id
HAVING IFNULL(sum(afr.id),0) <![CDATA[ < ]]> limitAcount
</select> </select>
<select id="selectActiveConsumption" resultType="com.fuint.business.marketingActivity.activeDiscount.vo.ActiveConsumptionVO"> <select id="selectActiveConsumption" resultType="com.fuint.business.marketingActivity.activeDiscount.vo.ActiveConsumptionVO">