diff --git a/fuintAdmin/src/api/staff/user/usergrade.js b/fuintAdmin/src/api/staff/user/usergrade.js
index c65baa530..391d73108 100644
--- a/fuintAdmin/src/api/staff/user/usergrade.js
+++ b/fuintAdmin/src/api/staff/user/usergrade.js
@@ -24,6 +24,13 @@ export function getUserGrade(id) {
     method: 'get'
   })
 }
+// 查询会员等级详细
+export function getUserGradeInfo(id) {
+  return request({
+    url: '/business/userManager/userGrade/userGradeInfo/' + id,
+    method: 'get'
+  })
+}
 
 // 根据会员等级名称查询会员等级信息
 export function queryUserGrade(data) {
diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue
index bbc20cd15..4dd56c538 100644
--- a/fuintAdmin/src/views/convenienceStore/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/index.vue
@@ -372,10 +372,15 @@ export default {
           }
           if (this.form.id) {
             updateCevGood(this.form).then(response => {
-              this.$modal.msgSuccess("分类更新成功");
-              this.open = false;
-              this.getList();
-              this.getFirstMenu();
+              if (response.data==1){
+                this.$modal.msgSuccess("分类更新成功");
+                this.open = false;
+                this.getList();
+                this.getFirstMenu();
+              }else {
+                this.$modal.msgError("分类名称已存在，修改失败");
+              }
+
             });
           } else {
             insertCvsGoods(this.form).then(response => {
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index f40b6f868..e4017afff 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -174,7 +174,7 @@
         <el-table-column label="会员号" align="center" prop="userNo" width="150"/>
         <el-table-column label="名称" align="center" prop="name" >
           <template slot-scope="scope">
-            <span style="color: #409EFF;cursor: pointer  " @click="goDedi(scope.row.id)">{{ scope.row.name }}</span>
+            <span style="color: #409EFF;cursor: pointer  " @click="goDedi(scope.row.id)">{{ scope.row.name ? scope.row.name : "--" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="手机号" align="center" prop="mobile" width="110">
diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index 51a33a9f3..d496d3b35 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -17,7 +17,7 @@
             <img v-if="form.avatar" :src="baseUrl+form.avatar" style="width: 80px;height: 80px;border-radius: 50%">
             <img v-else src="@/assets/images/avatar.png" style="width: 80px;height: 80px">
           </div>
-          <el-button type="warning" plain round size="mini" style="margin: 10px" @click="bindIdCard">绑定实体卡</el-button><br>
+<!--          <el-button type="warning" plain round size="mini" style="margin: 10px" @click="bindIdCard">绑定实体卡</el-button><br>-->
           <el-button type="primary" icon="el-icon-bank-card" round style="margin: 10px;width: 50%;height: 40px" @click="userRecharge">会员充值</el-button>
         </div>
         <div class="right">
@@ -28,20 +28,20 @@
             <el-descriptions-item label="会员昵称">
               <span style="color: #00afff" @click="changeName">{{form.name ? form.name : "--"}}</span>
             </el-descriptions-item>
-            <el-descriptions-item label="实体卡号">{{form.idcard ? form.idcard : "--"}}</el-descriptions-item>
+<!--            <el-descriptions-item label="实体卡号">{{form.idcard ? form.idcard : "&#45;&#45;"}}</el-descriptions-item>-->
 <!--            <el-descriptions-item label="绑定信息">&#45;&#45;</el-descriptions-item>-->
             <el-descriptions-item label="会员状态">
               <dict-tag :options="dict.type.zhzt" :value="form.status"/>
             </el-descriptions-item>
             <el-descriptions-item label="加油次数">{{form.consumeNum}}</el-descriptions-item>
             <el-descriptions-item label="加油总金额">{{form.refuelMoney ? form.refuelMoney : "--"}}</el-descriptions-item>
-            <el-descriptions-item label="所属油站">{{ store.name }}</el-descriptions-item>
+<!--            <el-descriptions-item label="所属油站">{{ store.name }}</el-descriptions-item>-->
             <el-descriptions-item label="注册时间">{{form.createTime}}</el-descriptions-item>
-            <el-descriptions-item label="关联副卡">
-              <span style="color: #00afff" @click="secondCard">副卡管理</span>
+            <el-descriptions-item label="关联子卡">
+              <span style="color: #00afff" @click="subCard">子卡管理</span>
             </el-descriptions-item>
             <el-descriptions-item label="会员等级">
-              {{ grade.name }}
+              {{ grade ? grade.name : "--" }}
             </el-descriptions-item>
 <!--            <el-descriptions-item label="储值优惠">&#45;&#45;</el-descriptions-item>-->
 <!--            <el-descriptions-item label="每日笔数">-->
@@ -263,7 +263,10 @@
                   <div style="display: flex;margin: 20px 0">
                     <div style="width: 7%">支付方式</div>
                     <div>
-                      <el-radio v-for="dict in payList" v-model="cardValueForm.paymentType" :key="dict.dictValue" :label="dict.dictValue" :value="dict.dictValue" border >{{ dict.dictLabel }}</el-radio>
+                      <el-radio v-for="dict in payList" v-model="cardValueForm.paymentType" v-if="dict.dictValue!='APPLET_CODE'"
+                                :key="dict.dictValue" :label="dict.dictValue" :value="dict.dictValue" border >
+                        {{ dict.dictLabel }}
+                      </el-radio>
                     </div>
                   </div>
                 </el-col>
@@ -681,7 +684,7 @@
 <script>
 import {getUser, updateUser} from "@/api/staff/user/user";
 import {ljStoreInfo} from "@/api/staff/store";
-import {getUserGrade} from "@/api/staff/user/usergrade";
+import {getUserGrade, getUserGradeInfo} from "@/api/staff/user/usergrade";
 import {getList} from "@/api/EventMarketing/oilBlock";
 import {getCountOilTypeApi,getCardValueListApi,getPrepaidCardTopUpApi,getCheckTheStatusOfYourPaymentApi,getDicts,getPrepaidFuelTopUpApi,getCheckTheStatusOfYourPaymentByFuelApi} from "@/api/EventMarketing/cardSet";
 import {getSysConfig} from "@/api/staff/user/sysconfig";
@@ -733,7 +736,7 @@ export default {
         points:'', //赠送积分
         growthValue:'', // 赠送成长值
         remark:'',
-        paymentType:'', // 支付方式
+        paymentType:'WECHAT', // 支付方式
         royaltyType: '',// 提成类型
         percentageCommissions:null,
         amountCommission:null,
@@ -750,7 +753,7 @@ export default {
         points:'',
         remark:'',
         rechargeBalance:'', //实际支付
-        paymentType:'',
+        paymentType:'WECHAT',
         oilType:'',
         type:'',
         chainStorId:'',
@@ -854,6 +857,7 @@ export default {
     this.getUserInfo();
     this.getInformation();
     this.getFixingLevelList();
+    this.getStore();
   },
   methods: {
     fixingLevelinfo(list,id){
@@ -1145,18 +1149,19 @@ export default {
         console.log(response.data)
         this.getGrade(response.data.gradeId);
       });
+    },
+    // 获取会员等级详情
+    getGrade(id){
+      getUserGradeInfo(id).then(response => {
+        this.grade = response.data;
+      });
+    },
+    getStore(){
       // 获取店铺详情
       ljStoreInfo().then(response => {
         this.store = response.data;
       });
     },
-    // 获取会员等级详情
-    getGrade(id){
-      getUserGrade(id).then(response => {
-        this.grade = response.data;
-      });
-    },
-
     // 选择余额充值金额
     rechargeCard(index,item){
       console.log("index",index)
@@ -1401,13 +1406,18 @@ export default {
         if (valid) {
           if (this.form.id) {
             updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.openMobile = false;
-              this.openName = false;
-              this.openConfig = false;
-              this.openLevel = false;
-              this.openBindIdCard = false;
-              this.getUserInfo();
+              if (response.data==1){
+                this.$modal.msgSuccess("修改成功");
+                this.openMobile = false;
+                this.openName = false;
+                this.openConfig = false;
+                this.openLevel = false;
+                this.openBindIdCard = false;
+                this.getUserInfo();
+              }else {
+                this.$modal.msgError("修改失败");
+              }
+
             });
           }
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
index 558ab004f..b1f09d808 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
@@ -99,8 +99,10 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
 
     @Override
     public int updateMerchStatus(MerchantConfig merchantConfig) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_use",1);
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
         List<MerchantConfig> list = baseMapper.selectList(queryWrapper);
         for (MerchantConfig config : list) {
             config.setIsUse("0");
@@ -112,7 +114,10 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
 
     @Override
     public int updateMerchIsOpen(String isOpenRule) {
-        List<MerchantConfig> list = baseMapper.selectList(null);
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        List<MerchantConfig> list = baseMapper.selectList(queryWrapper);
         int row = 0;
         for (MerchantConfig merchantConfig : list) {
             merchantConfig.setIsOpenRule(isOpenRule);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java
index fc5a45eb7..81f3ee1b9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java
@@ -26,7 +26,7 @@ public interface CvsGoodsMapper extends BaseMapper<CvsGoods> {
     List<CvsGoodsVo> selectCvsGoodsTreeList(CvsGoods goods);
 
     //根据id和name查找
-    List<CvsGoods> selectGoodsList(CvsGoods goods);
+    List<CvsGoods> selectGoodsList(@Param("goods") CvsGoods goods);
     void deleteByIdVo(Integer id);
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml
index 7b57603bb..ee78aef9d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml
@@ -14,14 +14,17 @@
     <select id="selectGoodsList" parameterType="com.fuint.business.convenienceSore.entity.CvsGoods" resultType="com.fuint.business.convenienceSore.entity.CvsGoods" >
         <include refid="selectCvsGoods"></include>
         <where>
-            <if test="pid != null">
-                and pid = #{pid}
+            <if test="goods.storeId != null and goods.storeId != ''">
+                and store_id = #{goods.storeId}
             </if>
-            <if test="name != null and name != ''">
-                and name = #{name}
+            <if test="goods.pid != null">
+                and pid = #{goods.pid}
             </if>
-            <if test="sorted != null and sorted != ''">
-                and sorted = #{sorted}
+            <if test="goods.name != null and goods.name != ''">
+                and name = #{goods.name}
+            </if>
+            <if test="goods.sorted != null and goods.sorted != ''">
+                and sorted = #{goods.sorted}
             </if>
         </where>
         order by sorted
@@ -52,7 +55,7 @@
             </if>
             <if test="goods.name != null and goods.name!= ''">
                 and pTable.name like concat('%',#{goods.name},'%')
-                or cTable.name like concat('%',#{goods.name},'%')
+                or cTable.name like concat('%',#{goods.name},'%') and cTable.store_id = #{goods.storeId}
             </if>
         </where>
         group by pTable.id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java
index ff242385c..cd753a100 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java
@@ -60,4 +60,12 @@ public interface CvsGoodsService extends IService<CvsGoods> {
      * @param goods
      */
     int updateCvsGood(CvsGoods goods);
+
+    /**
+     * 根据店铺id和分类名称查询分类信息
+     * @param name
+     * @param storeId
+     * @return
+     */
+    CvsGoods selectCvsGoodsByName(String name,Integer storeId);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
index bcd584750..1e5e46eac 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
@@ -1,6 +1,7 @@
 package com.fuint.business.convenienceSore.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,6 +32,8 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
      */
     @Transactional
     public int insertCvsGoods( CvsGoods cvsGoods){
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        cvsGoods.setStoreId(nowAccountInfo.getStoreId());
         //查找分类名称是否存在
         List<CvsGoods> cvsGoodsList = baseMapper.selectGoodsList(cvsGoods);
         if(CollectionUtil.isNotEmpty(cvsGoodsList)){
@@ -186,7 +189,19 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
      */
     @Override
     public int updateCvsGood(CvsGoods goods) {
-        int row = baseMapper.updateById(goods);
+        CvsGoods cvsGoods = this.selectCvsGoodsByName(goods.getName(), goods.getStoreId());
+        int row = 0;
+        if (ObjectUtil.isEmpty(cvsGoods)){
+            row = baseMapper.updateById(goods);
+        }
         return row;
     }
+
+    @Override
+    public CvsGoods selectCvsGoodsByName(String name, Integer storeId) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name",name);
+        queryWrapper.eq("store_id",storeId);
+        return baseMapper.selectOne(queryWrapper);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
index a685f1013..77a8e21b5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
@@ -64,7 +64,7 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
      * 根据用户id查询当前的储值卡信息
      * @return
      */
-    CardValueRecord selectCardValueRecordByUserId();
+    CardValueRecord selectCardValueRecordByUserId(Integer storeId,Integer userId);
 
     Map<String, String> orderStatistics(CardValueRecordDTO cardValueRecord);
 
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 53acb9eba..a478846d6 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
@@ -753,10 +753,14 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         }
 
     @Override
-    public CardValueRecord selectCardValueRecordByUserId() {
+    public CardValueRecord selectCardValueRecordByUserId(Integer storeId,Integer userId) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mt_user_id",nowAccountInfo.getId());
+        if (userId==null){
+            userId = nowAccountInfo.getId();
+        }
+        queryWrapper.eq("mt_user_id",userId);
+        queryWrapper.eq("store_id",storeId);
         queryWrapper.last("LIMIT 1");
         return baseMapper.selectOne(queryWrapper);
     }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java
index f914ac3dc..46b0ab1ee 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java
@@ -69,9 +69,9 @@ public class CardValudChildrensController extends BaseController {
      * 根据用户id查询子卡列表信息
      * @return
      */
-    @GetMapping("/list")
-    public ResponseObject list(){
-        return getSuccessResult(cardValudChildrensService.selectCardValudChildrensByUserId());
+    @GetMapping("/list/{storeId}")
+    public ResponseObject list(@PathVariable Integer storeId){
+        return getSuccessResult(cardValudChildrensService.selectCardValudChildrensByUserId(storeId));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/entity/CardValudChildrens.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/entity/CardValudChildrens.java
index cea8d6861..3567f93d4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/entity/CardValudChildrens.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/entity/CardValudChildrens.java
@@ -6,6 +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;
 
@@ -15,11 +16,16 @@ import java.io.Serializable;
  * @author makejava
  * @since 2023-12-18 15:59:36
  */
+@Data
 @SuppressWarnings("serial")
 public class CardValudChildrens extends Model<CardValudChildrens> {
     //主键id
     @TableId(type = IdType.AUTO)
     private Integer id;
+    //用户id
+    private Integer userId;
+    //店铺id
+    private Integer storeId;
     //主卡id
     private Integer cardValueId;
     //子卡手机号
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java
index 46347a5f7..96e8c6e26 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java
@@ -25,6 +25,14 @@ public interface CardValudChildrensService extends IService<CardValudChildrens>
      * 查询当前用户的子卡信息
      * @return
      */
-    List<CardValudChildrens> selectCardValudChildrensByUserId();
+    List<CardValudChildrens> selectCardValudChildrensByUserId(Integer storeId);
+
+    /**
+     * 根据店铺id和子卡手机号查询子卡信息
+     * @param mobile
+     * @param storeId
+     * @return
+     */
+    CardValudChildrens selectCardValueChildrenByMobileAndStoreId(String mobile,Integer storeId);
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java
index 6f85595b2..b5d7ffaaa 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java
@@ -8,6 +8,14 @@ import com.fuint.business.marketingActivity.cardValue.service.CardValueService;
 import com.fuint.business.marketingActivity.cardValueChildrens.mapper.CardValudChildrensMapper;
 import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens;
 import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService;
+import com.fuint.business.storeInformation.entity.LJStore;
+import com.fuint.business.storeInformation.service.ILJStoreService;
+import com.fuint.business.userManager.entity.LJUser;
+import com.fuint.business.userManager.entity.UserBalance;
+import com.fuint.business.userManager.service.LJUserService;
+import com.fuint.business.userManager.service.UserBalanceService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,9 +34,13 @@ import java.util.Map;
 @Service("cardValudChildrensService")
 public class CardValudChildrensServiceImpl extends ServiceImpl<CardValudChildrensMapper, CardValudChildrens> implements CardValudChildrensService {
     @Autowired
-    private CardValueRecordService cardValueRecordService;
+    private UserBalanceService userBalanceService;
+    @Autowired
+    private LJUserService userService;
     @Resource
     private CardValueService cardValueService;
+    @Autowired
+    private ILJStoreService storeService;
 
     /**
      * 新增数据
@@ -37,17 +49,19 @@ public class CardValudChildrensServiceImpl extends ServiceImpl<CardValudChildren
      */
     @Override
     public Map<String,String> add(CardValudChildrens cardValudChildrens) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Map<String,String> res = new HashMap<>();
         if (ObjectUtils.isNotEmpty(cardValudChildrens)){
-            CardValueRecord cardValueRecord = cardValueRecordService.selectCardValueRecordByUserId();
-            if (ObjectUtils.isNotEmpty(cardValudChildrens)){
-                if (cardValueRecord.getMobile().equals(cardValudChildrens.getCardChildPhones())){
+            LJUser user = userService.queryUserByUserId(nowAccountInfo.getId());
+            LJStore store = storeService.selectStoreByStoreId(cardValudChildrens.getStoreId());
+            UserBalance balance = userBalanceService.selectUserBalance(nowAccountInfo.getId(), store.getChainStoreId());
+                if (user.getMobile().equals(cardValudChildrens.getCardChildPhones())){
                     res.put("error","添加失败，子卡手机号不能与主卡手机号一样！");
                     return res;
                 }
-                cardValudChildrens.setCardValueId(cardValueRecord.getCardValueId());
+                cardValudChildrens.setCardValueId(balance.getId());
 
-                List<CardValudChildrens> list = this.selectCardValudChildrensByUserId();
+                List<CardValudChildrens> list = this.selectCardValudChildrensByUserId(cardValudChildrens.getStoreId());
                 if (list.size()>=2){
                     res.put("error","添加失败，最多只能添加两张子卡！");
                     return res;
@@ -55,7 +69,7 @@ public class CardValudChildrensServiceImpl extends ServiceImpl<CardValudChildren
                     boolean flag = false;
                     if (list.size() > 0) {
                         for (CardValudChildrens childrens : list) {
-                            if (childrens.getCardChildPhones().equals(cardValudChildrens)) {
+                            if (childrens.getCardChildPhones().equals(cardValudChildrens.getCardChildPhones())) {
                                 flag = true;
                             }
                         }
@@ -64,24 +78,35 @@ public class CardValudChildrensServiceImpl extends ServiceImpl<CardValudChildren
                         res.put("error", "添加失败，此手机号已存在！");
                         return res;
                     }
+                    cardValudChildrens.setUserId(nowAccountInfo.getId());
                     baseMapper.insert(cardValudChildrens);
                     res.put("success", "添加成功！");
                 }
-            }
         }
         return res;
     }
 
     @Override
-    public List<CardValudChildrens> selectCardValudChildrensByUserId() {
-        CardValueRecord cardValueRecord = cardValueRecordService.selectCardValueRecordByUserId();
+    public List<CardValudChildrens> selectCardValudChildrensByUserId(Integer storeId) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        LJStore store = storeService.selectStoreByStoreId(storeId);
+        UserBalance balance = userBalanceService.selectUserBalance(nowAccountInfo.getId(), store.getChainStoreId());
         List<CardValudChildrens> list = null;
-        if (ObjectUtils.isNotEmpty(cardValueRecord)){
+        if (ObjectUtils.isNotEmpty(balance)){
             QueryWrapper queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("card_value_id",cardValueRecord.getCardValueId());
+            queryWrapper.eq("card_value_id",balance.getId());
+            queryWrapper.eq("store_id",storeId);
             list = baseMapper.selectList(queryWrapper);
         }
         return list;
     }
+
+    @Override
+    public CardValudChildrens selectCardValueChildrenByMobileAndStoreId(String mobile, Integer storeId) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("card_child_phones",mobile);
+        queryWrapper.eq("store_id",storeId);
+        return baseMapper.selectOne(queryWrapper);
+    }
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CardValueChildOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CardValueChildOrderController.java
new file mode 100644
index 000000000..36a9745af
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CardValueChildOrderController.java
@@ -0,0 +1,34 @@
+package com.fuint.business.order.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.service.CardValueChildOrderService;
+import com.fuint.business.order.vo.CardValueChildOrderVo;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("business/order/cardValueChildOrder")
+public class CardValueChildOrderController extends BaseController {
+    @Autowired
+    private CardValueChildOrderService cardValueChildOrderService;
+
+    /**
+     * 根据条件分页查询子卡交易订单信息
+     * @param cardValueChildOrderVo
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/list")
+    public ResponseObject list(CardValueChildOrderVo cardValueChildOrderVo,
+                               @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                               @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        return getSuccessResult(cardValueChildOrderService.selectCardValueChildOrderList(page,cardValueChildOrderVo));
+    }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java
new file mode 100644
index 000000000..4cb9fa996
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java
@@ -0,0 +1,78 @@
+package com.fuint.business.order.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.framework.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 子卡交易订单表(CardValueChildOrder)实体类
+ */
+@Data
+@TableName("card_value_child_order")
+@ApiModel(value = "CardValueChildOrder对象", description = "子卡交易订单表")
+public class CardValueChildOrder extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    @ApiModelProperty("自增ID")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 储值卡id
+     */
+    private Integer cardValueId;
+    /**
+     * 子卡id
+     */
+    private Integer cardValueChildId;
+    /**
+     * 用户id
+     */
+    private Integer userId;
+    /**
+     * 店铺id
+     */
+    private Integer storeId;
+    /**
+     * 连锁店id
+     */
+    private Integer chainStoreId;
+    /**
+     * 订单号
+     */
+    private String orderNo;
+    /**
+     * 订单金额
+     */
+    private Double amount;
+    /**
+     * 优惠金额
+     */
+    private Double discount;
+    /**
+     * 支付金额
+     */
+    private Double payAmount;
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+    /**
+     * 用户备注
+     */
+    private String remark;
+    /**
+     * 订单状态
+     */
+    private String status;
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardValueChildOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardValueChildOrderMapper.java
new file mode 100644
index 000000000..88f029477
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardValueChildOrderMapper.java
@@ -0,0 +1,18 @@
+package com.fuint.business.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.entity.CardValueChildOrder;
+import com.fuint.business.order.vo.CardValueChildOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+public interface CardValueChildOrderMapper extends BaseMapper<CardValueChildOrder> {
+    /**
+     * 根据条件分页查询子卡订单信息
+     * @param page
+     * @param cardValueChildOrderVo
+     * @return
+     */
+    IPage<CardValueChildOrderVo> selectCardValueChildOrderList(Page page,@Param("order") CardValueChildOrderVo cardValueChildOrderVo);
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardValueChildOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardValueChildOrderMapper.xml
new file mode 100644
index 000000000..091099780
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardValueChildOrderMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.order.mapper.CardValueChildOrderMapper">
+
+    <select id="selectCardValueChildOrderList" resultType="com.fuint.business.order.vo.CardValueChildOrderVo">
+        select cvco.*,cvc.card_child_phones from card_value_child_order cvco left join card_valud_childrens cvc on cvco.card_value_child_id = cvc.id
+        <where>
+            <if test="order.storeId != null and order.storeId != ''">
+                and cvco.store_id = #{order.storeId}
+            </if>
+            <if test="order.cardChildPhones != null and order.cardChildPhones != ''">
+                and cvc.card_child_phones = #{order.cardChildPhones}
+            </if>
+            order by cvco.pay_time desc
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardValueChildOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardValueChildOrderService.java
new file mode 100644
index 000000000..27a5ae128
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardValueChildOrderService.java
@@ -0,0 +1,37 @@
+package com.fuint.business.order.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.entity.CardValueChildOrder;
+import com.fuint.business.order.vo.CardValueChildOrderVo;
+
+public interface CardValueChildOrderService {
+    /**
+     * 根据条件分页查询子卡订单信息
+     * @param page
+     * @param cardValueChildOrderVo
+     * @return
+     */
+    IPage<CardValueChildOrderVo> selectCardValueChildOrderList(Page page, CardValueChildOrderVo cardValueChildOrderVo);
+
+    /**
+     * 根据订单号查询子卡消费订单信息
+     * @param orderNo
+     * @return
+     */
+    CardValueChildOrder selectCardValueChildOrderByOrderNo(String orderNo);
+
+    /**
+     * 添加储值卡子卡订单信息
+     * @param cardValueChildOrder
+     * @return
+     */
+    int insertCardValueChildOrder(CardValueChildOrder cardValueChildOrder);
+
+    /**
+     * 修改储值卡子卡订单信息
+     * @param cardValueChildOrder
+     * @return
+     */
+    int updateCardValueChildOrder(CardValueChildOrder cardValueChildOrder);
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardValueChildOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardValueChildOrderServiceImpl.java
new file mode 100644
index 000000000..4ade49efb
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardValueChildOrderServiceImpl.java
@@ -0,0 +1,57 @@
+package com.fuint.business.order.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens;
+import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService;
+import com.fuint.business.order.entity.CardValueChildOrder;
+import com.fuint.business.order.mapper.CardValueChildOrderMapper;
+import com.fuint.business.order.service.CardValueChildOrderService;
+import com.fuint.business.order.vo.CardValueChildOrderVo;
+import com.fuint.business.storeInformation.entity.LJStore;
+import com.fuint.business.storeInformation.service.ILJStoreService;
+import com.fuint.business.userManager.entity.LJUser;
+import com.fuint.business.userManager.service.LJUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CardValueChildOrderServiceImpl extends ServiceImpl<CardValueChildOrderMapper,CardValueChildOrder> implements CardValueChildOrderService {
+    @Autowired
+    private LJUserService userService;
+    @Autowired
+    private ILJStoreService storeService;
+    @Autowired
+    private CardValudChildrensService cardValudChildrensService;
+
+    @Override
+    public IPage<CardValueChildOrderVo> selectCardValueChildOrderList(Page page, CardValueChildOrderVo cardValueChildOrderVo) {
+        return baseMapper.selectCardValueChildOrderList(page,cardValueChildOrderVo);
+    }
+
+    @Override
+    public CardValueChildOrder selectCardValueChildOrderByOrderNo(String orderNo) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("order_no",orderNo);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+    public int insertCardValueChildOrder(CardValueChildOrder cardValueChildOrder) {
+        LJUser user = userService.queryUserByUserId(cardValueChildOrder.getUserId());
+        LJStore store = storeService.selectStoreByStoreId(cardValueChildOrder.getStoreId());
+        CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), cardValueChildOrder.getStoreId());
+
+        cardValueChildOrder.setCardValueId(cardValudChildrens.getCardValueId());
+        cardValueChildOrder.setCardValueChildId(cardValudChildrens.getId());
+        cardValueChildOrder.setChainStoreId(store.getChainStoreId());
+        return baseMapper.insert(cardValueChildOrder);
+    }
+
+    @Override
+    public int updateCardValueChildOrder(CardValueChildOrder cardValueChildOrder) {
+        return baseMapper.updateById(cardValueChildOrder);
+    }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index ef27d8ab9..d2e6d4d15 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -19,6 +19,8 @@ import com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord;
 import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelRecordMapper;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
+import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens;
+import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService;
 import com.fuint.business.member.mapper.LJStaffMapper;
 import com.fuint.business.order.entity.*;
 import com.fuint.business.order.mapper.LJOrderMapper;
@@ -701,7 +703,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     public Map<String, Object> appletPay(Map<String, String> map) {
         String orderNo = map.get("orderNo");
 //        支付金额
-        Integer payAmount = (int) (Double.valueOf(map.get("payAmount"))*100);
+        Double payAmount = Double.valueOf(map.get("payAmount"));
 //        优惠金额
         String discountAmount = map.get("discountAmount");
 //        囤油卡消费后的信息
@@ -714,12 +716,26 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         String balanceAmount = map.get("balanceAmount");
         Integer tankId = Integer.valueOf(map.get("tankId"));
 
+//        是否使用子卡消费
+        String isUseChildCard = map.get("isUseChildCard");
+
 //        根据订单号查询订单信息
         OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo);
 //        获取油品信息
         OilNumber oilNumber = oilNumberService.selectOilNumberByOilName(oilOrder.getOils(), oilOrder.getStoreId());
 
         boolean result = false;
+        Integer userId = oilOrder.getUserId();
+
+        if (isUseChildCard.equals("true")){
+            Map<String, Object> map1 = userService.queryUserByStoreId(oilOrder.getStoreId(), oilOrder.getUserId());
+            String isUseChild = map1.get("isUseChild").toString();
+            LJUserVo userVo = (LJUserVo) map1.get("userVo");
+            userId = userVo.getId();
+            if (!isUseChild.equals("yes")){
+                result = true;
+            }
+        }
 
         if (isOilStorageCard.equals("true")) {
 //            使用囤油卡
@@ -752,6 +768,13 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
 
         Map<String, Object> applet = new HashMap<>();
         applet.put("success","");
+
+//        判断是否使用储值卡消费
+        if (!balanceAmount.equals("0")){
+            this.insertCardBalance(Double.valueOf(balanceAmount),userId,oilOrder.getStoreId());
+        }
+
+//        判断是否需要调起支付
         if (!map.get("payAmount").equals("0")) {
 //        调用支付接口
 //            判断是否开启支付规则
@@ -759,15 +782,17 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
 //            if (list.size() > 0) {
 //                oilConfigService.oilRule();
 //            }
+
+            this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"unpaid", Double.valueOf(balanceAmount),payAmount);
             //        处理支付需要的数据
             ReceiveParameter receiveParameter = new ReceiveParameter();
             receiveParameter.setOrderNo(orderNo);
             receiveParameter.setType("1");
             receiveParameter.setContent("油品订单");
-            receiveParameter.setGoodsMoney(oilOrder.getOrderAmount());
+            receiveParameter.setGoodsMoney(Double.valueOf(map.get("payAmount")));
             receiveParameter.setStoreId(oilOrder.getStoreId());
             receiveParameter.setPayType(oilOrder.getPayType());
-            receiveParameter.setUserId(oilOrder.getUserId());
+            receiveParameter.setUserId(userId);
             //        调用支付接口
             try {
                 applet = fyPayService.applet(receiveParameter);
@@ -776,33 +801,84 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                 e.printStackTrace();
             }
         }else {
-            this.updateGrowthValue(Double.valueOf(payAmount),oilOrder.getUserId(), Integer.valueOf(oilOrder.getOils()),oilCardAmount,oilOrder.getStoreId());
+            this.updateGrowthValue(payAmount,userId, Integer.valueOf(oilOrder.getOils()),oilCardAmount,oilOrder.getStoreId());
             this.addOilTracks(oilOrder,oilOrder.getStoreId());
-            this.insertCardBalance(Double.valueOf(balanceAmount),oilOrder.getUserId(),oilOrder.getStoreId());
-            oilOrder.setPayAmount(Double.valueOf(payAmount));
+            this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount);
+            oilOrder.setPayAmount(payAmount);
             oilOrder.setDiscountAmount(Double.valueOf(discountAmount));
             oilOrder.setPayTime(new Date());
             oilOrder.setOrderStatus("paid");
             baseMapper.updateById(oilOrder);
             applet.put("success","ok");
         }
+
+//        修改订单的优惠金额和支付金额
+        oilOrder.setDiscountAmount(Double.valueOf(discountAmount));
+        oilOrder.setPayAmount(payAmount);
+        this.updateOilOrder(oilOrder);
+
         return applet;
     }
 
+    @Autowired
+    CardValueChildOrderService cardValueChildOrderService;
+
+    /**
+     * 添加储值卡子卡订单信息
+     * @param userId 用户id
+     * @param storeId 店铺id
+     * @param orderNo 订单号
+     * @param amount 订单金额
+     * @param payStatus 支付状态
+     * @param cardAmount 储值卡消费金额
+     * @param payAmount 其他支付方式消费金额
+     */
+    private void insertCardOrder(Integer userId,Integer storeId,String orderNo,Double amount,String payStatus,Double cardAmount,Double payAmount){
+        CardValueChildOrder cardValueChildOrder = new CardValueChildOrder();
+        cardValueChildOrder.setUserId(userId);
+        cardValueChildOrder.setStoreId(storeId);
+        cardValueChildOrder.setOrderNo(orderNo);
+        cardValueChildOrder.setAmount(amount);
+        cardValueChildOrder.setStatus(payStatus);
+        cardValueChildOrder.setPayAmount(amount);
+        cardValueChildOrder.setRemark("储值卡消费"+cardAmount+"元，其他支付方式消费"+payAmount+"元");
+        if ("paid".equals(payStatus)){
+            cardValueChildOrder.setPayTime(new Date());
+        }
+        cardValueChildOrderService.insertCardValueChildOrder(cardValueChildOrder);
+    }
+
+    @Autowired
+    private CardValudChildrensService cardValudChildrensService;
+
     @Override
     public int updateOrderStatus(String orderNo, String status) {
         int row = 0;
         OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo);
+        Integer userId = oilOrder.getUserId();
+        LJUser user = userService.queryUserByUserId(userId);
         if (ObjectUtil.isNotEmpty(oilOrder)){
-            oilOrder.setPayAmount(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount());
+//            oilOrder.setPayAmount(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount());
             oilOrder.setOrderStatus(status);
             if (status.equals("paid")){
                 oilOrder.setPayTime(new Date());
-                this.updateGrowthValue(oilOrder.getPayAmount(),oilOrder.getUserId(), Integer.valueOf(oilOrder.getOils()),null,oilOrder.getStoreId());
+                CardValueChildOrder cardValueChildOrder = cardValueChildOrderService.selectCardValueChildOrderByOrderNo(orderNo);
+                if (ObjectUtil.isNotEmpty(cardValueChildOrder)){
+                    cardValueChildOrder.setStatus("paid");
+                    cardValueChildOrder.setPayTime(new Date());
+                    cardValueChildOrderService.updateCardValueChildOrder(cardValueChildOrder);
+
+//                    查询主卡信息
+                    CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), oilOrder.getStoreId());
+                    userId = cardValudChildrens.getUserId();
+                }
+                this.updateGrowthValue(oilOrder.getPayAmount(),userId, Integer.valueOf(oilOrder.getOils()),null,oilOrder.getStoreId());
                 CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
                 if (ObjectUtil.isNotEmpty(cashierOrder)){
                     cashierOrder.setPayTime(new Date());
                     cashierOrder.setStatus("paid");
+                    cashierOrder.setOilDiscountAmount(oilOrder.getDiscountAmount());
+                    cashierOrder.setPayAmount(oilOrder.getPayAmount());
                     cashierOrderService.updateCashierOrder(cashierOrder);
                 }
             }
@@ -955,8 +1031,14 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         }
     }
 
+    /**
+     * 修改余额信息
+     * @param amount
+     * @param userId
+     * @param storeId
+     */
     private void insertCardBalance(Double amount,Integer userId,Integer storeId){
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+//        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         //        根据用户id查询用户余额信息
         LJStore store = storeService.selectStoreByStoreId(storeId);
         UserBalance balance = userBalanceService.selectUserBalance(userId,store.getChainStoreId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardValueChildOrderVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardValueChildOrderVo.java
new file mode 100644
index 000000000..a86ddfced
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardValueChildOrderVo.java
@@ -0,0 +1,9 @@
+package com.fuint.business.order.vo;
+
+import com.fuint.business.order.entity.CardValueChildOrder;
+import lombok.Data;
+
+@Data
+public class CardValueChildOrderVo extends CardValueChildOrder {
+    private String cardChildPhones;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
index b547f876b..ab59629dd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
@@ -115,13 +115,15 @@ public class LJUserController extends BaseController {
 
     /**
      * 根据storeId查询会员信息
-     * @param storeId
+     * @param map
      * @return
      */
-    @GetMapping("/storeUser/{storeId}")
-    public ResponseObject userVoInfo(@PathVariable Integer storeId){
-        LJUserVo user = userService.queryUserByStoreId(storeId);
-        return getSuccessResult(user);
+    @PostMapping("/storeUser")
+    public ResponseObject userVoInfo(@RequestBody Map<String,String> map){
+        Integer storeId = Integer.valueOf(map.get("storeId"));
+        Integer userId = Integer.valueOf(map.get("userId"));
+        Map<String, Object> map1 = userService.queryUserByStoreId(storeId, userId);
+        return getSuccessResult(map1);
     }
 
     @GetMapping("/getByUniApp")
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java
index a3fdcc02e..0b82439c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.userManager.entity.LJUserGrade;
 import com.fuint.business.userManager.service.LJUserGradeService;
+import com.fuint.common.util.StringUtils;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import lombok.extern.slf4j.Slf4j;
@@ -67,12 +68,26 @@ public class LJUserGradeController extends BaseController {
     @GetMapping("/{id}")
     public ResponseObject userGradeInfo(@PathVariable String id){
         LJUserGrade userGrade = null;
-        if (id!=null && !id.equals("null")){
+        if (StringUtils.isNotEmpty(id)){
             userGrade = userGradeService.selectUserGradeById(Integer.parseInt(id));
         }
         return getSuccessResult(userGrade);
     }
 
+    /**
+     * 根据id查询当前店铺会员等级信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/userGradeInfo/{id}")
+    public ResponseObject userGradeInfo1(@PathVariable String id){
+        LJUserGrade userGrade = null;
+        if (StringUtils.isNotEmpty(id)){
+            userGrade = userGradeService.selectUserGradeByIdAndStoreId(Integer.parseInt(id));
+        }
+        return getSuccessResult(userGrade);
+    }
+
     /**
      * 根据id查询会员等级信息
      * @param map
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/CertifiedMemberService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/CertifiedMemberService.java
index 13adbcd48..3340525d9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/CertifiedMemberService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/CertifiedMemberService.java
@@ -46,11 +46,11 @@ public interface CertifiedMemberService extends IService<CertifiedMember> {
     public void deleteCertifiedMemberByFixingLevelId(int fixingLevelId);
 
     /**
-     * 根据会员手机号查询认证会员信息
-     * @param mobile
+     * 根据会员id和店铺id查询认证会员信息
+     * @param userId
      * @return
      */
-    public CertifiedMember selectCertifiedMemberByMobile(String mobile);
+    public CertifiedMember selectCertifiedMemberByUserIdAndStoreId(Integer userId,Integer storeId);
 
     /**
      * 根据id删除认证会员信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java
index 0bfbcc960..2c4ae4cf5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java
@@ -46,6 +46,13 @@ public interface LJUserGradeService extends IService<LJUserGrade> {
      */
     public LJUserGrade selectUserGradeById(int id);
 
+    /**
+     * 根据id和店铺id查询会员等级信息
+     * @param id
+     * @return
+     */
+    public LJUserGrade selectUserGradeByIdAndStoreId(int id);
+
     /**
      * 根据id查询会员等级信息是否可使用
      * @param userId
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
index cfbd733ec..9bf17e4cf 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
@@ -58,7 +58,7 @@ public interface LJUserService extends IService<LJUser> {
      * @param storeId
      * @return
      */
-    public LJUserVo queryUserByStoreId(int storeId);
+    public Map<String,Object> queryUserByStoreId(Integer storeId,Integer mobile);
 
     /**
      * 根据手机号和连锁店id查询会员信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java
index 4133b0f10..37a3c20a3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java
@@ -101,13 +101,14 @@ public class CertifiedMemberServiceImpl extends ServiceImpl<CertifiedMemberMappe
 
     /**
      * 根据会员手机号查询认证会员信息
-     * @param mobile
+     * @param userId
      * @return
      */
     @Override
-    public CertifiedMember selectCertifiedMemberByMobile(String mobile) {
+    public CertifiedMember selectCertifiedMemberByUserIdAndStoreId(Integer userId,Integer storeId) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mobile",mobile);
+        queryWrapper.eq("user_id",userId);
+        queryWrapper.eq("store_id",storeId);
         CertifiedMember certifiedMember = baseMapper.selectOne(queryWrapper);
         return certifiedMember;
     }
@@ -130,6 +131,9 @@ public class CertifiedMemberServiceImpl extends ServiceImpl<CertifiedMemberMappe
     public int insertCertifiedMember(CertifiedMember certifiedMember) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer storeId = nowAccountInfo.getStoreId();
+        if (certifiedMember.getStoreId()!=null){
+            storeId = certifiedMember.getStoreId();
+        }
         if (certifiedMember.getMobile()==null || certifiedMember.getMobile().equals("")){
             return 2;
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
index 89775c754..1800e49be 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
@@ -83,6 +83,15 @@ public class LJUserGradeServiceImpl extends ServiceImpl<LJUserGradeMapper, LJUse
         return baseMapper.selectById(id);
     }
 
+    @Override
+    public LJUserGrade selectUserGradeByIdAndStoreId(int id) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        queryWrapper.eq("id",id);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
     @Autowired
     private ILJStoreService storeService;
     @Autowired
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index 8a32922ce..281d16570 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -5,21 +5,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens;
+import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.userManager.entity.*;
 import com.fuint.business.userManager.mapper.CertifiedMemberMapper;
 import com.fuint.business.userManager.mapper.LJUserMapper;
 import com.fuint.business.userManager.mapper.MtInvitationMapper;
-import com.fuint.business.userManager.service.LJUserGradeService;
-import com.fuint.business.userManager.service.LJUserService;
-import com.fuint.business.userManager.service.MtInvitationService;
-import com.fuint.business.userManager.service.UserBalanceService;
+import com.fuint.business.userManager.service.*;
 import com.fuint.business.userManager.vo.LJUserVo;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.StringUtils;
 import com.fuint.common.util.TokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,7 +31,8 @@ import java.util.*;
 @Service
 public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> implements LJUserService {
     @Autowired
-    private CertifiedMemberMapper certifiedMemberMapper;
+    @Lazy
+    private CertifiedMemberService certifiedMemberService;
     @Autowired
     private UserBalanceService balanceService;
     @Autowired
@@ -130,11 +131,24 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
         return baseMapper.selectUserById(id);
     }
 
+    @Autowired
+    @Lazy
+    private CardValudChildrensService cardValudChildrensService;
+
     @Override
-    public LJUserVo queryUserByStoreId(int storeId) {
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+    public Map<String,Object> queryUserByStoreId(Integer storeId,Integer userId) {
+        Map<String,Object> map = new HashMap<>();
+        LJUser user = baseMapper.selectById(userId);
+        map.put("isUseChild","no");
+        CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), storeId);
+        if (ObjectUtil.isNotEmpty(cardValudChildrens)){
+            userId = cardValudChildrens.getUserId();
+            map.put("isUseChild","yes");
+        }
         LJStore store = storeService.selectStoreByStoreId(storeId);
-        return baseMapper.queryUserByChainStoreId(nowAccountInfo.getId(),store.getChainStoreId());
+        LJUserVo userVo = baseMapper.queryUserByChainStoreId(userId, store.getChainStoreId());
+        map.put("userVo",userVo);
+        return map;
     }
 
     @Override
@@ -327,8 +341,8 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
     @Override
     public int updateUser(LJUserVo userVo) {
         int row = 0;
-        LJUser user1 = this.selectUserByMobileAndUserId(userVo.getMobile(), userVo.getId());
-        if (ObjectUtil.isNotEmpty(user1)){
+        LJUser user1 = this.selectUserByMobile(userVo.getMobile());
+        if (ObjectUtil.isNotEmpty(user1) && user1.getId()!=userVo.getId()){
             row = 0;
             return row;
         }
@@ -349,13 +363,25 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
         user.setDescription(userVo.getDescription());
         user.setOfficial(userVo.getOfficial());
         row = baseMapper.updateById(user);
+
 //        修改认证会员手机号
-        CertifiedMember certifiedMember = new CertifiedMember();
-        certifiedMember.setUserId(userVo.getId());
-        certifiedMember.setMobile(userVo.getMobile());
-        QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",certifiedMember.getUserId());
-        certifiedMemberMapper.update(certifiedMember,queryWrapper);
+        CertifiedMember certifiedMember = certifiedMemberService.selectCertifiedMemberByUserIdAndStoreId(userVo.getId(), userVo.getStoreId());
+        if (ObjectUtil.isNotEmpty(certifiedMember)){
+            certifiedMember.setMobile(userVo.getMobile());
+            certifiedMember.setFixingLevelId(Integer.valueOf(userVo.getFixingLevel()));
+            certifiedMemberService.updateById(certifiedMember);
+        }else{
+            if (StringUtils.isNotEmpty(userVo.getFixingLevel())){
+                CertifiedMember certifiedMember1 = new CertifiedMember();
+                certifiedMember1.setUserId(userVo.getId());
+                certifiedMember1.setStoreId(userVo.getStoreId());
+                certifiedMember1.setName(userVo.getName());
+                certifiedMember1.setMobile(userVo.getMobile());
+                certifiedMember1.setFixingLevelId(Integer.valueOf(userVo.getFixingLevel()));
+                certifiedMember1.setStatus("enable");
+                certifiedMemberService.insertCertifiedMember(certifiedMember1);
+            }
+        }
 
 //        修改余额会员等级信息
         UserBalance balance = balanceService.selectUserBalanceByStorId(userVo.getId(),userVo.getStoreId());
diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index 278fbb219..d2f8073c9 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -206,7 +206,7 @@
 						this.user = res.data
 						uni.setStorageSync('userId', res.data.id)
 						this.user.mobile = res.data.mobile.slice(0, 3) + "****" + res.data.mobile.slice(res.data
-							.mobile.length - 5, res.data.mobile.length - 1)
+							.mobile.length - 4, res.data.mobile.length)
 					}
 				})
 			},
diff --git a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue
index c12a6d51b..fc7f69264 100644
--- a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue
+++ b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue
@@ -30,30 +30,84 @@
 					</view>
 				</view>
 			</view> -->
-			<view class="hong-card" v-for="item in list" :key="item.id">
-				<view class="top-hang">
-					<view class="hgang"></view>
-					<view class="">{{store.name}}{{store.description ? "("+store.description+")" : ""}}</view>
-				</view>
-				<view class="title-box">储值卡</view>
-				<view class="red-bottom">
-					<view class="x-size">
-						<view class="">子卡手机号</view>
-						<view class="">{{item.cardChildPhones}}</view>
+			<view v-if="tindex==0">
+				<view class="hong-card" v-for="item in list" :key="item.id" @click="toCheck(item.cardChildPhones)">
+					<view class="top-hang">
+						<view class="hgang"></view>
+						<view class="">{{store.name}}{{store.description ? "("+store.description+")" : ""}}</view>
 					</view>
-					<view class="r-anniu">
-						<span>去完成</span>
+					<view class="title-box">储值卡</view>
+					<view class="red-bottom">
+						<view class="x-size">
+							<view class="">子卡手机号</view>
+							<view class="">{{item.cardChildPhones}}</view>
+						</view>
+						<view class="r-anniu">
+							<span>去完成</span>
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="x_anniu" @click="goDetail()">
-				<uni-icons type="plusempty" color="#fff" size="30"></uni-icons>
+				<view class="x_anniu" @click="goDetail()">
+					<uni-icons type="plusempty" color="#fff" size="30"></uni-icons>
+				</view>
+
+				<u-empty v-if="list.length == 0" mode="coupon" text="内容为空"
+					icon="http://cdn.uviewui.com/uview/empty/coupon.png">
+				</u-empty>
 			</view>
 
-			<u-empty v-if="list.length == 0" mode="coupon" text="内容为空"
-				icon="http://cdn.uviewui.com/uview/empty/coupon.png">
-			</u-empty>
-
+			<view v-if="tindex==1">
+				<scroll-view scroll-y="true" :scroll-top="scrollTop" id="scrollList" style="height: 78vh;"
+					@scrolltolower="scrolltolower">
+					<!-- 油品订单列表 -->
+					<view class="box-order" v-for="(item,index) in orderList" :key="index">
+						<view class="or-box-top">
+							<view class="">{{store.name}}</view>
+							<!-- <view class="chengg">{{getPayName(payList,item.orderStatus)}}</view> -->
+							<view class="chengg" v-if="item.status=='paid'">已支付</view>
+							<view class="chengg" v-else-if="item.status=='payFail'">支付失败</view>
+							<view class="chengg" v-else>未支付</view>
+						</view>
+				
+						<!-- <view class="but-box">
+							<view class="huis">订单类型</view>
+							<view class="">油品订单</view>
+						</view> -->
+						<view class="but-box">
+							<view class="huis">订单金额</view>
+							<view class="">￥{{item.amount}}</view>
+						</view>
+						<view class="but-box">
+							<view class="huis">支付金额</view>
+							<view class="reds">￥{{item.payAmount}}</view>
+						</view>
+						<view class="but-box">
+							<view class="huis">订单时间</view>
+							<view class="" v-if="item.orderStatus=='paid'">{{parseTime(item.payTime)}}</view>
+							<view class="" v-else>{{item.createTime}}</view>
+						</view>
+						<view class="but-box">
+							<view class="huis">订单备注</view>
+							<view class="">{{item.remark}}</view>
+						</view>
+						<!-- <view v-if="item.orderStatus=='paid'" class="end-box" @click="goComment()">
+							<view class="anniu">
+								<text>评价有礼</text>
+							</view>
+						</view>
+						<view v-else-if="item.orderStatus=='unpaid'" class="end-box" @click="goPayment()">
+							<view class="anniu">
+								<text>去支付</text>
+							</view>
+						</view> -->
+					</view>
+					
+					<u-empty v-if="orderList.length == 0" mode="coupon" text="内容为空"
+						icon="http://cdn.uviewui.com/uview/empty/coupon.png">
+					</u-empty>
+				</scroll-view>
+			</view>
+			
 		</view>
 	</view>
 </template>
@@ -77,6 +131,15 @@
 				storeId: uni.getStorageSync("storeId"),
 				// 店铺信息
 				store:{},
+				scrollTop: 0,
+				orderList:[],
+				map:{
+					page:1,
+					pageSize:10,
+					storeId: uni.getStorageSync("storeId"),
+					cardChildPhones:'',
+				},
+				total:0,
 			}
 		},
 		onShow() {
@@ -87,6 +150,46 @@
 
 		},
 		methods: {
+			// 查询当前子卡手机号消费信息
+			toCheck(mobile){
+				this.map.cardChildPhones = mobile;
+				this.map.page = 1;
+				this.getMyOrder()
+				this.tindex = 1;
+			},
+			parseTime(dateTime) {
+				let date = new Date(dateTime);
+				let y = date.getFullYear() + "-";
+				let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-";
+				let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " ";
+				let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
+				let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
+				let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
+				return y + mon + d + h + m + s;
+			},
+			// 滚动区域
+			scrolltolower() {
+				if (this.orderList.length < this.total) {
+					this.map.page++;
+					this.getMyOrder()
+				}
+			},
+			getMyOrder(){
+				request({
+					url: "business/order/cardValueChildOrder/list",
+					method: 'get',
+					params:this.map,
+				}).then((res) => {
+					if (res.code == 200) {
+						if (this.map.page == 1) {
+							this.orderList = res.data.records
+						} else {
+							this.orderList = _this.orderList.concat(res.data.records)
+						}
+						this.total = res.data.total
+					}
+				})
+			},
 			// 获取当前店铺信息
 			getStore(){
 				request({
@@ -100,7 +203,7 @@
 			// 获取子卡信息
 			getCardValueChildren(){
 				request({
-					url: "cardValudChildrens/list",
+					url: "cardValudChildrens/list/"+this.storeId,
 					method: 'get',
 				}).then((res) => {
 					// console.log(res)
@@ -109,6 +212,13 @@
 			},
 			tapindex(index) {
 				this.tindex = index
+				console.log(index);
+				if (index==0){
+					this.getCardValueChildren()
+				}
+				if (index==1){
+					this.getMyOrder()
+				}
 			},
 			goDetail() {
 				uni.navigateTo({
@@ -259,4 +369,50 @@
 		justify-content: center;
 		background-color: #0000ff;
 	}
+	.box-order {
+		width: 95%;
+		border-radius: 8px;
+		background: #ffffff;
+		box-sizing: border-box;
+		padding: 10px;
+		margin: 10px auto;
+	}
+	
+	.or-box-top {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 5px 0px;
+		border-bottom: 1px solid #e5e5e5;
+	
+	}
+	
+	.chengg {
+		color: #1678ff;
+	}
+	.but-box {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 14px;
+		margin: 5px 0px;
+	}
+	
+	.reds {
+		color: red;
+	}
+	
+	.huis {
+		color: #666666;
+	}
+	
+	.end-box {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
 </style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/CardManagement/Detail.vue b/gasStation-uni/pagesMy/CardManagement/Detail.vue
index b0e9118b9..47162453a 100644
--- a/gasStation-uni/pagesMy/CardManagement/Detail.vue
+++ b/gasStation-uni/pagesMy/CardManagement/Detail.vue
@@ -30,6 +30,7 @@
 				title: '',
 				cardValueChildrens:{
 					cardChildPhones:"",
+					storeId:uni.getStorageSync("storeId"),
 				},
 			}
 		},
@@ -40,6 +41,7 @@
 		methods: {
 			// 添加子卡信息
 			submitCardValChildren(){
+				console.log(this.cardValueChildrens);
 				if(this.cardValueChildrens.cardChildPhones==""){
 					uni.showToast({
 						title:"请填写子卡手机号",
@@ -59,8 +61,8 @@
 					method: 'post',
 					data:this.cardValueChildrens,
 				}).then((res) => {
-					console.log(res)
-					if (res.data.error != null && res.data.error != undefined && res.data.error != ""){
+					// console.log(res)
+					if (res.data.error){
 						uni.showToast({
 							title:res.data.error,
 							icon:"none"
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index c95101387..1938d284a 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -51,7 +51,7 @@
 				<view class="desc" v-if="isStoreValueCard">
 					<view style="display: flex;">
 						储值卡
-						<span style="display: flex;">(余额：￥{{user.cardBalance}})</span>
+						<span style="display: flex;">(<span v-if="isUseChildCard">主卡</span>余额：￥{{user.cardBalance}})</span>
 					</view>
 					<view style="display: flex;">
 						<span style="margin-right: 10px;">-￥{{balanceRedece}}</span>
@@ -195,11 +195,12 @@
 					storeId:uni.getStorageSync("storeId")
 				},
 				fixingLevel:{},
+				isUseChildCard:false,
 			}
 		},
 		onLoad(e) {
 			this.orderNo = e.orderNo
-			// this.orderNo = "2345202401061730169a69d8"
+			// this.orderNo = "23452024011011251833f48e"
 		},
 		onShow() {
 			this.getOilOrder();
@@ -223,6 +224,7 @@
 					isOilStorageCard : this.isOilStorageCard,
 					tankId : uni.getStorageSync("tankId"),
 					// tankId : 6,
+					isUseChildCard:this.isUseChildCard,
 				};
 				let _this = this;
 				request({
@@ -334,8 +336,8 @@
 							this.balanceRedece = this.oilOrder.orderAmount
 						} else {
 							this.balanceRedece = this.user.cardBalance
-							this.deductAmount = this.oilOrder.orderAmount - this.balanceRedece
-							this.payAmount = this.oilOrder.orderAmount - this.balanceRedece
+							this.deductAmount = (this.oilOrder.orderAmount*100-this.balanceRedece*100)/100
+							this.payAmount = (this.oilOrder.orderAmount*100-this.balanceRedece*100)/100
 						}
 					}else{
 						// 使用囤油卡
@@ -674,20 +676,27 @@
 				this.payAmount = this.deductAmount - this.gradeRedece - this.fullRedece - this.couponRedece;
 			},
 			
-			// 根据用户id查询用户信息
+			// 根据店铺id查询用户信息
 			getUser(id){
 				let _this = this;
 				request({
-					url: "business/userManager/user/storeUser/" + _this.oilOrder.storeId,
-					method: 'get',
+					url: "business/userManager/user/storeUser",
+					method: 'post',
+					data:{storeId:_this.oilOrder.storeId,userId:id}
 				}).then((res) => {
-					_this.user = res.data;
-					if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){
-						_this.refuelMoney = JSON.parse(res.data.refuelMoney)
+					if (res.data.isUseChild=='yes'){
+						_this.isUseChildCard = true
+					}else{
+						_this.isUseChildCard = false
+					}
+					_this.user = res.data.userVo;
+					_this.user = res.data.userVo;
+					if (res.data.userVo.refuelMoney!=null && res.data.userVo.refuelMoney!=""){
+						_this.refuelMoney = JSON.parse(res.data.userVo.refuelMoney)
 						_this.chooseRefuelMoney()
 					}else{
 						_this.chooseCardBalance(0)
-						_this.chooseGrade(res.data.gradeId)
+						_this.chooseGrade(res.data.userVo.gradeId)
 					}
 				})
 			},