diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 637f9991a..e04fa9dbe 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -407,6 +407,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { cardFuleOrders.setPayType(cardFuelRecordDTO.getPayType()); //用户信息 cardFuleOrders.setStoreId(cardFuelRecordDTO.getStoreId()); + cardFuleOrders.setChainStoreId(cardFuelRecordDTO.getChainStoreId()); cardFuleOrders.setMtUserId(ljUserVo.getId()); cardFuleOrders.setName(ljUserVo.getName()); cardFuleOrders.setMobile(ljUserVo.getMobile()); @@ -475,7 +476,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { cardFuleOrders.setPayTime(new Date()); cardFuleOrdersService.updateById(cardFuleOrders); //用户余额 - UserBalance userBalance = userBalanceService.selectUserBalanceByStorId(cardFuleOrders.getMtUserId(),cardFuleOrders.getStoreId()); + UserBalance userBalance = userBalanceService.selectUserBalance(cardFuleOrders.getMtUserId(),cardFuleOrders.getChainStoreId()); //用户 (新用户新建 老用户叠加) if (ObjectUtils.isNotEmpty(userBalance)){ //积分 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/entity/CardFuleOrders.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/entity/CardFuleOrders.java index 410509041..ef97d0abf 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/entity/CardFuleOrders.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/entity/CardFuleOrders.java @@ -28,6 +28,7 @@ public class CardFuleOrders extends Model { private String orderNo; //所属店铺ID private Integer storeId; + private Integer chainStoreId; //订单金额 private Double amount; //支付金额 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java index f79830b54..4a3543799 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java @@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; - -import java.io.Serializable; - +import lombok.Data; /** * 储值充值表(CardValueRecord)表实体类 * @@ -16,6 +14,7 @@ import java.io.Serializable; * @since 2023-10-31 11:30:10 */ @SuppressWarnings("serial") +@Data public class CardValueRecord extends Model { //主键id @TableId(type = IdType.AUTO) @@ -69,257 +68,14 @@ public class CardValueRecord extends Model { //更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - - - // 支付状态 private String payStatus; // 支付方式 private String paymentType; // 支付编号 private String paymentNo; - - // + //连锁店id private Integer chainStoreId; - public Integer getChainStoreId() { - return chainStoreId; - } - - public void setChainStoreId(Integer chainStoreId) { - this.chainStoreId = chainStoreId; - } - public String getPaymentNo() { - return paymentNo; - } - - public void setPaymentNo(String paymentNo) { - this.paymentNo = paymentNo; - } - - public String getPaymentType() { - return paymentType; - } - - public void setPaymentType(String paymentType) { - this.paymentType = paymentType; - } - - public Integer getStoreId() { - return storeId; - } - - public void setStoreId(Integer storeId) { - this.storeId = storeId; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getMtUserId() { - return mtUserId; - } - - public void setMtUserId(Integer mtUserId) { - this.mtUserId = mtUserId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public Integer getMtStaffId() { - return mtStaffId; - } - - public void setMtStaffId(Integer mtStaffId) { - this.mtStaffId = mtStaffId; - } - - public String getRealName() { - return realName; - } - - public void setRealName(String realName) { - this.realName = realName; - } - - public String getStaffMobile() { - return staffMobile; - } - - public void setStaffMobile(String staffMobile) { - this.staffMobile = staffMobile; - } - - public Integer getCardValueId() { - return cardValueId; - } - - public void setCardValueId(Integer cardValueId) { - this.cardValueId = cardValueId; - } - - public String getRechargeType() { - return rechargeType; - } - - public void setRechargeType(String rechargeType) { - this.rechargeType = rechargeType; - } - - public Double getAmount() { - return amount; - } - - public void setAmount(Double amount) { - this.amount = amount; - } - - public Double getBidBalance() { - return bidBalance; - } - - public void setBidBalance(Double bidBalance) { - this.bidBalance = bidBalance; - } - - public Double getRechargeBalance() { - return rechargeBalance; - } - - public void setRechargeBalance(Double rechargeBalance) { - this.rechargeBalance = rechargeBalance; - } - - public Double getGiftBalance() { - return giftBalance; - } - - public void setGiftBalance(Double giftBalance) { - this.giftBalance = giftBalance; - } - - public Integer getPoints() { - return points; - } - - public void setPoints(Integer points) { - this.points = points; - } - - public Integer getGrowthValue() { - return growthValue; - } - - public void setGrowthValue(Integer growthValue) { - this.growthValue = growthValue; - } - - public Integer getRefuelMoney() { - return refuelMoney; - } - - public void setRefuelMoney(Integer refuelMoney) { - this.refuelMoney = refuelMoney; - } - - public String getFringeBenefit() { - return fringeBenefit; - } - - public void setFringeBenefit(String fringeBenefit) { - this.fringeBenefit = fringeBenefit; - } - - public String getRoyaltyType() { - return royaltyType; - } - - public void setRoyaltyType(String royaltyType) { - this.royaltyType = royaltyType; - } - - public Double getPercentageCommissions() { - return percentageCommissions; - } - - public void setPercentageCommissions(Double percentageCommissions) { - this.percentageCommissions = percentageCommissions; - } - - public Double getAmountCommission() { - return amountCommission; - } - - public void setAmountCommission(Double amountCommission) { - this.amountCommission = amountCommission; - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public String getPayStatus() { - return payStatus; - } - - public void setPayStatus(String payStatus) { - this.payStatus = payStatus; - } - /** - * 获取主键值 - * - * @return 主键值 - */ - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 1fa733dc8..d3280652c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -154,6 +154,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(CardFavorableRecord::getId,cardValueOrders.getCardRecordId()); - lambdaQueryWrapper.eq(CardFavorableRecord::getStatus,"1");*/ cardFavorableRecordService.updateById(cardFavorableRecord); } //查询储值卡对应的优惠券列表 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java index a3e705b63..6cf9bfbec 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java @@ -28,6 +28,8 @@ public class CardValueOrders extends Model { private String orderNo; //所属店铺ID private Integer storeId; + //连锁店id + private Integer chainStoreId; //订单金额 private Double amount; //支付金额 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java index 92acad071..684073d98 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java @@ -101,7 +101,7 @@ public class UserBalanceServiceImpl extends ServiceImpl(); queryWrapper.eq("mt_user_id",nowAccountInfo.getId()); - queryWrapper.eq("store_id",userBalance.getStoreId()); + queryWrapper.eq("chain_store_id",userBalance.getChainStoreId()); UserBalance balance = baseMapper.selectOne(queryWrapper); return balance; } diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue index a2223063b..7ca55efd2 100644 --- a/gasStation-uni/pagesHome/MyCard/MyCard.vue +++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue @@ -56,8 +56,9 @@ 囤油卡 - {{cardsList[cardsIndex].type || '暂无囤油'}}:{{cardsList[cardsIndex].oilType || '0'}} + {{cardsList[cardsIndex].type || '暂无囤油'}}:{{cardsList[cardsIndex].oilName || '0'}} + 剩余油量：{{cardsList[cardsIndex].incomeLitres}}L