Parcourir la source

1、销售公司新增修改优化
2、新增储值支付开关

yys il y a 1 mois
Parent
commit
cb767127fa

+ 6 - 0
fs-service/src/main/java/com/fs/company/domain/Company.java

@@ -141,6 +141,12 @@ public class Company extends BaseEntity
     // 控制休息提示是否打开要暂停  0-关闭 1-打开 null-默认打开
     private Integer isOpenRestReminder;
 
+
+    /**
+     * 储值支付 0-关闭 1-打开
+     */
+    private Integer isOpenStoredPay;
+
     @TableField(exist = false)
     private List<Long> ids;
 }

+ 6 - 1
fs-service/src/main/resources/mapper/company/CompanyMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="groupName"    column="group_name"    />
         <result property="maxPadNum"    column="max_pad_num"    />
         <result property="deptId"   column="dept_id" />
+        <result property="isOpenStoredPay"   column="is_open_stored_pay" />
     </resultMap>
 
     <sql id="selectCompanyVo">
@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="courseMiniAppId != null "> and course_mini_app_id = #{courseMiniAppId}</if>
             <if test="deptId != null">and dept_id = #{deptId}</if>
             <if test="customMiniAppId != null "> and custom_mini_app_id = #{customMiniAppId}</if>
+            <if test="isOpenStoredPay != null "> and is_open_stored_pay = #{isOpenStoredPay}</if>
         </where>
     </select>
 
@@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maxPadNum != null">max_pad_num,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="isOpenRestReminder != null">is_open_rest_reminder,</if>
+            <if test="isOpenStoredPay != null">is_open_stored_pay,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyName != null">#{companyName},</if>
@@ -159,7 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupName != null">#{groupName},</if>
             <if test="maxPadNum != null">#{maxPadNum},</if>
             <if test="deptId != null">#{deptId},</if>
-            <if test="isOpenRestReminder != null">is_open_rest_reminder = #{isOpenRestReminder},</if>
+            <if test="isOpenRestReminder != null">#{isOpenRestReminder},</if>
+            <if test="isOpenStoredPay != null">#{isOpenStoredPay},</if>
          </trim>
     </insert>
 
@@ -204,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="redPackageMoney != null">red_package_money = #{redPackageMoney},</if>
             <if test="isOpenRestReminder != null">is_open_rest_reminder = #{isOpenRestReminder},</if>
+            <if test="isOpenStoredPay != null">is_open_stored_pay = #{isOpenStoredPay},</if>
         </trim>
         where company_id = #{companyId}
     </update>