Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java

fuintAdmin/src/views/integral/order/detail.vue

@@ -28,7 +28,7 @@
         </template>
         {{ dataForm.exchangeQuantity }}
       </el-descriptions-item>
-      <el-descriptions-item v-if="dataForm.orderType != 1">
+      <el-descriptions-item v-if="dataForm.orderType != 1 && dataForm.shippingType">
         <template slot="label">
           配送类型
         </template>
@@ -46,7 +46,7 @@
         </template>
         {{ dataForm.orderNumber }}
       </el-descriptions-item>
-      
+
       <el-descriptions-item>
         <template slot="label">
           创建时间
@@ -98,7 +98,7 @@ export default {
   },
   data() {
     return {
-      
+
     }
   },
 

fuintAdmin/src/views/integral/order/pointsMall.vue

@@ -111,7 +111,8 @@
         <el-table-column label="配送类型" align="center" prop="shippingType">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.shippingType=='门店自提'">{{scope.row.shippingType}}</el-tag>
-            <el-tag type="success" v-else>{{scope.row.shippingType}}</el-tag>
+            <el-tag type="success" v-if="scope.row.shippingType=='物流配送'">{{scope.row.shippingType}}</el-tag>
+            <el-tag type="info" v-else>非实物兑换</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="实付信息" align="center" prop="categoryName" >
@@ -148,7 +149,7 @@
             处理订单
           </el-button>
            </template>
-          <template v-else>
+          <template v-else-if="scope.row.orderStatus!='已完成'">
             <el-button
               size="mini"
               type="text"
@@ -253,8 +254,6 @@ export default {
       this.outComeFlag = !this.outComeFlag; // 切换 v-if，强制重新渲染子组件
 
       this.openOutcome = true
-
-
     },
     handleDetail(data){
       this.openDetail = true
@@ -297,6 +296,8 @@ export default {
       this.outComeFlag = false
       this.openOutcome = false
       this.dataForm = {}
+      this.getList()
+
     }
   }
 

fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java

@@ -117,8 +117,11 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
 
     @Override
     public int insertMerch(MerchantConfig merchantConfig) {
+
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
         if (ObjectUtil.isEmpty(merchantConfig.getStoreId())) {
+            storeId = nowAccountInfo.getStoreId();
             merchantConfig.setStoreId(nowAccountInfo.getStoreId());
         }
         int row = 0;
@@ -131,7 +134,7 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
         }
         merchantConfig.setAppid(FuYouPublicMerchant.appid);
         merchantConfig.setAlipayAppid(FuYouPublicMerchant.alipayAppid);
-        MerchantConfig merchantConfig1 = this.selectMeChByIdIsUse(nowAccountInfo.getStoreId());
+        MerchantConfig merchantConfig1 = this.selectMeChByIdIsUse(storeId);
         if (ObjectUtil.isEmpty(merchantConfig1)){
             merchantConfig.setIsUse("1");
         }else {

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml

@@ -208,7 +208,7 @@
                 and io.id = #{integralOrders.id}
             </if>
             <if test="integralOrders.storeId != null">
-                and io.storeId = #{integralOrders.storeId}
+                and io.store_id = #{integralOrders.storeId}
             </if>
             <if test="integralOrders.userId != null">
                 and io.user_id = #{integralOrders.userId}

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml

@@ -22,6 +22,7 @@
         <result property="pointsObtained" column="points_obtained" jdbcType="VARCHAR"/>
         <result property="pointsRules" column="points_rules" jdbcType="VARCHAR"/>
         <result property="storeId" column="store_id" jdbcType="INTEGER"/>
+        <result property="chainStoreId" column="chain_store_id" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="createBy" column="create_by" jdbcType="INTEGER"/>
@@ -38,7 +39,7 @@
 
     <select id="getByStoreId" resultMap="IntegralSettingsMap">
         select
-            id, 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
+            id, 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
         from integral_settings
         where store_id = #{storeId}
     </select>

fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/entity/SysDept.java

@@ -53,6 +53,8 @@ public class SysDept extends BaseEntity
     @TableField(exist = false)
     private String parentName;
     private String leaderName;
+    /**删除状态**/
+    private String ifDelete;
 
     private String leaderPhone;
     @JsonFormat(pattern = "yyyy-MM-dd")

fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml

@@ -8,7 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptList"  resultType="com.fuint.system.dept.entity.SysDept">
 		select *
 		from sys_dept d
-        where 1=1
+        where
+        if_delete = 0
 		<if test="dept.deptId != null and dept.deptId != 0">
 			AND (dept_id = #{dept.deptId} or ancestors  like concat (#{ownDeptStr},'%'))
 		</if>
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
     
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from t_account where dept_id = #{deptId}
+		select count(1) from t_account where dept_id = #{deptId} and account_status = 1
 	</select>
 	
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">

fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java

@@ -332,7 +332,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper,SysDept> imple
     @Override
     public int deleteDeptById(Long deptId)
     {
-        return baseMapper.deleteById(deptId);
+        SysDept sysDept = new SysDept();
+        sysDept.setDeptId(deptId);
+        sysDept.setIfDelete("1");
+        return updateById(sysDept)?1:0;
+//        return baseMapper.deleteById(deptId);
     }
 
     /**

fuintBackend/fuint-application/src/main/resources/application.properties

@@ -1,8 +1,8 @@
 # \u57FA\u672C\u914D\u7F6E
-server.port=8080
+server.port=8008
 env.profile=dev
 #env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
-env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
+env.properties.path=D:/code/oilSystem/fuintBackend/configure/
 
 
 

fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue

@@ -582,8 +582,8 @@ import {
         getStaff(){
           staffInfo().then( response => {
             // this.staff = response.data;
-            console.log("response",response.data.accountInfo)
+            console.log("response",response.data)
-            this.staff = response.data.accountInfo;
+            this.staff = response.data;
             // this.map.staffId = this.staff.id;
           })
         },

gasStation-uni/config.js

@@ -1,6 +1,5 @@
 // 应用全局配置
 module.exports = {
-<<<<<<< HEAD
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	// baseUrl: 'http://192.168.0.196:8081/',
 	// baseUrl: 'http://192.168.1.4:8080/',
@@ -8,9 +7,7 @@ module.exports = {
 
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 
-=======
+
-	baseUrl: 'https://8q4f124343.yicp.fun/',
->>>>>>> c67165057421d2de2634fc09136279ec27ed8bb2
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
 	// 应用信息
 	appInfo: {

gasStation-uni/pages/index/index.vue

@@ -214,7 +214,7 @@
 				if (uni.getStorageSync("storeId")) {
 					this.storeId = uni.getStorageSync("storeId")
 				} else {
-					let storeId = "24";
+					let storeId = "12";
 
 					uni.setStorageSync("storeId", storeId)
 				}

gasStation-uni/pagesHome/PointsMing/PointsMing.vue

@@ -82,6 +82,7 @@
 					method: 'get',
 					params: {
 						chainStoreId: uni.getStorageSync('chainStoreId'),
+						storeId: uni.getStorageSync('storeId'),
 						pageNo: this.pageNo,
 						pageSize: this.pageSize
 					}