diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index e0af2a3c0..c9df59a19 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1083,6 +1083,7 @@ public class OrderService { // 通过取现id查询取现数据 ClearingWithdrawInfo clearingWithdrawInfo = clearingWithdrawInfoService.selectByWithdrawCode(withdrawCode); clearingWithdrawInfo.setWithdrawStatus(Constants.ONE); + clearingWithdrawInfo.setUpdateTime(DateUtils.getNowDate()); clearingWithdrawInfoService.insertOrUpdate(clearingWithdrawInfo); } @@ -1096,6 +1097,7 @@ public class OrderService { // 通过取现id查询取现数据 ClearingWithdrawInfo clearingWithdrawInfo = clearingWithdrawInfoService.selectByWithdrawCode(withdrawCode); clearingWithdrawInfo.setWithdrawStatus(Constants.TWO); + clearingWithdrawInfo.setUpdateTime(DateUtils.getNowDate()); clearingWithdrawInfoService.insertOrUpdate(clearingWithdrawInfo); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java index 2b8173ff3..17c6fddaa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java @@ -8,8 +8,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; /** - * 提现记录表 - */ + * 提现记录表 + */ @Getter @Setter @Builder @@ -17,52 +17,57 @@ import lombok.Setter; @NoArgsConstructor public class ClearingWithdrawInfo { /** - * 主键 - */ + * 主键 + */ private Integer id; /** - * 提现编号 - */ + * 商户id + */ + private String merchantId; + + /** + * 提现编号 + */ private String withdrawCode; /** - * 提现状态(0-处理中;1-已提现) - */ + * 提现状态(0-处理中;1-已提现) + */ private String withdrawStatus; /** - * 申请时间 - */ + * 申请时间 + */ private Date applicationTime; /** - * 到账时间 - */ + * 到账时间 + */ private Date arrivalTime; /** - * 创建人 - */ + * 创建人 + */ private String createBy; /** - * 创建时间 - */ + * 创建时间 + */ private Date createTime; /** - * 更新人 - */ + * 更新人 + */ private String updateBy; /** - * 更新时间 - */ + * 更新时间 + */ private Date updateTime; /** - * 删除标识(0-正常;1-删除) - */ + * 删除标识(0-正常;1-删除) + */ private String delFlag; } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java index a035bf87f..df572a156 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingWithdrawInfoMapper.java @@ -8,6 +8,7 @@ import java.util.List; public interface ClearingWithdrawInfoMapper { /** * delete by primary key + * * @param id primaryKey * @return deleteCount */ @@ -15,6 +16,7 @@ public interface ClearingWithdrawInfoMapper { /** * insert record to table + * * @param record the record * @return insert count */ @@ -26,6 +28,7 @@ public interface ClearingWithdrawInfoMapper { /** * insert record to table selective + * * @param record the record * @return insert count */ @@ -33,6 +36,7 @@ public interface ClearingWithdrawInfoMapper { /** * select by primary key + * * @param id primary key * @return object by primary key */ @@ -40,6 +44,7 @@ public interface ClearingWithdrawInfoMapper { /** * update record selective + * * @param record the updated record * @return update count */ @@ -47,6 +52,7 @@ public interface ClearingWithdrawInfoMapper { /** * update record + * * @param record the updated record * @return update count */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml index 727853baf..5d76a58ad 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml @@ -5,6 +5,7 @@ + @@ -17,8 +18,8 @@ - id, withdraw_code, withdraw_status, application_time, arrival_time, create_by, create_time, - update_by, update_time, del_flag + id, merchant_id, withdraw_code, withdraw_status, application_time, arrival_time, + create_by, create_time, update_by, update_time, del_flag