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-07 13:52:15 +08:00
parent 87732aaa2c
commit 805738c584
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java
View File

@ -127,12 +127,12 @@ public class CardFuelDieselController extends BaseController {
/**
* 删除数据
*
* @param idList 主键结合
* @param id 主键结合
* @return 删除结果
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
return getSuccessResult(this.cardFuelDieselService.removeByIds(idList));
@DeleteMapping("/{id}")
public ResponseObject delete(@PathVariable("id") Long id) {
return getSuccessResult(this.cardFuelDieselService.removeById(id));
}
/**

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/entity/CardGift.java
View File

@ -65,6 +65,8 @@ public class CardGift extends Model<CardGift> {
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveTimeStart;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date useTime;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveTimeEnd;

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

@ -199,7 +199,7 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
queryWrapper.eq(CardGift::getActivateStatus,"0");
//验证兑换卡的卡密
CardGift one = getOne(queryWrapper);
if (!one.getSailStatus().equals("1")){
if (one.getSailStatus().equals("1") || one.getUseStatus().equals("1")){
return cardGift;
}
if (ObjectUtils.isNotEmpty(one) && ObjectUtils.isNotEmpty(cardGift.getCardPassword()) && cardGift.getCardPassword().equals(one.getCardPassword())){
@ -208,6 +208,7 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
String mobile = ljUserVo.getMobile();
one.setRemark("姓名："+name+"，手机号："+mobile);
one.setUseStatus("1");
one.setUseTime(new Date());
updateById(one);
//更新用户余额
Double cardAmount = one.getCardAmount();