From 38771aad9e96975c03bdc165111f9cbec716e791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 5 Aug 2024 14:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jjr/controller/JjrDataController.java | 33 +++++++++----- .../bl/commission/jjr/dao/JjrDataDao.java | 2 + .../bl/commission/jjr/entity/JjrData.java | 25 +++++++++++ .../jjr/service/JjrDataService.java | 2 + .../jjr/service/impl/JjrApplyServiceImpl.java | 8 +++- .../jjr/service/impl/JjrDataServiceImpl.java | 25 +++++++++++ .../mapper/bl/commission/jjr/JjrApplyDao.xml | 2 +- .../mapper/bl/commission/jjr/JjrDataDao.xml | 43 +++++++++++++++++-- 8 files changed, 122 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java index 6b9e514..dda6090 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,23 +19,33 @@ public class JjrDataController { @Autowired private JjrDataService service; + @GetMapping("/findPage") + @ApiOperation("查询（分页）") + public Result findPage(JjrData jjrData){ + return service.findPage(jjrData); + } + +// @GetMapping("/invitationArtificerPage") +// @ApiOperation("邀请技师（分页）") +// public Result invitationArtificerPage(JjrData jjrData){ +// return service.invitationArtificerPage(jjrData); +// } +// +// @GetMapping("/cancelInvitation") +// @ApiOperation("邀请技师（分页）") +// public Result invitationArtificerPage(JjrData jjrData){ +// return service.invitationArtificerPage(jjrData); +// } + @GetMapping("/jjrList") @ApiOperation("经纪人列表") - public Result jjrList(Integer page,Integer limit,String name,String phone){ - JjrData jjrData = new JjrData(); - jjrData.setPage(page); - jjrData.setLimit(limit); - jjrData.setName(name); - jjrData.setPhone(phone); + public Result jjrList(JjrData jjrData){ return service.findJjrPage(jjrData); } - @GetMapping("/modifyJjr") + @PostMapping("/modifyJjr") @ApiOperation("技师修改经纪人") - public Result modifyJjr(Long artificerUserId, String invitationCode){ - JjrData jjrData = new JjrData(); - jjrData.setArtificerUserId(artificerUserId); - jjrData.setInvitationCode(invitationCode); + public Result modifyJjr(JjrData jjrData){ service.modifyJjr(jjrData); return Result.success(); } diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java b/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java index f9ad1d7..93f0691 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrDataDao.java @@ -12,6 +12,8 @@ import java.util.List; @Mapper public interface JjrDataDao extends BaseMapper { + IPage findPage(Page page, @Param("params") JjrData jjrData); + IPage invitationArtificerPage(Page page, @Param("params") JjrData jjrData); IPage findJjrPage(Page page, @Param("params") JjrData jjrData); JjrData getByCode(String invitationCode); void modifyJjr(JjrData jjrData); diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrData.java b/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrData.java index 8df8937..8810578 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrData.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrData.java @@ -61,6 +61,11 @@ public class JjrData implements Serializable { */ @TableField(exist = false) private String invitationCode; + /** + *比例 + */ + @TableField(exist = false) + private BigDecimal rate; /** *备注 */ @@ -71,6 +76,26 @@ public class JjrData implements Serializable { */ @TableField(exist = false) private Integer status; + /** + *累计邀请技师 + */ + @TableField(exist = false) + private Integer artificerCount; + /** + *累计成交订单数量 + */ + @TableField(exist = false) + private Integer ordersCount; + /** + *累计获得佣金 + */ + @TableField(exist = false) + private BigDecimal money; + /** + *入住时间 + */ + @TableField(exist = false) + private String approveTime; /** *开始时间 */ diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java index bdbb842..0b05f8c 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrDataService.java @@ -5,6 +5,8 @@ import com.sqx.common.utils.Result; import com.sqx.modules.bl.commission.jjr.entity.JjrData; public interface JjrDataService extends IService { + Result findPage(JjrData jjrData); + Result invitationArtificerPage(JjrData jjrData); Result findJjrPage(JjrData jjrData); JjrData getByCode(String invitationCode); void modifyJjr(JjrData jjrData); diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java index 9da4670..dd108c0 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java @@ -67,13 +67,17 @@ public class JjrApplyServiceImpl extends ServiceImpl impl List list = baseMapper.findList(null); for(int i=0;i implements JjrDataService { + @Autowired + private JjrConfigService configService; + + @Override + public Result findPage(JjrData jjrData){ + Page pages=new Page<>(jjrData.getPage(),jjrData.getLimit()); + return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,jjrData))); + } + + @Override + public Result invitationArtificerPage(JjrData jjrData){ + Page pages=new Page<>(jjrData.getPage(),jjrData.getLimit()); + return Result.success().put("data",new PageUtils(baseMapper.invitationArtificerPage(pages,jjrData))); + } + @Override public Result findJjrPage(JjrData jjrData){ Page pages=new Page<>(jjrData.getPage(),jjrData.getLimit()); @@ -26,6 +47,10 @@ public class JjrDataServiceImpl extends ServiceImpl impleme @Override public void modifyJjr(JjrData jjrData){ + JjrConfig jjrConfig = configService.getOne(new QueryWrapper()); + BigDecimal rate = jjrConfig.getRate(); + rate = rate.divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP); + jjrData.setRate(rate); baseMapper.modifyJjr(jjrData); } } \ No newline at end of file diff --git a/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml b/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml index 7e2f187..f509452 100644 --- a/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml +++ b/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml @@ -81,7 +81,7 @@ update tb_user - set shop_rate=#{rate} + set bl_jjr_rate=#{rate} where user_id=#{userId} diff --git a/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml b/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml index cc91445..d821f8d 100644 --- a/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml +++ b/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml @@ -3,8 +3,9 @@ - + select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion,b.invitation_code,a.approve_time + from bl_jjr_apply a inner join tb_user b on a.user_id = b.user_id where a.status= 1 @@ -15,10 +16,44 @@ and a.phone like concat('%',#{params.phone},'%') - and a.create_time >= #{params.startTime} + and a.approve_time >= #{params.startTime} - and a.create_time <= #{params.endTime} + and a.approve_time <= #{params.endTime} + + order by id desc + + + + +