修改油站设置

yijia-system/src/main/java/com/yijia/system/mapper/SysDeptMapper.java

@@ -6,14 +6,14 @@ import com.yijia.common.core.domain.entity.SysDept;
 
 /**
  * 部门管理 数据层
- * 
+ *
  * @author yijia
  */
 public interface SysDeptMapper
 {
     /**
      * 查询部门管理数据
-     * 
+     *
      * @param dept 部门信息
      * @return 部门信息集合
      */
@@ -21,7 +21,7 @@ public interface SysDeptMapper
 
     /**
      * 根据角色ID查询部门树信息
-     * 
+     *
      * @param roleId 角色ID
      * @param deptCheckStrictly 部门树选择项是否关联显示
      * @return 选中部门列表
@@ -30,7 +30,7 @@ public interface SysDeptMapper
 
     /**
      * 根据部门ID查询信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门信息
      */
@@ -38,7 +38,7 @@ public interface SysDeptMapper
 
     /**
      * 根据ID查询所有子部门
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门列表
      */
@@ -46,7 +46,7 @@ public interface SysDeptMapper
 
     /**
      * 根据ID查询所有子部门（正常状态）
-     * 
+     *
      * @param deptId 部门ID
      * @return 子部门数
      */
@@ -54,7 +54,7 @@ public interface SysDeptMapper
 
     /**
      * 是否存在子节点
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
@@ -62,7 +62,7 @@ public interface SysDeptMapper
 
     /**
      * 查询部门是否存在用户
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
@@ -70,7 +70,7 @@ public interface SysDeptMapper
 
     /**
      * 校验部门名称是否唯一
-     * 
+     *
      * @param deptName 部门名称
      * @param parentId 父部门ID
      * @return 结果
@@ -79,7 +79,7 @@ public interface SysDeptMapper
 
     /**
      * 新增部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -87,7 +87,7 @@ public interface SysDeptMapper
 
     /**
      * 修改部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -95,14 +95,14 @@ public interface SysDeptMapper
 
     /**
      * 修改所在部门的父级部门状态
-     * 
+     *
      * @param dept 部门
      */
     public void updateDeptStatus(SysDept dept);
 
     /**
      * 修改子元素关系
-     * 
+     *
      * @param depts 子元素
      * @return 结果
      */
@@ -110,7 +110,7 @@ public interface SysDeptMapper
 
     /**
      * 删除部门管理信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
@@ -119,4 +119,13 @@ public interface SysDeptMapper
     public List<SysDept> selectDeptListTree(SysDept dept);
 
     public List<SysDept> queryDeptList(SysDept dept);
+
+    /**
+     * 根据对象查询油站信息
+     * */
+    public SysDept selectDept(SysDept sysDept);
+    /**
+     * 根据对象查询集团信息
+     * */
+    public SysDept getGroupInfo(SysDept dept);
 }

yijia-system/src/main/java/com/yijia/system/mapper/SysDictDataMapper.java

