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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-13 16:43:59 +08:00
commit f16f8ff79a
2 changed files with 6 additions and 0 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/controller/CardFuelDieselController.java
View File

@ -228,6 +228,9 @@ public class CardFuelDieselController extends BaseController {
} }
activeApplet.setPoints(cardFuelDiesel.getPoints()); activeApplet.setPoints(cardFuelDiesel.getPoints());
if (cardFuelDiesel.getActiveStatus().equals("1")) activeApplet.setActiveStatus("2");
if (cardFuelDiesel.getActiveStatus().equals("0")) activeApplet.setActiveStatus("1");
activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1");
activeAppletService.updateById(activeApplet); activeAppletService.updateById(activeApplet);
return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel)); return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel));
} }

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java
View File

@ -2,6 +2,8 @@ package com.fuint.business.marketingActivity.cardFule.entity;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.repository.model.base.BaseEntity; import com.fuint.repository.model.base.BaseEntity;
import lombok.Data; import lombok.Data;
@ -18,6 +20,7 @@ public class CardFuelRecord extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(type = IdType.AUTO)
private Integer id; private Integer id;
private Integer oilNumberId; private Integer oilNumberId;