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-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccount.java
View File

@@ -19,9 +19,7 @@ import java.util.Date;
public class UserAccount implements Serializable {
@TableField("user_id")
@TableId(value = "user_id", type = IdType.AUTO)
@TableId(type = IdType.NONE,value = "user_id")
private Integer userId;
@TableField("freeze_balance")
private BigDecimal freezeBalance;

2
pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMakerFlow.java
View File

@@ -29,6 +29,8 @@ public class UserMakerFlow implements Serializable {
private String bizCode;
@TableField("biz_name")
private String bizName;
@TableField("orderNumber")
private String orderNumber;
@TableField("amount")
private BigDecimal amount;
@TableField("balance")

2
pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java
View File

@@ -24,7 +24,7 @@ import java.util.Date;
// " ) t")
@TableName("(\n" +
" SELECT t1.*, t2.updateTime refundTime FROM tb_pluss_merchant_order t1\n" +
" LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2\n" +
" LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2 AND t2.status = 6\n" +
" ) t")
@Accessors(chain = true)
public class MerchantOrderVO extends MerchantOrder {