@@ -6,14 +6,14 @@ import com.yijia.common.core.domain.entity.SysDictData;
 
 /**
  * 字典表 数据层
- * 
+ *
  * @author yijia
  */
 public interface SysDictDataMapper
 {
     /**
      * 根据条件分页查询字典数据
-     * 
+     *
      * @param dictData 字典数据信息
      * @return 字典数据集合信息
      */
@@ -21,7 +21,7 @@ public interface SysDictDataMapper
 
     /**
      * 根据字典类型查询字典数据
-     * 
+     *
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
@@ -29,7 +29,7 @@ public interface SysDictDataMapper
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
-     * 
+     *
      * @param dictType 字典类型
      * @param dictValue 字典键值
      * @return 字典标签
@@ -37,8 +37,17 @@ public interface SysDictDataMapper
     public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
 
     /**
+     * 根据字典类型和字典键查询字典数据信息
+     *
+     * @param dictType 字典类型
+     * @param dictLabel 字典键
+     * @return 字典标签
+     */
+    public String selectDictValue(@Param("dictType") String dictType, @Param("dictLabel") String dictLabel);
+
+    /**
      * 根据字典数据ID查询信息
-     * 
+     *
      * @param dictCode 字典数据ID
      * @return 字典数据
      */
@@ -46,7 +55,7 @@ public interface SysDictDataMapper
 
     /**
      * 查询字典数据
-     * 
+     *
      * @param dictType 字典类型
      * @return 字典数据
      */
@@ -54,7 +63,7 @@ public interface SysDictDataMapper
 
     /**
      * 通过字典ID删除字典数据信息
-     * 
+     *
      * @param dictCode 字典数据ID
      * @return 结果
      */
@@ -62,7 +71,7 @@ public interface SysDictDataMapper
 
     /**
      * 批量删除字典数据信息
-     * 
+     *
      * @param dictCodes 需要删除的字典数据ID
      * @return 结果
      */
@@ -70,7 +79,7 @@ public interface SysDictDataMapper
 
     /**
      * 新增字典数据信息
-     * 
+     *
      * @param dictData 字典数据信息
      * @return 结果
      */
@@ -78,7 +87,7 @@ public interface SysDictDataMapper
 
     /**
      * 修改字典数据信息
-     * 
+     *
      * @param dictData 字典数据信息
      * @return 结果
      */
@@ -86,7 +95,7 @@ public interface SysDictDataMapper
 
     /**
      * 同步修改字典类型
-     * 
+     *
      * @param oldDictType 旧字典类型
      * @param newDictType 新旧字典类型
      * @return 结果

yijia-system/src/main/java/com/yijia/system/service/ISysDeptService.java

@@ -6,14 +6,14 @@ import com.yijia.common.core.domain.entity.SysDept;
 
 /**
  * 部门管理 服务层
- * 
+ *
  * @author yijia
  */
 public interface ISysDeptService
 {
     /**
      * 查询部门管理数据
-     * 
+     *
      * @param dept 部门信息
      * @return 部门信息集合
      */
@@ -21,7 +21,7 @@ public interface ISysDeptService
 
     /**
      * 构建前端所需要树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 树结构列表
      */
@@ -29,7 +29,7 @@ public interface ISysDeptService
 
     /**
      * 构建前端所需要下拉树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
@@ -37,7 +37,7 @@ public interface ISysDeptService
 
     /**
      * 根据角色ID查询部门树信息
-     * 
+     *
      * @param roleId 角色ID
      * @return 选中部门列表
      */
@@ -45,7 +45,7 @@ public interface ISysDeptService
 
     /**
      * 根据部门ID查询信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门信息
      */
@@ -53,7 +53,7 @@ public interface ISysDeptService
 
     /**
      * 根据ID查询所有子部门（正常状态）
-     * 
+     *
      * @param deptId 部门ID
      * @return 子部门数
      */
@@ -61,7 +61,7 @@ public interface ISysDeptService
 
     /**
      * 是否存在部门子节点
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
@@ -69,7 +69,7 @@ public interface ISysDeptService
 
     /**
      * 查询部门是否存在用户
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
@@ -77,7 +77,7 @@ public interface ISysDeptService
 
     /**
      * 校验部门名称是否唯一
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -85,7 +85,7 @@ public interface ISysDeptService
 
     /**
      * 新增保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -93,7 +93,7 @@ public interface ISysDeptService
 
     /**
      * 修改保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -101,7 +101,7 @@ public interface ISysDeptService
 
     /**
      * 删除部门管理信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
@@ -122,4 +122,11 @@ public interface ISysDeptService
      * @return
      */
     public List<SysDept> queryDeptList(SysDept dept);
+
+    /**
+     * 查询集团信息
+     * @param dept
+     * @return
+     */
+    public SysDept getGroupInfo(SysDept dept);
 }

yijia-system/src/main/java/com/yijia/system/service/impl/SysDeptServiceImpl.java

@@ -185,7 +185,19 @@ public class SysDeptServiceImpl implements ISysDeptService
         {
             throw new CustomException("部门停用，不允许新增");
         }
-        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+        if(dept.getJiBie()!=null && dept.getJiBie().equals("2") ){
+            dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+            dept.setCardEnabledFlag("0");
+            dept.setWsPrintFlag("2");
+            dept.setPrintSetting("1");
+            dept.setDiscountSetting("0");
+            dept.setIntegralPrintFlag("2");
+            dept.setIntegralFlag("2");
+        }else if(dept.getJiBie()!=null && dept.getJiBie().equals("1")){
+            dept.setCardRuleFlag("0");
+            dept.setIntegralRuleFlag("0");
+            dept.setCouponFlag("0");
+        }
         return deptMapper.insertDept(dept);
     }
 
@@ -306,6 +318,11 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.queryDeptList(dept);
     }
 
+    @Override
+    public SysDept getGroupInfo(SysDept dept) {
+        return deptMapper.getGroupInfo(dept);
+    }
+
     /**
      * 递归列表
      */

yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -27,10 +27,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="stationLongitude"    column="station_longitude"    />
 		<result property="stationLatitude"    column="station_latitude"    />
 		<result property="mno"    column="mno"    />
