From 4bb5dbfa6768195d32800fdacd5dbe74c8e03bd3 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 8 Aug 2024 15:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=9B=E5=AE=89=E8=B1=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/app/AppUserMoneyController.java | 1 + .../java/com/sqx/modules/app/entity/UserMoneyResult.java | 3 +++ .../artificer/controller/app/AppArtificerController.java | 7 +++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java index 6d8cda4..9793bc5 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java @@ -79,6 +79,7 @@ public class AppUserMoneyController { userMoneyResult.setMoney(userMoney.getMoney()); userMoneyResult.setCashDeposit(userMoney.getCashDeposit()); userMoneyResult.setId(userMoney.getId()); + userMoneyResult.setSad(userMoney.getSad()); //获取当前时间 Date CurrentPeriod = new Date(); //获取当前时间周期的上一个周期 diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoneyResult.java b/src/main/java/com/sqx/modules/app/entity/UserMoneyResult.java index 13aa8aa..c8e94e1 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyResult.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyResult.java @@ -49,4 +49,7 @@ public class UserMoneyResult implements Serializable { @TableField("user_id") private Long userId; + @TableField("user_id") + private BigDecimal sad; + } diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java index ed13ae2..a4af811 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java @@ -137,9 +137,12 @@ public class AppArtificerController { @ApiOperation("查询技师列表") public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName, String longitude,String latitude,Integer sort,Integer authentication, - Integer by,String city,Long classifyId,String phone, Integer isStart,Integer technicianType,String isBack){ + Integer by,String city,Long classifyId,String phone, Integer isStart,Integer technicianType,String isBack,Integer status){ + if(status == null){ + status = -1; + } return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude, - sort,authentication,by,1,city,classifyId,phone,1,isStart,technicianType,isBack); + sort,authentication,by,status,city,classifyId,phone,1,isStart,technicianType,isBack); }