diff --git a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
index 9f342ea19..c65cbc22d 100644
--- a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
+++ b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+    import request from '@/utils/request'
 
 // 查询商户列表
 export function listMerchant() {
@@ -27,3 +27,21 @@ export function editMerchant(data) {
     data: data,
   })
 }
+
+
+// 添加商户使用状态
+export function addMerchantApi(data) {
+  return request({
+    url: '/api/merchantConfig',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 根据id查询商户配置信息
+export function merchantInfo(id) {
+  return request({
+    url: '/api/merchantConfig/'+id,
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index db16d294e..492ad281e 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -201,10 +201,11 @@
 
 <script>
 import {
-  addMerchant,
+  addMerchantApi,
   editMerchant,
   editMerchantRemark,
   listMerchant,
+  listMerchant2,
   merchantInfo
 } from "@/api/payConfig/merchantconfig";
 import {
@@ -220,6 +221,8 @@ import {addUser, getUserMobile, updateUser} from "@/api/staff/user/user";
 export default {
   dicts: ['payment_channel'],
   name: 'peizhi',
+  props: ["id"],
+
   data(){
     return{
       // 是否禁用
@@ -284,9 +287,11 @@ export default {
       })
     },
     submitMerchant(){
+      console.log("hello world")
       this.$refs["form1"].validate(valid => {
         if (valid) {
-          addMerchant(this.form1).then(res => {
+          this.form1.storeId = this.id
+          addMerchantApi(this.form1).then(res => {
             if (res.data == 1){
               this.$modal.msgSuccess("添加成功");
               this.getList()
@@ -452,7 +457,7 @@ export default {
     },
     // 获取商户列表信息
     getList(){
-      listMerchant().then( response => {
+      listMerchant2({storeId : this.id}).then( response => {
         this.merchantList = response.data;
         this.merchantList.forEach(item => {
           if (item.isOpenRule == "1"){
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 19e37f117..a99c41769 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
@@ -117,8 +117,10 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
 
     @Override
     public int insertMerch(MerchantConfig merchantConfig) {
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        merchantConfig.setStoreId(nowAccountInfo.getStoreId());
+        if (ObjectUtil.isEmpty(merchantConfig.getStoreId())) {
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            merchantConfig.setStoreId(nowAccountInfo.getStoreId());
+        }
         int row = 0;
         if (merchantConfig.getMerchantName().equals("富友")){
             merchantConfig.setInsCd(FuYouPublicMerchant.insCd);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralDetailMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralDetailMapper.java
index 8a42e3c9a..628a07d34 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralDetailMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralDetailMapper.java
@@ -86,7 +86,7 @@ public interface IntegralDetailMapper {
      * @param type
      * @return
      */
-    List<IntegralDetail> signInGifts(@Param("type") String type);
+    List<IntegralDetail> signInGifts(@Param("type") String type,@Param("userId") Integer userId,@Param("chainStoreId") Integer chainStoreId);
 
     List<IntegralDetail> signInGiftsYesterday(@Param("type") String type,@Param("userId") Integer userId,@Param("chainStoreId") Integer chainStoreId);
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml
index e10c1a32f..a1dde2895 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml
@@ -176,6 +176,12 @@
         <if test="type != null">
             and type = #{type}
         </if>
+        <if test="userId != null">
+            and user_id = #{userId}
+        </if>
+        <if test="chainStoreId != null">
+            and chain_store_id = #{chainStoreId}
+        </if>
     </select>
 
     <!--查询昨天 签到赠送-->
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
index 3d9a88e38..a9885ef43 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
@@ -183,6 +183,7 @@
         left join integral_gift ig ON io.gift_id = ig.id
         left join mt_user_express_address ea ON io.address_id = ea.id
         <where>
+             io.chain_store_id = #{integralOrders.chainStoreId}
             <if test="integralOrders.giftName != null">
                 and ig.gift_name like CONCAT ('%',#{integralOrders.giftName},'%')
             </if>
@@ -206,6 +207,9 @@
             <if test="integralOrders.id != null">
                 and io.id = #{integralOrders.id}
             </if>
+            <if test="integralOrders.storeId != null">
+                and io.storeId = #{integralOrders.storeId}
+            </if>
             <if test="integralOrders.userId != null">
                 and io.user_id = #{integralOrders.userId}
             </if>
@@ -215,9 +219,7 @@
             <if test="integralOrders.exchangeQuantity != null">
                 and io.exchange_quantity = #{integralOrders.exchangeQuantity}
             </if>
-            <if test="integralOrders.chainStoreId != null">
-                and io.chain_store_id = #{integralOrders.chainStoreId}
-            </if>
+
         </where>
         order by io.create_time desc
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml
index 77d7d9fd2..b066d1ce5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml
@@ -140,8 +140,8 @@
     </select>
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into integral_settings(refuel_points_rules, refuel_points_function, refuel_scene_type, refuel_amount_type, refuel_value_participation, refuel_scene_rules, refuel_consumption_amount, refuel_points, refuel_fuel_amount, refuel_fuel_volume, recharge_give, invite_give, invite_give_rules, sign_in_function, sign_in_rules, points_obtained, points_rules, store_id, create_time, update_time, create_by, update_by)
-        values (#{refuelPointsRules}, #{refuelPointsFunction}, #{refuelSceneType}, #{refuelAmountType}, #{refuelValueParticipation}, #{refuelSceneRules}, #{refuelConsumptionAmount}, #{refuelPoints}, #{refuelFuelAmount}, #{refuelFuelVolume}, #{rechargeGive}, #{inviteGive}, #{inviteGiveRules}, #{signInFunction}, #{signInRules}, #{pointsObtained}, #{pointsRules}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy})
+        insert into integral_settings(refuel_points_rules, refuel_points_function, refuel_scene_type, refuel_amount_type, refuel_value_participation, refuel_scene_rules, refuel_consumption_amount, refuel_points, refuel_fuel_amount, refuel_fuel_volume, recharge_give, invite_give, invite_give_rules, sign_in_function, sign_in_rules, points_obtained, points_rules, store_id, create_time, update_time, create_by, update_by, chain_store_id)
+        values (#{refuelPointsRules}, #{refuelPointsFunction}, #{refuelSceneType}, #{refuelAmountType}, #{refuelValueParticipation}, #{refuelSceneRules}, #{refuelConsumptionAmount}, #{refuelPoints}, #{refuelFuelAmount}, #{refuelFuelVolume}, #{rechargeGive}, #{inviteGive}, #{inviteGiveRules}, #{signInFunction}, #{signInRules}, #{pointsObtained}, #{pointsRules}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy}, #{chainStoreId})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
index 0e08c7a12..edbd67eb8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
@@ -152,6 +152,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
     public IntegralSettings insert(IntegralSettings integralSettings) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         integralSettings.setStoreId(nowAccountInfo.getStoreId());
+        integralSettings.setChainStoreId(nowAccountInfo.getChainStoreId());
         integralSettings.setCreateBy(nowAccountInfo.getStaffId().toString());
         IntegralSettings settings = this.integralSettingsMapper.getSettings(integralSettings);
         if (ObjectUtil.isEmpty(settings)) {
@@ -205,7 +206,8 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
         // 查询是否开启签到功能
         IntegralSettings integralSettings = integralSettingsMapper.getByStoreId(storeId);
         if (!ObjectUtil.isEmpty(integralSettings) && (integralSettings.getSignInFunction() == 0 || integralSettings.getPointsObtained().length() > 10)) {
-            List<IntegralDetail> signInGifts = integralDetailMapper.signInGifts("签到赠送");
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            List<IntegralDetail> signInGifts = integralDetailMapper.signInGifts("签到赠送", nowAccountInfo.getId(), integralSettings.getChainStoreId());
             if (signInGifts.size() > 0) {
                 // 已经签到过
                 return -2;
@@ -318,6 +320,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
         // 计算积分
         BigDecimal bigPoints = new BigDecimal(point);
         BigDecimal addPoints = bigPoints.add(new BigDecimal(ljUserVos.getPoints()));
+
         integralDetail.setCurrentPoints(addPoints.intValue());
         integralDetail.setChangeType("1");
         integralDetail.setType("签到赠送");
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 684073d98..ec0947c21 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
@@ -120,7 +120,7 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
         userBalanceAdd.setPoints(0);
         userBalanceAdd.setGrowthValue(0);
         userBalanceAdd.setConsumeNum(0);
-        // todo 12-29  没有连锁店id
+        // todo 12-29  设置等级
 //        LJUserGrade ljUserGrade = ljUserGradeService.selectUserGradeByChainStoreId(chainStoreId);
 //        if (ObjectUtil.isNotEmpty(ljUserGrade) && ObjectUtil.isNotEmpty(ljUserGrade.getId())) {
 //            userBalanceAdd.setGradeId(ljUserGrade.getId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
index c74f7269a..56f2d507d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
@@ -56,7 +56,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper,SysDept> imple
         SysDept sysDept = baseMapper.selectDeptById(nowAccountInfo.getDeptId());
         StringBuilder ancestors = new StringBuilder();
         ancestors.append(sysDept.getAncestors()).append(",").append(nowAccountInfo.getDeptId());
-        return baseMapper.selectDeptList(dept,ancestors.toString());
+        dept.setDeptId(sysDept.getDeptId());
+        List<SysDept> sysDepts = baseMapper.selectDeptList(dept, ancestors.toString());
+        return sysDepts;
     }
 
     /**
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
index 785b9950c..79cc8897c 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
@@ -150,6 +150,16 @@
           :limit.sync="queryParams.pageSize"
           @current-change="getList">
         </el-pagination>
+
+<!--        <pagination-->
+<!--          background-->
+<!--          v-show="total>0"-->
+<!--          layout="prev, pager, next"-->
+<!--          :total="total"-->
+<!--          :page.sync="queryParams.page"-->
+<!--          :limit.sync="queryParams.pageSize"-->
+<!--          @pagination="getList"-->
+<!--        />-->
       </div>
 
 
@@ -222,56 +232,6 @@ import {queryStaffs} from "@/api/cashier/staff";
         formLabelAlign: {
           name: '',
         },
-        // tableData: [{
-        //   date: '2016-05-03',
-        //   name: '王小狼',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-02',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-08',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-06',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-07',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }]
       }
     },
     created() {
@@ -334,7 +294,11 @@ import {queryStaffs} from "@/api/cashier/staff";
         })
       },
       // 获取列表信息
-      getList(){
+      getList(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        console.log("123123123",this.queryParams)
         listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
           this.list = response.data.records;
           this.total = response.data.total;
diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js
index 76d3b426c..3bf1eadcd 100644
--- a/gasStation-uni/config.js
+++ b/gasStation-uni/config.js
@@ -1,6 +1,16 @@
 // 应用全局配置
 module.exports = {
+<<<<<<< HEAD
+	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
+	// baseUrl: 'http://192.168.0.196:8081/',
+	// baseUrl: 'http://192.168.1.4:8080/',
+	baseUrl: 'http://192.168.0.178:8008/',
+
+	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
+
+=======
 	baseUrl: 'https://8q4f124343.yicp.fun/',
+>>>>>>> c67165057421d2de2634fc09136279ec27ed8bb2
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
 	// 应用信息
 	appInfo: {
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 304e1bb08..ec5b6d103 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -215,6 +215,7 @@
 					this.storeId = uni.getStorageSync("storeId")
 				} else {
 					let storeId = "24";
+
 					uni.setStorageSync("storeId", storeId)
 				}
 			}
@@ -791,4 +792,4 @@
 		color: white;
 		margin: 0 auto;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
index 4f553b47b..85c0e6984 100644
--- a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
+++ b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
@@ -51,7 +51,7 @@
 
 					<view class="right-size" v-if="form.shippingType == '物流配送'">
 
-						<span>{{form.courierCompanies}}{{form.theTrackingNumber}}</span>
+						<span>{{form.courierCompanies}}:{{form.theTrackingNumber}}</span>
 					</view>
 					<view v-else class="right-size">门店自提</view>
 				</view>