czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

余额相关改动，创客改动，订单相关

Browse Source
This commit is contained in:
liuyingfang
2023-08-26 16:46:50 +08:00
parent 01e435f575
commit af9cc1484e
17 changed files with 125 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java
View File

@@ -21,7 +21,7 @@ public interface MerchantOrderVOMapper extends BaseMapper<MerchantOrderVO> {
* @param orderNumber 订单号
* @return
*/
List<Map<String, Object>> getOnlineCouponList(@Param("orderNumber") String orderNumber);
List<Map<String, Object>> getOnlineCouponList(@Param("orderNumber") String orderNumber,@Param("id")Long id);
/**
@@ -29,5 +29,5 @@ public interface MerchantOrderVOMapper extends BaseMapper<MerchantOrderVO> {
* @param orderNumber 订单号
* @return
*/
List<Map<String, Object>> getOfflineCouponList(@Param("orderNumber") String orderNumber);
List<Map<String, Object>> getOfflineCouponList(@Param("orderNumber") String orderNumber,@Param("id")Long id);
}

4
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAccountMapper.java
View File

@@ -13,10 +13,10 @@ import java.math.BigDecimal;
public interface UserAccountMapper extends BaseMapper<UserAccount> {
@Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS out_balance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId}")
@Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS outBalance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId}")
UserAccount selectUserByUserId(@Param("userId")Integer userId,Integer t);
@Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS out_balance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId} for update")
@Select(value = "select user_id AS userId,freeze_balance AS freezeBalance,balance,out_balance AS outBalance,create_time AS createTime,update_time AS updateTime from tb_pluss_user_account where user_id=#{userId} for update")
UserAccount selectUserByUserId(@Param("userId")Integer userId);
@Update(value = "update tb_pluss_user_account set freeze_balance=freeze_balance+#{amount} where user_id=#{userId}")

12
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerFlowMapper.java
View File

@@ -18,14 +18,18 @@ public interface UserMakerFlowMapper extends BaseMapper<UserMakerFlow> {
"\tmf.biz_code AS bizCode,\n" +
"\tmf.biz_name AS bizName,\n" +
"\tbi.alias AS userName,\n" +
"\tmf.amount,\n" +
"\tmf.amount AS lowerAmount,\n" +
"\tmf.create_time AS createTime,\n" +
"\tmo.consumeFee AS lowerAmount \n" +
"\tmo.consumeFee AS amount \n" +
"FROM\n" +
"\t`tb_pluss_user_maker_flow` mf\n" +
"\tLEFT JOIN tb_pluss_merchant_base_info bi ON mf.user_id = bi.userId\n" +
"\tLEFT JOIN tb_pluss_merchant_order mo ON mf.orderNumber = mo.orderNumber \n" +
"\tWHERE mf.user_id = #{userId}\n" +
"\torder by id desc limit #{pageSize} offset #{offset}")
"WHERE\n" +
"\tmf.user_id = #{userId} \n" +
"\tAND mo.`status` = 1\n" +
"ORDER BY\n" +
"\tid DESC \n" +
"\tLIMIT #{pageSize} OFFSET #{offset}")
List<UserMakerQuotaVO> selectByUserId(@Param("userId") Long userId, @Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
}

6
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerQuotaMapper.java
View File

@@ -14,12 +14,12 @@ import java.math.BigDecimal;
*/
public interface UserMakerQuotaMapper extends BaseMapper<UserMakerQuota> {
BigDecimal sumQuota(@Param("userId") Long userId);
@Update(value = "update tb_pluss_user_maker_quota set amount=#{amount} where userId=#{userId}")
@Update(value = "update tb_pluss_user_maker_quota set amount=amount+#{amount} where userId=#{userId}")
Integer updateMakerFreeze(@Param("userId") Integer userId, @Param("amount") BigDecimal amount);
@Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}")
UserMakerQuota selectByUserId(@Param("userId") Long userId);
@Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}")
UserMakerQuota selectByUserId(@Param("userId") Integer userId);
// @Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}")
// UserMakerQuota selectByUserId(@Param("userId") Integer userId);
}

13
pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml
View File

@@ -15,8 +15,13 @@
SELECT
*
FROM tb_pluss_merchant_order
WHERE
<where>
orderNumber = #{orderNumber}
<if test="id!= null">
AND id=#{id}
</if>
</where>
</select>
<!-- <select id="getOfflineCouponList" resultType="java.util.Map">-->
@@ -30,7 +35,11 @@
SELECT
*
FROM tb_pluss_merchant_order
WHERE
<where>
orderNumber = #{orderNumber}
<if test="id!= null">
AND id=#{id}
</if>
</where>
</select>
</mapper>