bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

卡片用户昵称

This commit is contained in:
sxu 2025-04-26 14:22:53 +08:00
parent 22537257f5
commit ed916c4d76
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccCard.java
View File

@ -29,6 +29,10 @@ public class AccCard extends BaseEntity {
@ApiModelProperty(value = "人员id") @ApiModelProperty(value = "人员id")
private Long userId; private Long userId;
/** 人员姓名 */
@ApiModelProperty(value = "人员姓名")
private String nickName;
/** 账户id */ /** 账户id */
@Excel(name = "账户id") @Excel(name = "账户id")
@ApiModelProperty(value = "账户id") @ApiModelProperty(value = "账户id")
@ -55,7 +59,7 @@ public class AccCard extends BaseEntity {
/** 卡状态 1-正常 4-挂失 */ /** 卡状态 1-正常 4-挂失 */
@Excel(name = "卡状态 1-正常 4-挂失") @Excel(name = "卡状态 1-正常 4-挂失")
@ApiModelProperty(value = "卡状态 1-正常 4-挂失") @ApiModelProperty(value = "卡状态 1-正常 4-挂失 5-发卡 6-退卡 7-已过期")
private Integer cardStatus; private Integer cardStatus;
/** 押金 单位分 */ /** 押金 单位分 */

46
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml
View File

@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.bonus.canteen.core.account.domain.AccCard" id="AccCardResult"> <resultMap type="com.bonus.canteen.core.account.domain.AccCard" id="AccCardResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
<result property="nickName" column="nick_name" />
<result property="accId" column="acc_id" /> <result property="accId" column="acc_id" />
<result property="cardNum" column="card_num" /> <result property="cardNum" column="card_num" />
<result property="serialNum" column="serial_num" /> <result property="serialNum" column="serial_num" />
@ -31,36 +32,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectAccCardVo"> <sql id="selectAccCardVo">
select id, user_id, acc_id, card_num, serial_num, card_nature, card_type, card_status, deposit, product_cost, pend_product_cost, validity_date, remark, card_face_num, revision, reserved1, reserved2, reserved3, third_serial_num, card_source_type, create_by, create_time, update_by, update_time from acc_card select ac.id, ac.user_id, ac.acc_id, ac.card_num, ac.serial_num, ac.card_nature, ac.card_type, ac.card_status, ac.deposit,
ac.product_cost, ac.pend_product_cost, ac.validity_date, ac.remark, ac.card_face_num, ac.revision, ac.reserved1,
ac.reserved2, ac.reserved3, ac.third_serial_num, ac.card_source_type, ac.create_by, ac.create_time, ac.update_by,
ac.update_time, su.nick_name
from acc_card ac
left join sys_user su on su.user_id = ac.user_id
</sql> </sql>
<select id="selectAccCardList" parameterType="com.bonus.canteen.core.account.domain.AccCard" resultMap="AccCardResult"> <select id="selectAccCardList" parameterType="com.bonus.canteen.core.account.domain.AccCard" resultMap="AccCardResult">
<include refid="selectAccCardVo"/> <include refid="selectAccCardVo"/>
<where> <where>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and ac.user_id = #{userId}</if>
<if test="accId != null "> and acc_id = #{accId}</if> <if test="accId != null "> and ac.acc_id = #{accId}</if>
<if test="cardNum != null "> and card_num = #{cardNum}</if> <if test="cardNum != null "> and ac.card_num = #{cardNum}</if>
<if test="serialNum != null and serialNum != ''"> and serial_num = #{serialNum}</if> <if test="serialNum != null and serialNum != ''"> and ac.serial_num = #{serialNum}</if>
<if test="cardNature != null and cardNature != ''"> and card_nature = #{cardNature}</if> <if test="cardNature != null and cardNature != ''"> and ac.card_nature = #{cardNature}</if>
<if test="cardType != null "> and card_type = #{cardType}</if> <if test="cardType != null "> and ac.card_type = #{cardType}</if>
<if test="cardStatus != null "> and card_status = #{cardStatus}</if> <if test="cardStatus != null "> and ac.card_status = #{cardStatus}</if>
<if test="deposit != null "> and deposit = #{deposit}</if> <if test="deposit != null "> and ac.deposit = #{deposit}</if>
<if test="productCost != null "> and product_cost = #{productCost}</if> <if test="productCost != null "> and ac.product_cost = #{productCost}</if>
<if test="pendProductCost != null "> and pend_product_cost = #{pendProductCost}</if> <if test="pendProductCost != null "> and ac.pend_product_cost = #{pendProductCost}</if>
<if test="validityDate != null "> and validity_date = #{validityDate}</if> <if test="validityDate != null "> and ac.validity_date = #{validityDate}</if>
<if test="cardFaceNum != null and cardFaceNum != ''"> and card_face_num = #{cardFaceNum}</if> <if test="cardFaceNum != null and cardFaceNum != ''"> and ac.card_face_num = #{cardFaceNum}</if>
<if test="revision != null "> and revision = #{revision}</if> <if test="revision != null "> and ac.revision = #{revision}</if>
<if test="reserved1 != null and reserved1 != ''"> and reserved1 = #{reserved1}</if> <if test="reserved1 != null and reserved1 != ''"> and ac.reserved1 = #{reserved1}</if>
<if test="reserved2 != null and reserved2 != ''"> and reserved2 = #{reserved2}</if> <if test="reserved2 != null and reserved2 != ''"> and ac.reserved2 = #{reserved2}</if>
<if test="reserved3 != null and reserved3 != ''"> and reserved3 = #{reserved3}</if> <if test="reserved3 != null and reserved3 != ''"> and ac.reserved3 = #{reserved3}</if>
<if test="thirdSerialNum != null and thirdSerialNum != ''"> and third_serial_num = #{thirdSerialNum}</if> <if test="thirdSerialNum != null and thirdSerialNum != ''"> and ac.third_serial_num = #{thirdSerialNum}</if>
<if test="cardSourceType != null and cardSourceType != ''"> and card_source_type = #{cardSourceType}</if> <if test="cardSourceType != null and cardSourceType != ''"> and ac.card_source_type = #{cardSourceType}</if>
</where> </where>
</select> </select>
<select id="selectAccCardById" parameterType="Long" resultMap="AccCardResult"> <select id="selectAccCardById" parameterType="Long" resultMap="AccCardResult">
<include refid="selectAccCardVo"/> <include refid="selectAccCardVo"/>
where id = #{id} where ac.id = #{id}
</select> </select>
<insert id="insertAccCard" parameterType="com.bonus.canteen.core.account.domain.AccCard" useGeneratedKeys="true" keyProperty="id"> <insert id="insertAccCard" parameterType="com.bonus.canteen.core.account.domain.AccCard" useGeneratedKeys="true" keyProperty="id">