修改bug

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)){
             //积分

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/entity/CardFuleOrders.java

@@ -28,6 +28,7 @@ public class CardFuleOrders extends Model<CardFuleOrders> {
     private String orderNo;
     //所属店铺ID
     private Integer storeId;
+    private Integer chainStoreId;
     //订单金额
     private Double amount;
     //支付金额

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 lombok.Data;
-import java.io.Serializable;
-
 /**
  * 储值充值表(CardValueRecord)表实体类
  *
@@ -16,6 +14,7 @@ import java.io.Serializable;
  * @since 2023-10-31 11:30:10
  */
 @SuppressWarnings("serial")
+@Data
 public class CardValueRecord extends Model<CardValueRecord> {
     //主键id
     @TableId(type = IdType.AUTO)
@@ -69,257 +68,14 @@ public class CardValueRecord extends Model<CardValueRecord> {
     //更新时间
     @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;
-    }
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java

@@ -154,6 +154,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         cardValueOrders.setPayType(cardValueRecordDTO.getPayType());
         //用户信息
         cardValueOrders.setStoreId(cardValueRecordDTO.getStoreId());
+        cardValueOrders.setChainStoreId(cardValueRecordDTO.getChainStoreId());
         cardValueOrders.setMtUserId(ljUserVo.getId());
         cardValueOrders.setName(ljUserVo.getName());
         cardValueOrders.setMobile(ljUserVo.getMobile());
@@ -601,7 +602,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         cardValueOrders.setPayTime(new Date());
         cardValueOrdersService.updateById(cardValueOrders);
         //用户余额
-        UserBalance userBalance = userBalanceService.selectUserBalanceByStorId(cardValueOrders.getMtUserId(),cardValueOrders.getStoreId());
+        UserBalance userBalance = userBalanceService.selectUserBalance(cardValueOrders.getMtUserId(),cardValueOrders.getChainStoreId());
         //用户 (新用户新建 老用户叠加)
         if (ObjectUtils.isNotEmpty(userBalance)){
             //积分
@@ -620,7 +621,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             userBalanceService.updateUserBalance(userBalance);
         }else {
             userBalance1.setMtUserId(cardValueOrders.getMtUserId());
-            userBalance1.setStoreId(cardValueOrders.getStoreId());
+            userBalance1.setChainStoreId(cardValueOrders.getChainStoreId());
             //积分
             if (ObjectUtils.isNotEmpty(cardValueOrders.getPoints())){
                 userBalance1.setPoints(cardValueOrders.getPoints());
@@ -652,9 +653,6 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             CardFavorableRecord cardFavorableRecord = new CardFavorableRecord();
             cardFavorableRecord.setId(cardValueOrders.getCardRecordId());
             cardFavorableRecord.setStatus("1");
-            /*LambdaQueryWrapper<CardFavorableRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(CardFavorableRecord::getId,cardValueOrders.getCardRecordId());
-            lambdaQueryWrapper.eq(CardFavorableRecord::getStatus,"1");*/
             cardFavorableRecordService.updateById(cardFavorableRecord);
         }
         //查询储值卡对应的优惠券列表

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java

@@ -28,6 +28,8 @@ public class CardValueOrders extends Model<CardValueOrders> {
     private String orderNo;
     //所属店铺ID
     private Integer storeId;
+    //连锁店id
+    private Integer chainStoreId;
     //订单金额
     private Double amount;
     //支付金额

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java

@@ -101,7 +101,7 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         QueryWrapper queryWrapper = new QueryWrapper<>();
         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;
     }

gasStation-uni/pagesHome/MyCard/MyCard.vue

@@ -56,8 +56,9 @@
 				<view style="width: 100%;display: flex;align-items: center;justify-content: space-between; ">
 					<view class="bai-box">
 						<view class="title-card">囤油卡</view>
-						<view class="">{{cardsList[cardsIndex].type || '暂无囤油'}}:{{cardsList[cardsIndex].oilType || '0'}}
+						<view class="">{{cardsList[cardsIndex].type || '暂无囤油'}}:{{cardsList[cardsIndex].oilName || '0'}}
 						</view>
+						<view>剩余油量：{{cardsList[cardsIndex].incomeLitres}}L</view>
 						<!-- <view style="lins"> **** **** **** 970 </view> -->
 					</view>
 					<!-- <view class="">
@@ -117,7 +118,7 @@
 		data() {
 			return {
 				query: {
-					storeId: '',
+					chainStoreId: '',
 					couponType: '',
 					useStatus: 0,
 					pageNo: 1,
@@ -134,8 +135,8 @@
 
 		},
 		onShow() {
-			this.query.storeId = uni.getStorageSync("storeId")
+			this.query.chainStoreId = uni.getStorageSync('chainStoreId');
-			this.getCardFuleRecords();
+			// this.getCardFuleRecords();
 			this.getUserBalance()
 		},
 		methods: {
@@ -176,12 +177,7 @@
 					if (res.code == 200) {
 						this.cardsList = res.data.records
 
-						if (this.cardsList.length != 0) {
-							this.toil = this.cardsList.length - 1
 
-						} else {
-							this.toil = this.cardsList.length
-						}
 						console.log(this.toil);
 					}
 				})
@@ -195,6 +191,13 @@
 					console.log(res)
 					if (res.code == 200) {
 						this.cardBalance = res.data.cardBalance
+						this.cardsList = JSON.parse(res.data.refuelMoney)
+						if (this.cardsList.length != 0) {
+							this.toil = this.cardsList.length - 1
+
+						} else {
+							this.toil = this.cardsList.length
+						}
 					}
 				})
 			},

gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue

@@ -149,6 +149,7 @@
 	export default {
 		data() {
 			return {
+				chainStoreId: '',
 				cardRecordId: '',
 				cardFavorableId: '',
 				storeId: '',
@@ -197,7 +198,9 @@
 		},
 		components: {},
 		onLoad(option) {
-			this.storeId = uni.getStorageSync("storeId")
+			this.storeId = uni.getStorageSync("storeId");
+			this.chainStoreId = uni.getStorageSync('chainStoreId');
+			console.log("66666666666", this.chainStoreId);
 			this.actinput = option.id
 			this.cardFavorableId = option.cardFavorableId
 			this.cardRecordId = option.cardRecordId
@@ -239,6 +242,7 @@
 						mtStaffId: this.staffId,
 						id: this.carValueId,
 						storeId: this.storeId,
+						chainStoreId: this.chainStoreId,
 						cardFavorableId: this.cardFavorableId,
 						cardRecordId: this.cardRecordId
 					},
@@ -294,6 +298,7 @@
 						mtStaffId: this.staffId,
 						id: this.carValueId,
 						storeId: this.storeId,
+						chainStoreId: this.chainStoreId,
 						cardFavorableId: this.cardFavorableId,
 						cardRecordId: this.cardRecordId
 					},