czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改交班数据

Browse Source
This commit is contained in:
韩鹏辉
2024-05-29 16:00:12 +08:00
parent 664e57e145
commit 9482cf4597
14 changed files with 172 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/resources/mapper/ShopUserDutyMapper.xml
View File

@@ -20,10 +20,14 @@
<result column="equipment" jdbcType="VARCHAR" property="equipment"/>
<result column="trade_day" jdbcType="VARCHAR" property="tradeDay"/>
<result column="type" jdbcType="VARCHAR" property="type"/>
<result column="member_in_amount" jdbcType="DECIMAL" property="memberInAmount"/>
<result column="member_out_amount" jdbcType="DECIMAL" property="memberOutAmount"/>
<result column="quick_amount" jdbcType="DECIMAL" property="quickAmount"/>
</resultMap>
<sql id="Base_Column_List">
id, user_id, login_time, order_num, amount, login_out_time, user_name, status, income_amount,
shop_id, petty_cash, cash_amount, hand_amount, equipment,return_amount,token_id,trade_day,type
shop_id, petty_cash, cash_amount, hand_amount, equipment,return_amount,token_id,trade_day,type,member_in_amount,member_out_amount,quick_amount
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
@@ -58,12 +62,15 @@
order_num, amount, login_out_time,
user_name, status, income_amount,
shop_id, petty_cash, cash_amount,
hand_amount, equipment,return_amount,token_id,trade_day,type)
hand_amount, equipment,return_amount,token_id,trade_day,type,member_in_amount,member_out_amount,quick_amount)
values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{loginTime,jdbcType=TIMESTAMP},
#{orderNum,jdbcType=INTEGER}, #{amount,jdbcType=VARCHAR}, #{loginOutTime,jdbcType=TIMESTAMP},
#{userName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{incomeAmount,jdbcType=DECIMAL},
#{shopId,jdbcType=INTEGER}, #{pettyCash,jdbcType=DECIMAL}, #{cashAmount,jdbcType=DECIMAL},
#{handAmount,jdbcType=DECIMAL}, #{equipment,jdbcType=VARCHAR}, #{returnAmount,jdbcType=DECIMAL},#{tokenId,jdbcType=INTEGER},#{tradeDay,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR})
#{handAmount,jdbcType=DECIMAL}, #{equipment,jdbcType=VARCHAR}, #{returnAmount,jdbcType=DECIMAL},#{tokenId,jdbcType=INTEGER},#{tradeDay,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR}
,#{memberInAmount,jdbcType=DECIMAL},#{memberOutAmount,jdbcType=DECIMAL},#{quickAmount,jdbcType=DECIMAL}
)
</insert>
<insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.ShopUserDuty">
insert into tb_shop_user_duty
@@ -201,6 +208,10 @@
<if test="returnAmount != null">
return_amount = #{returnAmount,jdbcType=DECIMAL},
</if>
<if test="memberOutAmount != null">
member_out_amount = #{memberOutAmount,jdbcType=DECIMAL},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@@ -218,7 +229,10 @@
petty_cash = #{pettyCash,jdbcType=DECIMAL},
cash_amount = #{cashAmount,jdbcType=DECIMAL},
hand_amount = #{handAmount,jdbcType=DECIMAL},
equipment = #{equipment,jdbcType=VARCHAR}
equipment = #{equipment,jdbcType=VARCHAR},
member_in_amount=#{memberInAmount,jdbcType=DECIMAL}
,member_out_amount=#{memberOutAmount,jdbcType=DECIMAL},
quick_amount=#{quickAmount,jdbcType=DECIMAL}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateStatusByTokenId">

8
src/main/resources/mapper/TbShopUserMapper.xml
View File

@@ -21,6 +21,8 @@
<result column="telephone" jdbcType="VARCHAR" property="telephone" />
<result column="is_vip" jdbcType="TINYINT" property="isVip" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="dynamic_code" jdbcType="VARCHAR" property="dynamicCode" />
<result column="is_attention" jdbcType="TINYINT" property="isAttention" />
<result column="attention_at" jdbcType="INTEGER" property="attentionAt" />
<result column="is_shareholder" jdbcType="TINYINT" property="isShareholder" />
@@ -35,7 +37,7 @@
id, amount, credit_amount, consume_amount, consume_number, level_consume, status,
merchant_id, shop_id, user_id, parent_id, parent_level, name, head_img, sex, birth_day,
telephone, is_vip, code, is_attention, attention_at, is_shareholder, level, distribute_type,
sort, created_at, updated_at, mini_open_id
sort, created_at, updated_at, mini_open_id,dynamic_code
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
@@ -377,4 +379,8 @@
<select id="selectByUserIdAndShopId" resultMap="BaseResultMap">
select * from tb_shop_user where user_id=#{userId} and shop_id =#{shopId}
</select>
<select id="selectByShopIdAndDdynamicCode" resultMap="BaseResultMap">
select * from tb_shop_user where shop_id=#{shopId} and dynamic_code=#{memberAccount}
</select>
</mapper>