From e5058636105f9b4b8253d52390742c9bcd7c96d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 6 Aug 2024 17:28:13 +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 --- .../app/AppUserMoneyController.java | 3 +- .../modules/app/entity/UserMoneyDetails.java | 7 +- .../impl/UserMoneyDetailsServiceImpl.java | 34 +++++- .../service/impl/OrdersServiceImpl.java | 21 +--- .../jjr/controller/app/AppJjrController.java | 72 ++++++++++- .../bl/commission/jjr/dao/JjrDataDao.java | 3 + .../bl/commission/jjr/entity/JjrData.java | 15 +++ .../jjr/service/JjrDataService.java | 5 + .../jjr/service/impl/JjrDataServiceImpl.java | 113 ++++++++++++++++++ .../pay/controller/app/AliPayController.java | 12 +- .../pay/service/impl/WxServiceImpl.java | 12 +- .../mapper/app/UserMoneyDetailsDao.xml | 6 +- .../mapper/bl/commission/jjr/JjrDataDao.xml | 96 ++++++++++++++- 13 files changed, 358 insertions(+), 41 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 0aa6d04..6d8cda4 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 @@ -69,8 +69,6 @@ public class AppUserMoneyController { return userMoneyService.payUserMoneyArtificer(userId, artificerId, money); } - - @GetMapping("/selectMyMoney") @Login @ApiOperation("我的钱包余额") @@ -92,6 +90,7 @@ public class AppUserMoneyController { period.setStartFundData(periodDate.getStartFundData()); // period.setEndFundData(CurrentPeriod); period.setEndFundData(periodDate.getEndFundData()); + period.setFundType(2);//技师 List filteredPersons = userMoneyDetailsService.selectIncome(period); //进账 double incomeLong= filteredPersons.stream() diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java index efceacc..a9a2fa2 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java @@ -43,9 +43,9 @@ public class UserMoneyDetails implements Serializable { @ApiModelProperty("标题") private String title; /** - * 1注册 2购买 4提现 + * 1注册 2购买 3提现 4充值 5打赏 */ - @ApiModelProperty("1注册 2购买 3提现 7商家 8指定钱包") + @ApiModelProperty("1注册 2购买 3提现 4充值 5打赏") private Integer classify; /** * 类型 @@ -88,9 +88,8 @@ public class UserMoneyDetails implements Serializable { private Long artificerId; /** - * 所属角色 1用户 2技师 + * 所属角色 1用户 2技师 3商家 4经纪人 5分销商 6业务员 7代理 */ - private Integer blRole; /** diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java index 97d41f0..e132688 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java @@ -329,12 +329,44 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl selectIncome(Period period) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("user_id", period.getArtificerId()); + if(period.getFundType()!=null){ + switch (period.getDetailsType()){ + case 1: + queryWrapper.eq("bl_role", 1);//用户 + break; + case 2: + queryWrapper.eq("bl_role", 2);//技师 + break; + case 3: + queryWrapper.eq("bl_role", 3);//商家 + break; + case 4: + queryWrapper.eq("bl_role", 4);//经纪人 + break; + case 5: + queryWrapper.eq("bl_role", 5);//分销员 + break; + case 6: + queryWrapper.eq("bl_role", 6);//业务员 + break; + case 7: + queryWrapper.eq("bl_role", 7);//代理 + break; + } + } +// if(StringUtil.isNotEmpty(period.getStartFundData().toString())){ +// queryWrapper.between("create_time", period.getStartFundData(), period.getEndFundData()); +// } if(StringUtil.isNotEmpty(period.getStartFundData().toString())){ - queryWrapper.between("create_time", period.getStartFundData(), period.getEndFundData()); + queryWrapper.ge("create_time", period.getStartFundData()); + } + if(StringUtil.isNotEmpty(period.getEndFundData().toString())){ + queryWrapper.le("create_time", period.getEndFundData()); } if(period.getDetailsType()!= null){ //方便前端判断 传1则查询全部 2查询收入 3查询支出 diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 305d6d1..159cd56 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -2511,9 +2511,8 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("分销员收益："+orders.getOneUserMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(5); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); - userMoneyDetails.setBlRole(1); + userMoneyDetails.setBlRole(5); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); } @@ -2535,9 +2534,8 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("经纪人收益："+orders.getJjrMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(6); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); - userMoneyDetails.setBlRole(2); + userMoneyDetails.setBlRole(4); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); } @@ -2559,7 +2557,6 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("商家收益："+orders.getShopMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(7); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); userMoneyDetails.setBlRole(3); userMoneyDetails.setBlFlag(1); @@ -5478,9 +5475,8 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("分销员收益：" + orders.getOneUserMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(5); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); - userMoneyDetails.setBlRole(1); + userMoneyDetails.setBlRole(5); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); } @@ -5503,9 +5499,8 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("经纪人收益："+orders.getJjrMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(6); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); - userMoneyDetails.setBlRole(2); + userMoneyDetails.setBlRole(4); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); } @@ -5527,7 +5522,6 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("商家收益："+orders.getShopMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(7); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); userMoneyDetails.setBlRole(3); userMoneyDetails.setBlFlag(1); @@ -5733,9 +5727,8 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("分销员收益："+orders.getOneUserMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(5); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); - userMoneyDetails.setBlRole(1); + userMoneyDetails.setBlRole(5); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); } @@ -5758,9 +5751,8 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("经纪人收益："+orders.getJjrMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(6); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); - userMoneyDetails.setBlRole(2); + userMoneyDetails.setBlRole(4); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); } @@ -5781,7 +5773,6 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setContent("商家收益："+orders.getShopMoney()); userMoneyDetails.setType(1); userMoneyDetails.setState(2); - userMoneyDetails.setClassify(7); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); userMoneyDetails.setBlRole(3); userMoneyDetails.setBlFlag(1); diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java index 64ae913..c65af8a 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java @@ -1,14 +1,19 @@ package com.sqx.modules.bl.commission.jjr.controller.app; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.sqx.common.utils.Result; +import com.sqx.modules.app.annotation.Login; import com.sqx.modules.bl.commission.jjr.entity.JjrApply; +import com.sqx.modules.bl.commission.jjr.entity.JjrConfig; import com.sqx.modules.bl.commission.jjr.entity.JjrData; import com.sqx.modules.bl.commission.jjr.service.JjrApplyService; +import com.sqx.modules.bl.commission.jjr.service.JjrConfigService; import com.sqx.modules.bl.commission.jjr.service.JjrDataService; 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.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -23,13 +28,78 @@ public class AppJjrController { @Autowired private JjrApplyService applyService; + @Autowired + private JjrDataService dataService; + + @Autowired + private JjrConfigService configService; + + @Login @GetMapping("/apply") @ApiOperation("申请经纪人") - public Result apply(JjrApply jjrApply){ + public Result apply(@RequestAttribute Long userId, String name, String phone, String remarks){ + JjrApply jjrApply = new JjrApply(); + jjrApply.setUserId(userId); + jjrApply.setName(name); + jjrApply.setPhone(phone); + jjrApply.setRemarks(remarks); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); jjrApply.setCreateTime(sdf.format(new Date())); applyService.add(jjrApply); return Result.success(); } + + /** + * 可提现、累计佣金、已提现、未入账、今日成交订单、累计成交订单、今日新增技师、累计入驻技师 + */ + @Login + @GetMapping("/myJjr") + @ApiOperation("我是经纪人") + public Result myJjr(@RequestAttribute Long userId){ + return dataService.myJjr(userId); + } + + /** + * 我的收益-收益明细 + */ + @Login + @GetMapping("/incomeDetail") + @ApiOperation("我的收益") + public Result incomeDetail(@RequestAttribute Long userId, Integer page, Integer limit){ + return dataService.incomeDetail(userId,page,limit); + } + + /** + * 提现记录-提现明细 + */ + @Login + @GetMapping("/withdrawalDetail") + @ApiOperation("我的提现") + public Result withdrawalDetail(@RequestAttribute Long userId, Integer page, Integer limit){ + return dataService.withdrawalDetail(userId,page,limit); + } + + /** + * 我的邀请-邀请技师明细 + */ + @Login + @GetMapping("/artificerDetail") + @ApiOperation("我邀请的技师") + public Result artificerDetail(@RequestAttribute Long userId, Integer page, Integer limit){ + JjrData jjrData = dataService.getByUserId(userId); + jjrData.setPage(page); + jjrData.setLimit(limit); + return dataService.invitationArtificerPage(jjrData); + } + + /** + * 邀请海报 + */ + @GetMapping("/poster") + @ApiOperation("经纪人邀请海报") + public Result poster(){ + JjrConfig entity = configService.getOne(new QueryWrapper()); + return Result.success().put("data",entity); + } } 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 aeb56ae..c2910e6 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 @@ -19,4 +19,7 @@ public interface JjrDataDao extends BaseMapper { void cancelInvitation(JjrData jjrData); JjrData getByCode(String invitationCode); void modifyJjr(JjrData jjrData); + JjrData findJjr(JjrData jjrData); + JjrData getByUserId(Long userId); + } \ No newline at end of file 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 8810578..924c164 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 @@ -76,6 +76,11 @@ public class JjrData implements Serializable { */ @TableField(exist = false) private Integer status; + /** + *创建时间 + */ + @TableField(exist = false) + private String createTime; /** *累计邀请技师 */ @@ -86,6 +91,16 @@ public class JjrData implements Serializable { */ @TableField(exist = false) private Integer ordersCount; + /** + *累计邀请技师 + */ + @TableField(exist = false) + private Integer curArtificerCount; + /** + *累计成交订单数量 + */ + @TableField(exist = false) + private Integer curOrdersCount; /** *累计获得佣金 */ 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 0a9cab6..ff5ceed 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 @@ -12,4 +12,9 @@ public interface JjrDataService extends IService { void cancelInvitation(JjrData jjrData); JjrData getByCode(String invitationCode); void modifyJjr(JjrData jjrData); + + Result myJjr(Long userId); + Result incomeDetail(Long userId,Integer page, Integer limit); + Result withdrawalDetail(Long userId,Integer page, Integer limit); + JjrData getByUserId(Long userId); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java index c3cba31..387597a 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java @@ -5,22 +5,33 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; +import com.sqx.modules.app.entity.UserMoneyDetails; +import com.sqx.modules.app.service.UserMoneyDetailsService; +import com.sqx.modules.artificer.entity.Orders; +import com.sqx.modules.artificer.entity.Period; import com.sqx.modules.bl.commission.jjr.dao.JjrDataDao; import com.sqx.modules.bl.commission.jjr.entity.JjrApply; import com.sqx.modules.bl.commission.jjr.entity.JjrConfig; import com.sqx.modules.bl.commission.jjr.entity.JjrData; import com.sqx.modules.bl.commission.jjr.service.JjrConfigService; import com.sqx.modules.bl.commission.jjr.service.JjrDataService; +import com.sqx.modules.utils.PeriodUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class JjrDataServiceImpl extends ServiceImpl implements JjrDataService { @Autowired private JjrConfigService configService; + @Autowired + private UserMoneyDetailsService userMoneyDetailsService; @Override public Result findPage(JjrData jjrData){ @@ -64,4 +75,106 @@ public class JjrDataServiceImpl extends ServiceImpl impleme jjrData.setRate(rate); baseMapper.modifyJjr(jjrData); } + + @Override + public Result myJjr(Long userId){ + Map result=new HashMap<>(); + //可提现 + Date CurrentPeriod = new Date();//获取当前时间 + //获取当前时间周期的上一个周期 + Period periodDate= PeriodUtil.previousIssue(CurrentPeriod); + Period period = new Period(); + period.setArtificerId(String.valueOf(userId)); + period.setDetailsType(1); + period.setEndFundData(periodDate.getEndFundData()); + period.setFundType(4);//经纪人 + List filteredPersons = userMoneyDetailsService.selectIncome(period); + //进账 + double incomeLong= filteredPersons.stream() + .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 1) + .filter(UserMoneyDetails -> UserMoneyDetails.getState() == 2) + .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue()) + .sum(); + //出账 + double outgoingLong= filteredPersons.stream() + .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 2) + .filter(UserMoneyDetails -> UserMoneyDetails.getState() == 2) + .filter(UserMoneyDetails -> !UserMoneyDetails.getContent().contains("管理端减少")) + .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue()) + .sum(); + + BigDecimal incomeMoney= BigDecimal.valueOf(incomeLong).setScale(2,BigDecimal.ROUND_HALF_UP); + BigDecimal outgoingMoney = BigDecimal.valueOf(outgoingLong).setScale(2,BigDecimal.ROUND_HALF_UP); + BigDecimal withdrawableAmount = incomeMoney.subtract(outgoingMoney).setScale(2,BigDecimal.ROUND_HALF_UP); + result.put("withdrawableAmount",withdrawableAmount);//可提现金额 + //累计佣金 + Period period2 = new Period(); + period2.setArtificerId(String.valueOf(userId)); + period2.setDetailsType(1); + period2.setFundType(4);//经纪人 + List filteredPersons2 = userMoneyDetailsService.selectIncome(period2); + double income= filteredPersons2.stream() + .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 1) + .filter(UserMoneyDetails -> UserMoneyDetails.getState() == 2) + .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue()) + .sum(); + result.put("income",income);//累计佣金 + //已提现金额 + double withdrawal= filteredPersons2.stream() + .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 2) + .filter(UserMoneyDetails -> UserMoneyDetails.getState() == 2) + .filter(UserMoneyDetails -> UserMoneyDetails.getClassify() == 3) + .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue()) + .sum(); + result.put("withdrawal",withdrawal);//已提现金额 + double notCredited = filteredPersons2.stream() + .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 1) + .filter(UserMoneyDetails -> UserMoneyDetails.getState() == 1) + .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue()) + .sum(); + result.put("notCredited",notCredited);//未入账 + JjrData jjrData = new JjrData(); + jjrData.setUserId(userId); + jjrData = baseMapper.findJjr(jjrData); + result.put("curOrdersCount",jjrData.getCurOrdersCount());//今日成交订单 + result.put("ordersCount",jjrData.getOrdersCount());//累计成交订单 + result.put("curArtificerCount",jjrData.getCurArtificerCount());//今日新增技师 + result.put("artificerCount",jjrData.getArtificerCount());//累计入驻技师 + return Result.success().put("data",result); + } + + @Override + public Result incomeDetail(Long userId,Integer page, Integer limit){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("user_id", userId); + queryWrapper.eq("bl_role", 4);//经纪人 + queryWrapper.eq("type", 1); + queryWrapper.eq("state", 2); + queryWrapper.eq("manipulate_type", 2); + queryWrapper.orderByDesc("create_time"); + Page pages = new Page<>(page, limit); + PageUtils pageUtils = new PageUtils(userMoneyDetailsService.page(pages,queryWrapper)); + return Result.success().put("data", pageUtils); + } + + @Override + public Result withdrawalDetail(Long userId,Integer page, Integer limit){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("user_id", userId); + queryWrapper.eq("classify", 3); + queryWrapper.eq("type", 2); + queryWrapper.eq("state", 2); + queryWrapper.eq("bl_role", 4);//经纪人 + queryWrapper.eq("manipulate_type", 2); + queryWrapper.orderByDesc("create_time"); + Page pages = new Page<>(page, limit); + PageUtils pageUtils = new PageUtils(userMoneyDetailsService.page(pages,queryWrapper)); + return Result.success().put("data", pageUtils); + } + + @Override + public JjrData getByUserId(Long userId){ + return baseMapper.getByUserId(userId); + } + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 2f29ad8..23caf54 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -928,7 +928,7 @@ public class AliPayController { String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String[] couponIds = couponIssue.getCouponIds().split(","); UserMoneyDetails userMoneyDetails=new UserMoneyDetails(); - userMoneyDetails.setClassify(1); + userMoneyDetails.setClassify(2); userMoneyDetails.setType(2); userMoneyDetails.setState(2); userMoneyDetails.setManipulateType(1); @@ -1044,7 +1044,7 @@ public class AliPayController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //用户流水 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setClassify(8); + userMoneyDetails.setClassify(5); userMoneyDetails.setManipulateType(1); userMoneyDetails.setUserId(payDetails.getUserId()); userMoneyDetails.setTitle("支付宝给技师打赏"); @@ -1066,7 +1066,7 @@ public class AliPayController { //插入余额 userMoneyDetails2.setBalance(userNowMoney.getMoney()); userMoneyDetails2.setManipulateType(2); - userMoneyDetails2.setClassify(8); + userMoneyDetails2.setClassify(5); userMoneyDetails2.setUserId(userEntity.getUserId()); userMoneyDetails2.setTitle("用户支付宝打赏"); userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”支付宝打赏:"+money); @@ -2284,7 +2284,7 @@ public class AliPayController { String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String[] couponIds = couponIssue.getCouponIds().split(","); UserMoneyDetails userMoneyDetails=new UserMoneyDetails(); - userMoneyDetails.setClassify(1); + userMoneyDetails.setClassify(2); userMoneyDetails.setType(2); userMoneyDetails.setState(2); userMoneyDetails.setManipulateType(1); @@ -2400,7 +2400,7 @@ public class AliPayController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //用户流水 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setClassify(8); + userMoneyDetails.setClassify(5); userMoneyDetails.setManipulateType(1); userMoneyDetails.setUserId(payDetails.getUserId()); userMoneyDetails.setTitle("支付宝给技师打赏"); @@ -2422,7 +2422,7 @@ public class AliPayController { //插入余额 userMoneyDetails2.setBalance(userNowMoney.getMoney()); userMoneyDetails2.setManipulateType(2); - userMoneyDetails2.setClassify(8); + userMoneyDetails2.setClassify(5); userMoneyDetails2.setUserId(userEntity.getUserId()); userMoneyDetails2.setTitle("用户支付宝打赏"); userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”支付宝打赏:"+money); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index 8999030..4e7d5dc 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -1737,7 +1737,7 @@ public class WxServiceImpl implements WxService { String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String[] couponIds = couponIssue.getCouponIds().split(","); UserMoneyDetails userMoneyDetails=new UserMoneyDetails(); - userMoneyDetails.setClassify(1); + userMoneyDetails.setClassify(2); userMoneyDetails.setType(2); userMoneyDetails.setState(2); userMoneyDetails.setManipulateType(1); @@ -1853,7 +1853,7 @@ public class WxServiceImpl implements WxService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //用户流水 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setClassify(8); + userMoneyDetails.setClassify(5); userMoneyDetails.setManipulateType(1); userMoneyDetails.setUserId(payDetails.getUserId()); userMoneyDetails.setTitle("微信给技师打赏"); @@ -1875,7 +1875,7 @@ public class WxServiceImpl implements WxService { //插入余额 userMoneyDetails2.setBalance(userNowMoney.getMoney()); userMoneyDetails2.setManipulateType(2); - userMoneyDetails2.setClassify(8); + userMoneyDetails2.setClassify(5); userMoneyDetails2.setUserId(userEntity.getUserId()); userMoneyDetails2.setTitle("用户微信打赏"); userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”微信打赏:"+money); @@ -2505,7 +2505,7 @@ public class WxServiceImpl implements WxService { String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String[] couponIds = couponIssue.getCouponIds().split(","); UserMoneyDetails userMoneyDetails=new UserMoneyDetails(); - userMoneyDetails.setClassify(1); + userMoneyDetails.setClassify(2); userMoneyDetails.setType(2); userMoneyDetails.setState(2); userMoneyDetails.setManipulateType(1); @@ -2621,7 +2621,7 @@ public class WxServiceImpl implements WxService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //用户流水 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setClassify(8); + userMoneyDetails.setClassify(5); userMoneyDetails.setManipulateType(1); userMoneyDetails.setUserId(payDetails.getUserId()); userMoneyDetails.setTitle("微信给技师打赏"); @@ -2643,7 +2643,7 @@ public class WxServiceImpl implements WxService { //插入余额 userMoneyDetails2.setBalance(userNowMoney.getMoney()); userMoneyDetails2.setManipulateType(2); - userMoneyDetails2.setClassify(8); + userMoneyDetails2.setClassify(5); userMoneyDetails2.setUserId(userEntity.getUserId()); userMoneyDetails2.setTitle("用户微信打赏"); userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”微信打赏:"+money); diff --git a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml index 3df5716..192a794 100644 --- a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml +++ b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml @@ -3,10 +3,10 @@ select x.id,x.user_id,y.avatar,y.user_name,x.name,x.phone,x.remarks,x.create_time,x.status,x.opinion,y.invitation_code,x.approve_time, - (select count(*) from tb_user ac where ac.bl_jjr_code = y.invitation_code) as artificerCount, + ifnull(select count(*) from tb_user ac inner join artificer aa on a.user_id = aa.user_id where ac.bl_jjr_code = y.invitation_code,0) as artificerCount, ifnull(t1.ordersCount,0) as ordersCount, - ifnull(t2.money,0) as money + ifnull(t3.money,0) as money from bl_jjr_apply x inner join tb_user y on x.user_id = y.user_id left join ( @@ -47,7 +47,7 @@ where state = 2 and type = 1 group by user_id - ) t2 on t2.user_id = x.user_id + ) t3 on t3.user_id = x.user_id where x.status= 1 and x.name like concat('%',#{params.name},'%') @@ -131,4 +131,94 @@ where user_id=#{artificerUserId} + + + + \ No newline at end of file