925116093-qq.com
/
javacodeadmin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

202506111201

This commit is contained in:
张潘 2025-06-11 12:01:07 +08:00
parent d3f6e98dec
commit 214b63d038
5 changed files with 4835 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3282
ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java
View File

File diff suppressed because it is too large Load Diff

1838
ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/AppletControllerUtil.java
View File

File diff suppressed because it is too large Load Diff

1
ruoyi-system/src/main/resources/mapper/system/GoodsOrderMapper.xml
View File

@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and pay_time BETWEEN #{paystartdate} AND #{payenddate} and pay_time BETWEEN #{paystartdate} AND #{payenddate}
</if> </if>
<if test="uid != null "> and uid = #{uid}</if> <if test="uid != null "> and uid = #{uid}</if>
<if test="status != null "> and status = #{status}</if>
<if test="productId != null "> and product_id = #{productId}</if> <if test="productId != null "> and product_id = #{productId}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if> <if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="transactionId != null and transactionId != ''"> and transaction_id = #{transactionId}</if> <if test="transactionId != null and transactionId != ''"> and transaction_id = #{transactionId}</if>

3
ruoyi-system/src/main/resources/mapper/system/IntegralLogMapper.xml
View File

@ -29,8 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="uid != null "> and uid = #{uid}</if> <if test="uid != null "> and uid = #{uid}</if>
<if test="type != null "> and type = #{type}</if> <if test="type != null "> and type = #{type}</if>
<if test="num != null "> and num = #{num}</if> <if test="num != null "> and num = #{num}</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
</where> </where>
order by id desc order by id desc
</select> </select>

2
ruoyi-system/src/main/resources/mapper/system/OrderLogMapper.xml
View File

@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if> <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
<if test="deletedAt != null "> and deleted_at = #{deletedAt}</if> <if test="deletedAt != null "> and deleted_at = #{deletedAt}</if>
</where> </where>
order by id desc order by created_at ASC
</select> </select>
<select id="selectOrderLogById" parameterType="Long" resultMap="OrderLogResult"> <select id="selectOrderLogById" parameterType="Long" resultMap="OrderLogResult">