+		<result property="discountSetting"    column="discount_setting"    />
+		<result property="cardEnabledFlag"    column="card_enabled_flag"    />
+		<result property="appId"    column="app_id"    />
+		<result property="appSecret"    column="app_secret"    />
+		<result property="gzhAppId"    column="gzh_app_id"    />
+		<result property="gzhAppSecret"    column="gzh_app_secret"    />
+		<result property="aliAppId"    column="ali_app_id"    />
+		<result property="aliPublicKey"    column="ali_public_key"    />
+		<result property="aliPrivateKey"    column="ali_private_key"    />
+		<result property="aliEncryptKey"    column="ali_encrypt_key"    />
+		<result property="image1"    column="image1"    />
+		<result property="image2"    column="image2"    />
+		<result property="image3"    column="image3"    />
+		<result property="image4"    column="image4"    />
+		<result property="image5"    column="image5"    />
+		<result property="wsPrintFlag"    column="ws_print_flag"    />
+		<result property="printSetting"    column="print_setting"     />
+		<result property="notice"    column="notice"    />
+		<result property="integralPrintFlag"    column="integral_print_flag"    />
+		<result property="integralFlag"    column="integral_flag"    />
+		<result property="integralRuleFlag"    column="integral_rule_flag"    />
+		<result property="cardRuleFlag"    column="card_rule_flag"    />
+		<result property="couponFlag"    column="coupon_flag"    />
 	</resultMap>
 
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time ,d.ji_bie, d.dept_address, d.oil_gun_num, d.station_pic, d.station_longitude, d.station_latitude, d.mno, d.app_id, d.app_secret
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+        d.del_flag, d.create_by, d.create_time ,d.ji_bie, d.dept_address, d.oil_gun_num, d.station_pic, d.station_longitude,
+        d.station_latitude, d.mno, discount_setting,card_enabled_flag,d.app_id, d.app_secret,gzh_app_id,gzh_app_secret,ali_app_id,gzh_app_secret
+        ali_app_id,ali_public_key,ali_private_key,ali_encrypt_key,image1,image2,image3,image4,image5,ws_print_flag,print_setting,notice,integral_print_flag,
+        d.integral_flag,d.integral_rule_flag,d.card_rule_flag,d.coupon_flag
         from sys_dept d
     </sql>
 
@@ -125,6 +152,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptListTree" statementType="CALLABLE" useCache="false">
 		{call deptinfo()};
 	</select>
+	<select id="getGroupInfo" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where dept_id = #{deptId} and ji_bie = "1"
+	</select>
+
     <insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -146,6 +178,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="mno != null">mno,</if>
 			<if test="appId != null">app_id,</if>
 			<if test="appSecret != null">app_secret,</if>
+			<if test="discountSetting != null">discount_setting,</if>
+			<if test="cardEnabledFlag != null">card_enabled_flag,</if>
+			<if test="gzhAppId != null">gzh_app_id,</if>
+			<if test="gzhAppSecret != null">gzh_app_secret,</if>
+			<if test="aliAppId != null">ali_app_id,</if>
+			<if test="aliPublicKey != null">ali_public_key,</if>
+			<if test="aliPrivateKey != null">ali_private_key,</if>
+			<if test="aliEncryptKey != null">ali_encrypt_key,</if>
+			<if test="image1 != null">image1,</if>
+			<if test="image2 != null">image2,</if>
+			<if test="image3 != null">image3,</if>
+			<if test="image4 != null">image4,</if>
+			<if test="image5 != null">image5,</if>
+			<if test="wsPrintFlag != null">ws_print_flag,</if>
+			<if test="printSetting != null">print_setting,</if>
+			<if test="notice != null">notice,</if>
+			<if test="integralPrintFlag != null">integral_print_flag,</if>
+			<if test="integralFlag != null">integral_flag,</if>
+			<if test="integralRuleFlag != null">integral_rule_flag,</if>
+			<if test="cardRuleFlag != null">card_rule_flag,</if>
+			<if test="couponFlag != null">coupon_flag,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -167,6 +220,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="mno != null">#{mno},</if>
 			<if test="appId != null">#{appId},</if>
 			<if test="appSecret != null">#{appSecret},</if>
+			<if test="discountSetting != null">#{discountSetting},</if>
+			<if test="cardEnabledFlag != null">#{cardEnabledFlag},</if>
+			<if test="gzhAppId != null">#{gzhAppId},</if>
+			<if test="gzhAppSecret != null">#{gzhAppSecret},</if>
+			<if test="aliAppId != null">#{aliAppId},</if>
+			<if test="aliPublicKey != null">#{aliPublicKey},</if>
+			<if test="aliPrivateKey != null">#{aliPrivateKey},</if>
+			<if test="aliEncryptKey != null">#{aliEncryptKey},</if>
+			<if test="image1 != null">#{image1},</if>
+			<if test="image2 != null">#{image2},</if>
+			<if test="image3 != null">#{image3},</if>
+			<if test="image4 != null">#{image4},</if>
+			<if test="image5 != null">#{image5},</if>
+			<if test="wsPrintFlag != null">#{wsPrintFlag},</if>
+			<if test="printSetting != null">#{printSetting},</if>
+			<if test="notice != null">#{notice},</if>
+			<if test="integralPrintFlag != null">#{integralPrintFlag},</if>
+			<if test="integralFlag != null">#{integralFlag},</if>
+			<if test="integralRuleFlag != null">#{integralRuleFlag},</if>
+			<if test="cardRuleFlag != null">#{cardRuleFlag},</if>
+			<if test="couponFlag != null">#{couponFlag},</if>
  			sysdate()
  		)
 	</insert>
@@ -192,6 +266,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="mno != null">mno = #{mno},</if>
 			<if test="appId != null">app_id = #{appId},</if>
 			<if test="appSecret != null">app_secret = #{appSecret},</if>
+			<if test="discountSetting != null">discount_setting= #{discountSetting},</if>
+			<if test="cardEnabledFlag != null">card_enabled_flag= #{cardEnabledFlag},</if>
+			<if test="gzhAppId != null">gzh_app_id= #{gzhAppId},</if>
+			<if test="gzhAppSecret != null">gzh_app_secret= #{gzhAppSecret},</if>
+			<if test="aliAppId != null">ali_app_id= #{aliAppId},</if>
+			<if test="aliPublicKey != null">ali_public_key= #{aliPublicKey},</if>
+			<if test="aliPrivateKey != null">ali_private_key= #{aliPrivateKey},</if>
+			<if test="aliEncryptKey != null">ali_encrypt_key= #{aliEncryptKey},</if>
+			<if test="image1 != null">image1= #{image1},</if>
+			<if test="image2 != null">image2= #{image2},</if>
+			<if test="image3 != null">image3= #{image3},</if>
+			<if test="image4 != null">image4= #{image4},</if>
+			<if test="image5 != null">image5= #{image5},</if>
+			<if test="wsPrintFlag != null">ws_print_flag= #{wsPrintFlag},</if>
+			<if test="printSetting != null">print_setting= #{printSetting},</if>
+			<if test="notice != null">notice= #{notice},</if>
+			<if test="integralPrintFlag != null">integral_print_flag= #{integralPrintFlag},</if>
+			<if test="integralFlag != null">integral_flag= #{integralFlag},</if>
+			<if test="integralRuleFlag != null">integral_rule_flag= #{integralRuleFlag},</if>
+			<if test="cardRuleFlag != null">card_rule_flag= #{cardRuleFlag},</if>
+			<if test="couponFlag != null">coupon_flag= #{couponFlag},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}

yijia-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.system.mapper.SysDictDataMapper">
-	
+
 	<resultMap type="SysDictData" id="SysDictDataResult">
 		<id     property="dictCode"   column="dict_code"   />
 		<result property="dictSort"   column="dict_sort"   />
@@ -19,9 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
-	
+
 	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
+        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
 		from sys_dict_data
     </sql>
 
@@ -40,37 +40,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 		order by dict_sort asc
 	</select>
-	
+
 	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
-	
+
 	<select id="selectDictLabel" resultType="String">
 		select dict_label from sys_dict_data
 		where dict_type = #{dictType} and dict_value = #{dictValue}
 	</select>
-	
+
+	<select id="selectDictValue" resultType="String">
+		select dict_value  from sys_dict_data
+		where dict_type = #{dictType} and dict_label = #{dictLabel}
+	</select>
+
 	<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where dict_code = #{dictCode}
 	</select>
-	
+
 	<select id="countDictDataByType" resultType="Integer">
-	    select count(1) from sys_dict_data where dict_type=#{dictType}  
+	    select count(1) from sys_dict_data where dict_type=#{dictType}
 	</select>
-	
+
 	<delete id="deleteDictDataById" parameterType="Long">
  		delete from sys_dict_data where dict_code = #{dictCode}
  	</delete>
- 	
+
  	<delete id="deleteDictDataByIds" parameterType="Long">
  		delete from sys_dict_data where dict_code in
  		<foreach collection="array" item="dictCode" open="(" separator="," close=")">
  			#{dictCode}
-        </foreach> 
+        </foreach>
  	</delete>
-	
+
 	<update id="updateDictData" parameterType="SysDictData">
  		update sys_dict_data
  		<set>
@@ -88,11 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where dict_code = #{dictCode}
 	</update>
-	
+
 	<update id="updateDictDataType" parameterType="String">
  		update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
 	</update>
- 	
+
  	<insert id="insertDictData" parameterType="SysDictData">
  		insert into sys_dict_data(
  			<if test="dictSort != null">dict_sort,</if>
@@ -120,5 +125,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
-</mapper> 
+
+</mapper>