diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java b/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java index 6ffd051..3d7a9dc 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java @@ -5,6 +5,7 @@ import com.sqx.modules.app.annotation.Login; import com.sqx.modules.app.entity.VipDetails; import com.sqx.modules.app.service.VipDetailsService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; @@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/app/VipDetails") @AllArgsConstructor -@Api("app 会员详情信息") +@Api(value = "APP会员详情信息", tags = {"APP会员详情信息"}) public class AppVipDetailsController { private VipDetailsService appVipDetailsService; /** @@ -22,8 +23,8 @@ public class AppVipDetailsController { * * @return */ - @Login - @ApiParam("查询会员的详情信息") +// @Login + @ApiOperation("查询会员的详情信息") @GetMapping("/selectVipDetails") public Result selectVipDetails() { return appVipDetailsService.selectVipDetails(); @@ -34,8 +35,8 @@ public class AppVipDetailsController { * * @return */ - @Login - @ApiParam("获取会员的详情信息") +// @Login + @ApiOperation("获取会员的详情信息") @GetMapping("/getVipDetailByUser") public Result getVipDetailByUser(Long userId) { return appVipDetailsService.getVipDetailByUser(userId); @@ -46,7 +47,7 @@ public class AppVipDetailsController { * * @return */ - @Login +// @Login @ApiParam("添加会员的详情信息") @GetMapping("/insertVipDetails") public Result insertVipDetails(VipDetails vipDetails) { diff --git a/src/main/java/com/sqx/modules/app/entity/VipDetails.java b/src/main/java/com/sqx/modules/app/entity/VipDetails.java index aa12587..6bb9220 100644 --- a/src/main/java/com/sqx/modules/app/entity/VipDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/VipDetails.java @@ -40,6 +40,15 @@ public class VipDetails implements Serializable { //优惠力度 private BigDecimal rate; + @TableField(exist = false) + private String endTime; + + @TableField(exist = false) + private Integer isVip; + + @TableField(exist = false) + private String rateStr; + /** * 用户ID */ diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java index 1a51d6b..592429d 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java @@ -43,6 +43,8 @@ public class UserMoneyServiceImpl extends ServiceImpl i @Autowired private ArtificerService artificerService; @Autowired + private UserService userService; + @Autowired private UserMoneyDetailsServiceImpl userMoneyDetailsService; @Override public Result payUserMoneyArtificer(@RequestAttribute Long userId, Long artificerId, BigDecimal money){ @@ -52,46 +54,59 @@ public class UserMoneyServiceImpl extends ServiceImpl i } Artificer artificer = artificerService.getById(artificerId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String format = sdf.format(new Date()); + //用户钱包打赏 updateMoney(2,userId,money.doubleValue()); UserMoneyDetails userMoneyDetails=new UserMoneyDetails(); - userMoneyDetails.setMoney(money); //查询用户当前余额 UserMoney userNowMoney = selectUserMoneyByUserId(userId); //插入余额 userMoneyDetails.setBalance(userNowMoney.getMoney()); //插入操作类型为已操作用户余额 + userMoneyDetails.setClassify(8); userMoneyDetails.setManipulateType(2); + userMoneyDetails.setMoney(money); userMoneyDetails.setUserId(userId); - userMoneyDetails.setContent("指定技师“"+artificer.getArtificerName()+"”钱包充值:"+money); - userMoneyDetails.setTitle("钱包充值技师钱包"); + userMoneyDetails.setTitle("钱包给技师打赏"); + userMoneyDetails.setContent("使用钱包给指定技师“"+artificer.getArtificerName()+"”打赏:"+money); userMoneyDetails.setType(2); - userMoneyDetails.setCreateTime(format); + userMoneyDetails.setState(2); + userMoneyDetails.setArtificerId(artificerId); + userMoneyDetails.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setBlRole(1); + userMoneyDetails.setBlFlag(1); userMoneyDetailsDao.insert(userMoneyDetails); +//2024-06-15注释掉，user_money_artificer 表一直没用上。用的是 user_money_details 表 +// UserMoneyArtificer userMoneyArtificer = userMoneyArtificerService.getOne(new QueryWrapper().eq("user_id",userId).eq("artificer_id", artificerId)); +// if(userMoneyArtificer==null){ +// userMoneyArtificer=new UserMoneyArtificer(); +// userMoneyArtificer.setUserId(userId); +// userMoneyArtificer.setArtificerId(artificerId); +// userMoneyArtificer.setMoney(money); +// userMoneyArtificer.setCreateTime(DateUtils.format(new Date())); +// userMoneyArtificerService.save(userMoneyArtificer); +// }else{ +// userMoneyArtificerService.updateMoney(1,userId,artificerId,money.doubleValue()); +// } - UserMoneyArtificer userMoneyArtificer = userMoneyArtificerService.getOne(new QueryWrapper().eq("user_id",userId).eq("artificer_id", artificerId)); - if(userMoneyArtificer==null){ - userMoneyArtificer=new UserMoneyArtificer(); - userMoneyArtificer.setUserId(userId); - userMoneyArtificer.setArtificerId(artificerId); - userMoneyArtificer.setMoney(money); - userMoneyArtificer.setCreateTime(DateUtils.format(new Date())); - userMoneyArtificerService.save(userMoneyArtificer); - }else{ - userMoneyArtificerService.updateMoney(1,userId,artificerId,money.doubleValue()); - } - - /*userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setClassify(8); - userMoneyDetails.setUserId(userId); - userMoneyDetails.setTitle("钱包充值技师钱包"); - userMoneyDetails.setContent("指定技师“"+artificer.getArtificerName()+"”钱包充值:"+money); - userMoneyDetails.setType(1); - userMoneyDetails.setMoney(money); - userMoneyDetails.setCreateTime(format); - userMoneyDetails.setArtificerId(artificerId); - userMoneyDetailsDao.insert(userMoneyDetails);*/ + //技师获得打赏 + UserEntity userEntity = userService.queryByUserId(userId); + updateMoney(1, artificerId, money.doubleValue()); + UserMoney userNowMoney2 = selectUserMoneyByUserId(artificerId); + UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(); + userMoneyDetails2.setBalance(userNowMoney2.getMoney()); + userMoneyDetails2.setClassify(8); + userMoneyDetails2.setManipulateType(2); + userMoneyDetails2.setUserId(artificerId); + userMoneyDetails2.setTitle("用户钱包打赏"); + userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”钱包打赏:"+money); + userMoneyDetails2.setType(1); + userMoneyDetails2.setState(2); + userMoneyDetails2.setMoney(money); + userMoneyDetails2.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setBlRole(2); + userMoneyDetails.setBlFlag(1); + userMoneyDetailsDao.insert(userMoneyDetails2); return Result.success(); } diff --git a/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java index 8bdf879..01b52f5 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java @@ -8,6 +8,7 @@ import com.sqx.modules.app.entity.VipDetails; import com.sqx.modules.app.service.VipDetailsService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; @Service @@ -19,12 +20,29 @@ public class VipDetailsServiceImpl extends ServiceImpl list = baseMapper.selectList(queryWrapper); + for(int i=0;i 0) { + int part = number % 10; + if (part == 0) { + + } else { + sb.append(CN_NUMBERS[part]); + } + number /= 10; + } + return sb.reverse().toString(); + } + } 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 89824fe..fe8974a 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 @@ -118,21 +118,6 @@ public class AppArtificerController { sort,authentication,by,-1,city,classifyId,phone,1,isStart); } - /** - * 查询附近技师列表 - * @param page 第几页 - * @param limit 每页几条 - * @param artificerName 技师姓名 - * @param longitude 精度 - * @param latitude 维度 - * @param city 城市 - * @return - */ - @GetMapping("/selectNearByArtificerList") - @ApiOperation("查询附近技师列表") - public Result selectNearByArtificerList(Integer page, Integer limit, String artificerName, String longitude,String latitude,String city){ - return artificerService.selectNearByArtificerList(page, limit, artificerName,longitude,latitude,city); - } @GetMapping("/selectArtificerMassageList") @ApiOperation("查询技师服务列表") @@ -508,11 +493,20 @@ public class AppArtificerController { return Result.success().put("data",result); } - @Login - @PostMapping("/getHomeStartArtificerList") - @ApiOperation("首页明星技师") - public Result getHomeStartArtificerList(Integer page,Integer limit,Integer isStart,Integer status,String city){ - return artificerService.getHomeStartArtificerList(page,limit,isStart,status,city); + + /** + * 查询附近技师列表 + * @param page 第几页 + * @param limit 每页几条 + * @param longitude 精度 + * @param latitude 维度 + * @param city 城市 + * @return + */ + @GetMapping("/getHomeArtificerList") + @ApiOperation("首页技师-明星和附近技师") + public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){ + return artificerService.getHomeArtificerList(page,limit,isStart,status,city,longitude,latitude); } diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java index 7167edd..3d9d203 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java @@ -4,6 +4,7 @@ package com.sqx.modules.artificer.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sqx.common.utils.Result; import com.sqx.modules.artificer.entity.Artificer; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,7 +20,7 @@ public interface ArtificerDao extends BaseMapper { @Param("latitude")String latitude,@Param("sort") Integer sort, @Param("authentication") Integer authentication,@Param("by") Integer by, @Param("status") Integer status,@Param("city") String city, - @Param("classifyId") Long classifyId,@Param("phone") String phone,Integer user); + @Param("classifyId") Long classifyId,@Param("phone") String phone,Integer user,@Param("isStart") Integer isStart); Artificer selectArtificerById(@Param("userId") Long userId,@Param("artificerId") Long artificerId,@Param("longitude") String longitude,@Param("latitude") String latitude); @@ -32,4 +33,6 @@ public interface ArtificerDao extends BaseMapper { IPage selectUserListByConsortiaId(Page page, String userName, String phone, Long consortiaId, Long shopId, Integer flag, String time); Integer selectArtificerMassageDuration(Long artificerId); + + IPage getHomeStartArtificerList(Page page,@Param("isStart")Integer isStart, @Param("status")Integer status, @Param("city")String city); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java index e39dc7c..f630964 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java @@ -129,7 +129,26 @@ public class Artificer implements Serializable { private BigDecimal rate; + /** + * 技师类型 3新手 4专家 5资深 + */ private Integer technicianType; + + /** + * 技师类型描述 + */ + @TableField(exist = false) + private String technicianTypeName; + + /** + * 技师类型 比例 + */ + @TableField(exist = false) + private Integer technicianTypeRate; + + /** + * 是否是明星技师 1是 2否 + */ private Integer isStart; @@ -151,9 +170,18 @@ public class Artificer implements Serializable { @TableField(exist = false) private Integer distance; + /** + * 关注，收藏数 + */ @TableField(exist = false) private Integer collectCount; + /** + * 我的收藏 + */ + @TableField(exist = false) + private Integer myCollectCount; + @TableField(exist = false) private String phone; @@ -172,8 +200,24 @@ public class Artificer implements Serializable { @TableField(exist = false) private BigDecimal money; + /** + * 商家id + */ @TableField(exist = false) private Long consortiaId; + + /** + * 商家名称 + */ + @TableField(exist = false) + private String consortiaName; + + /** + * 是否新人 1是 2否 + */ + @TableField(exist = false) + private Integer isNewer; + /** * 当前等级 */ diff --git a/src/main/java/com/sqx/modules/artificer/entity/Orders.java b/src/main/java/com/sqx/modules/artificer/entity/Orders.java index f3cc064..ae2261f 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Orders.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Orders.java @@ -297,6 +297,11 @@ public class Orders implements Serializable { * 项目收益 */ private BigDecimal projectBenefits; + /** + * 用户服务包ID + */ + private Long userPackageId; + /** * 项目名称 */ diff --git a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java index d10cdac..46b660a 100644 --- a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java +++ b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java @@ -14,7 +14,7 @@ public interface ArtificerService extends IService { Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName, String longitude,String latitude,Integer sort,Integer authentication, - Integer by,Integer status,String city,Long classifyId,String phone,Integer user); + Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart); Artificer selectArtificerById(Long userId,Long artificerId,String longitude,String latitude); @@ -38,5 +38,5 @@ public interface ArtificerService extends IService { Result selectArtificerByArtificerId(Long artificerId); - Result selectNearByArtificerList(Integer page, Integer limit, String artificerName, String longitude, String latitude, String city); + Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index f357577..9382727 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -25,6 +25,7 @@ import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.message.entity.MessageInfo; import com.sqx.modules.message.service.MessageService; import com.sqx.modules.pay.dao.CashOutDao; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -68,10 +69,10 @@ public class ArtificerServiceImpl extends ServiceImpl i @Override public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId,String artificerName, String longitude,String latitude,Integer sort,Integer authentication, - Integer by,Integer status,String city,Long classifyId,String phone,Integer user){ + Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart){ Page pages=new Page<>(page,limit); IPage artificerIPage = baseMapper.selectArtificerList(pages, massageTypeId, artificerName, - longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user); + longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart); List records = artificerIPage.getRecords(); String value = commonInfoService.findOne(392).getValue(); if("30".equals(value)){ @@ -423,10 +424,13 @@ public class ArtificerServiceImpl extends ServiceImpl i return Result.success().put("data", baseMapper.selectById(artificerId)); } - @Override - public Result selectNearByArtificerList(Integer page, Integer limit, String artificerName, String longitude, String latitude, String city) { + public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){ + Map map = new HashMap(); Page pages=new Page<>(page,limit); - IPage artificerIPage = baseMapper.selectArtificerList(pages, null, artificerName,longitude, latitude, 1, 2, 1, -1, city, null,"",1); - return Result.success().put("data",new PageUtils(artificerIPage)); + IPage artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,isStart); + map.put("nearData",new PageUtils(artificerIPage)); + map.put("startData",new PageUtils(baseMapper.getHomeStartArtificerList(pages,isStart,status,city))); + return Result.success(map); } + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/collect/app/AppCollectMassageController.java b/src/main/java/com/sqx/modules/bl/collect/app/AppCollectMassageController.java new file mode 100644 index 0000000..a4ce842 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/collect/app/AppCollectMassageController.java @@ -0,0 +1,28 @@ +package com.sqx.modules.bl.collect.app; + +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.collect.entity.CollectMassage; +import com.sqx.modules.bl.collect.service.CollectMassageService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/app/collect/massage") +@Api(value = "收藏浏览项目服务", tags = {"收藏浏览项目服务"}) +public class AppCollectMassageController { + + @Autowired + private CollectMassageService service; + +// @Login + @GetMapping("/findPage") + @ApiOperation("查询收藏浏览（分页）") + public Result findPage(CollectMassage collectMassage){ + return service.findPage(collectMassage); + } + +} diff --git a/src/main/java/com/sqx/modules/bl/collect/controller/CollectMassageController.java b/src/main/java/com/sqx/modules/bl/collect/controller/CollectMassageController.java new file mode 100644 index 0000000..b24b4a2 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/collect/controller/CollectMassageController.java @@ -0,0 +1,23 @@ +package com.sqx.modules.bl.collect.controller; + +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.collect.entity.CollectMassage; +import com.sqx.modules.bl.collect.service.CollectMassageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/collect/massage") +public class CollectMassageController { + + @Autowired + private CollectMassageService service; + + @GetMapping("/findPage") + public Result findPage(CollectMassage collectMassage){ + return service.findPage(collectMassage); + } + +} diff --git a/src/main/java/com/sqx/modules/bl/collect/dao/CollectMassageDao.java b/src/main/java/com/sqx/modules/bl/collect/dao/CollectMassageDao.java new file mode 100644 index 0000000..f36f089 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/collect/dao/CollectMassageDao.java @@ -0,0 +1,19 @@ +package com.sqx.modules.bl.collect.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sqx.modules.bl.collect.entity.CollectMassage; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface CollectMassageDao extends BaseMapper { + IPage findPage(Page page, @Param("params") CollectMassage collectMassage); + + int insert(CollectMassage collectMassage); + + int updateById(CollectMassage collectMassage); + + CollectMassage selectCollectMassageByUserId(CollectMassage collectMassage); +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java new file mode 100644 index 0000000..6665960 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java @@ -0,0 +1,62 @@ +package com.sqx.modules.bl.collect.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 浏览记录 + * @author caolei 2024-06-14 + */ +@Data +@TableName("bl_collect_massage") +public class CollectMassage implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 浏览记录id + */ + @TableId(type = IdType.INPUT) + private long collectId; + + /** + * 技师id + */ + + private Long projectId; + + /** + * 用户id + */ + + private Long userId; + + /** + * 创建时间 + */ + + private String createTime; + + /** + * 1收藏 2浏览记录 + */ + private Integer classify; + + /** + * 1项目 2服务包 + */ + private Integer flag; + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer limit; + + +} diff --git a/src/main/java/com/sqx/modules/bl/collect/service/CollectMassageService.java b/src/main/java/com/sqx/modules/bl/collect/service/CollectMassageService.java new file mode 100644 index 0000000..14426e1 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/collect/service/CollectMassageService.java @@ -0,0 +1,16 @@ +package com.sqx.modules.bl.collect.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.collect.entity.CollectMassage; + +public interface CollectMassageService extends IService { + + Result findPage(CollectMassage collectMassage); + + void insertCollect(CollectMassage collectMassage); + + CollectMassage selectCollectMassageByUserId(CollectMassage collectMassage); + + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/collect/service/impl/CollectMassageServiceImpl.java b/src/main/java/com/sqx/modules/bl/collect/service/impl/CollectMassageServiceImpl.java new file mode 100644 index 0000000..822d0aa --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/collect/service/impl/CollectMassageServiceImpl.java @@ -0,0 +1,39 @@ +package com.sqx.modules.bl.collect.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.common.utils.DateUtils; +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.collect.dao.CollectMassageDao; +import com.sqx.modules.bl.collect.entity.CollectMassage; +import com.sqx.modules.bl.collect.service.CollectMassageService; +import org.springframework.stereotype.Service; +import java.util.Date; + +@Service +public class CollectMassageServiceImpl extends ServiceImpl implements CollectMassageService { + + @Override + public Result findPage(CollectMassage collectMassage){ + Page pages=new Page<>(collectMassage.getPage(),collectMassage.getLimit()); + return Result.success().put("data",baseMapper.findPage(pages,collectMassage)); + } + + @Override + public void insertCollect(CollectMassage collectMassage){ + CollectMassage cm = selectCollectMassageByUserId(collectMassage); + if(cm!=null){ + cm.setCreateTime(DateUtils.format(new Date())); + baseMapper.updateById(cm); + }else{ + collectMassage.setCreateTime(DateUtils.format(new Date())); + baseMapper.insert(collectMassage); + } + } + + @Override + public CollectMassage selectCollectMassageByUserId(CollectMassage collectMassage){ + return baseMapper.selectCollectMassageByUserId(collectMassage); + } + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java index c9dcf58..01b87be 100644 --- a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java +++ b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java @@ -107,6 +107,23 @@ public class MassagePackage implements Serializable { */ private Integer isCanVip; + /** + * 服务分类ID + */ + private Integer classifyId; + + /** + * 类型名称 + */ + @TableField(exist = false) + private String typeName; + + /** + * 分类标识 + */ + @TableField(exist = false) + private String flag; + @TableField(exist = false) private Integer page; diff --git a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java index edbe4f6..399b6ef 100644 --- a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java +++ b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java @@ -51,7 +51,7 @@ public class MassagePackageDetail implements Serializable { /** * 间隔天数 */ - private String intervalDays; + private Integer intervalDays; /** * 图片 @@ -154,5 +154,11 @@ public class MassagePackageDetail implements Serializable { @TableField(exist = false) private Integer limit; + /** + * 简介 + */ + @TableField(exist = false) + private Long userId; + public MassagePackageDetail() {} } diff --git a/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java b/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java index 44af046..3c49bb5 100644 --- a/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java +++ b/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java @@ -14,4 +14,6 @@ public interface MassagePackageDetailService extends IService implements MassagePackageDetailService { @@ -20,6 +25,9 @@ public class MassagePackageServiceDetailImpl extends ServiceImpl pages=new Page<>(massagePackageDetail.getPage(),massagePackageDetail.getLimit()); @@ -87,4 +95,23 @@ public class MassagePackageServiceDetailImpl extends ServiceImpl map = new HashMap(); + MassagePackage massagePackage = packageService.getById(massagePackageDetail.getMainId()); + if(massagePackageDetail.getUserId()!=null){ + //插入浏览历史 + CollectMassage collectMassage=new CollectMassage(); + collectMassage.setClassify(2); + collectMassage.setUserId(massagePackageDetail.getUserId()); + collectMassage.setProjectId(massagePackageDetail.getMainId()); + collectMassage.setFlag(2); + collectMassageService.insertCollect(collectMassage); + } + map.put("mainData",massagePackage); + Page pages=new Page<>(massagePackageDetail.getPage(),massagePackageDetail.getLimit()); + map.put("detailData",new PageUtils(baseMapper.findPage(pages,massagePackageDetail))); + return Result.success(map); + } + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java new file mode 100644 index 0000000..e0ba9a3 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java @@ -0,0 +1,36 @@ +package com.sqx.modules.bl.order.app; + +import com.sqx.common.utils.Result; +import com.sqx.modules.app.annotation.Login; +import com.sqx.modules.bl.order.entity.UserPackageDetail; +import com.sqx.modules.bl.order.service.UserPackageDetailService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@RequestMapping("/app/user/package/detail") +@Api(value = "用户服务包详情管理", tags = {"用户服务包详情"}) +public class AppUserPackageDetailController { + + @Autowired + private UserPackageDetailService service; + + @Login + @GetMapping("/findMyPackageDetailList") + @ApiOperation("查询服务包详情列表") + public Result findMyPackageDetailList(UserPackageDetail userPackageDetail){ + return service.findAppUsedQuantity(userPackageDetail); + } + +// @Login +// @GetMapping("/getMyPackageDetail") +// @ApiOperation("查询服务包详情") +// public Result getMyPackageDetail(UserPackageDetail userPackageDetail){ +// return service.getMyPackageDetail(userPackageDetail); +// } +} diff --git a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java index 9896046..b2fa820 100644 --- a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java +++ b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java @@ -22,4 +22,6 @@ public interface UserPackageDao extends BaseMapper { IPage findMyPackageList(Page page, @Param("params") UserPackage userPackage); + UserPackage getMyPackageById(Long id); + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java index 9898b9e..7ccadec 100644 --- a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java +++ b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java @@ -9,10 +9,16 @@ import java.util.List; @Mapper public interface UserPackageDetailDao extends BaseMapper { + List findDetailList(UserPackageDetail userPackageDetail); + List findDetailUsedQuantity(UserPackageDetail userPackageDetail); + List findLcDetailUsedQuantity(UserPackageDetail userPackageDetail); + List findMassagePackageDetails(UserPackageDetail userPackageDetail); int insert(UserPackageDetail userPackageDetail); + UserPackageDetail getMyPackageDetail(Long id); + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java index 0e44c29..90054f3 100644 --- a/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java +++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java @@ -21,11 +21,10 @@ public class UserPackage implements Serializable { private static final long serialVersionUID = 1L; - @TableId(type = IdType.AUTO) - /** * 编号 */ + @TableId(type = IdType.AUTO) private Long id; /** @@ -98,6 +97,29 @@ public class UserPackage implements Serializable { */ private String city; + /** + * 服务分类ID + */ + private Integer classifyId; + + /** + * 服务分类名称 + */ + @TableField(exist = false) + private Integer classifyName; + + /** + * 好评率 + */ + @TableField(exist = false) + private BigDecimal esteemRate; + + /** + * 销量 + */ + @TableField(exist = false) + private Integer sales; + /** * 状态 1正常 2用完 3无效 */ diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java index 22635f5..2d3e83c 100644 --- a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java +++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java @@ -56,7 +56,7 @@ public class UserPackageDetail implements Serializable { /** * 间隔天数 */ - private String intervalDays; + private Integer intervalDays; /** * 创建时间 diff --git a/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java b/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java index 233c8f6..ca6b983 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java +++ b/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java @@ -10,4 +10,5 @@ public interface UserPackageDetailService extends IService { Result findDetailUsedQuantity(UserPackageDetail userPackageDetail); List findMassagePackageDetails(UserPackageDetail userPackageDetail); int insert(UserPackageDetail userPackageDetail); + Result findAppUsedQuantity(UserPackageDetail userPackageDetail); } diff --git a/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java b/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java index 232e146..d36efaf 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java +++ b/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java @@ -13,4 +13,6 @@ public interface UserPackageService extends IService { int updateStatusByOrder(UserPackage userPackage); Result findMyPackageList(UserPackage userPackage); + +// UserPackage getMyPackageById(Long id); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java index 8496315..b8f4299 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java @@ -2,17 +2,26 @@ package com.sqx.modules.bl.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.bl.order.dao.UserPackageDetailDao; +import com.sqx.modules.bl.order.entity.UserPackage; import com.sqx.modules.bl.order.entity.UserPackageDetail; import com.sqx.modules.bl.order.service.UserPackageDetailService; +import com.sqx.modules.bl.order.service.UserPackageService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class UserPackageDetailServiceImpl extends ServiceImpl implements UserPackageDetailService { + @Autowired + UserPackageService userPackageService; + @Override public Result findDetailUsedQuantity(UserPackageDetail userPackageDetail){ List list = Lists.newArrayList(); @@ -34,4 +43,46 @@ public class UserPackageDetailServiceImpl extends ServiceImpl map = new HashMap(); + UserPackage userPackage = userPackageService.getMyPackageById(userPackageDetail.getMainId()); + map.put("mainData",userPackage); + int type = userPackage.getType(); + List list = Lists.newArrayList(); + if(type == 104){ + list = baseMapper.findDetailList(userPackageDetail); + }else if(type == 105){ + list = baseMapper.findDetailUsedQuantity(userPackageDetail); + }else if(type == 106){ + list = baseMapper.findLcDetailUsedQuantity(userPackageDetail); + } + map.put("detailData",list); + return Result.success().put("data",map); + } +// +// @Override +// public Result getMyPackageDetail(UserPackageDetail userPackageDetail){ +// if(userPackageDetail.getId()!=null){ +// userPackageDetail = baseMapper.getMyPackageDetail(userPackageDetail.getId()); +// } +// +// Map map = new HashMap(); +// UserPackage userPackage = userPackageService.getMyPackageById(userPackageDetail.getMainId()); +// map.put("mainData",userPackage); +// int type = userPackage.getType(); +// List list = Lists.newArrayList(); +// if(type == 104){ +// list = baseMapper.findDetailList(userPackageDetail); +// }else if(type == 105){ +// list = baseMapper.findDetailUsedQuantity(userPackageDetail); +// }else if(type == 106){ +// list = baseMapper.findLcDetailUsedQuantity(userPackageDetail); +// } +// map.put("detailData",list); +// return Result.success().put("data",map); +// } + + + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java index b61d4f8..f21f3a2 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java @@ -314,6 +314,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl0){ - for(int i=0;i0){ +// for(int i=0;i().eq("user_id", payDetails.getUserId()).eq("artificer_id", artificerId)); - if(userMoneyArtificer==null){ - userMoneyArtificer=new UserMoneyArtificer(); - userMoneyArtificer.setUserId(payDetails.getUserId()); - userMoneyArtificer.setArtificerId(artificerId); - userMoneyArtificer.setMoney(BigDecimal.valueOf(money)); - userMoneyArtificer.setCreateTime(DateUtils.format(new Date())); - userMoneyArtificerService.save(userMoneyArtificer); - }else{ - userMoneyArtificerService.updateMoney(1, payDetails.getUserId(), artificerId,money); - } +// UserMoneyArtificer userMoneyArtificer = userMoneyArtificerService.getOne(new QueryWrapper().eq("user_id", payDetails.getUserId()).eq("artificer_id", artificerId)); +// if(userMoneyArtificer==null){ +// userMoneyArtificer=new UserMoneyArtificer(); +// userMoneyArtificer.setUserId(payDetails.getUserId()); +// userMoneyArtificer.setArtificerId(artificerId); +// userMoneyArtificer.setMoney(BigDecimal.valueOf(money)); +// userMoneyArtificer.setCreateTime(DateUtils.format(new Date())); +// userMoneyArtificerService.save(userMoneyArtificer); +// }else{ +// userMoneyArtificerService.updateMoney(1, payDetails.getUserId(), artificerId,money); +// } Artificer artificer = artificerService.getById(artificerId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //用户流水 @@ -599,8 +600,8 @@ public class AliPayController { userMoneyDetails.setClassify(8); userMoneyDetails.setManipulateType(1); userMoneyDetails.setUserId(payDetails.getUserId()); - userMoneyDetails.setTitle("支付宝给技师充值"); - userMoneyDetails.setContent("指定技师“"+artificer.getArtificerName()+"”钱包支付宝充值:"+money); + userMoneyDetails.setTitle("支付宝给技师打赏"); + userMoneyDetails.setContent("使用支付宝给指定技师“"+artificer.getArtificerName()+"”打赏:"+money); userMoneyDetails.setType(2); userMoneyDetails.setState(2); userMoneyDetails.setMoney(BigDecimal.valueOf(money)); @@ -617,18 +618,18 @@ public class AliPayController { UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(); //插入余额 userMoneyDetails2.setBalance(userNowMoney.getMoney()); - userMoneyDetails.setManipulateType(2); + userMoneyDetails2.setManipulateType(2); userMoneyDetails2.setClassify(8); userMoneyDetails2.setUserId(artificerId); - userMoneyDetails2.setTitle("用户支付宝充值"); - userMoneyDetails2.setContent("用户“"+userEntity.getUserName()+"”支付宝充值:"+money); + userMoneyDetails2.setTitle("用户支付宝打赏"); + userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”支付宝打赏:"+money); userMoneyDetails2.setType(1); userMoneyDetails2.setState(2); userMoneyDetails2.setMoney(BigDecimal.valueOf(money)); userMoneyDetails2.setCreateTime(sdf.format(new Date())); userMoneyDetails2.setBlRole(2); userMoneyDetails2.setBlFlag(1); - userMoneyDetailsService.save(userMoneyDetails); + userMoneyDetailsService.save(userMoneyDetails2); }else if(payDetails.getType()==7){ //服务包下单，分单 UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo); @@ -982,20 +983,21 @@ public class AliPayController { @ApiOperation("充值指定师傅钱包") @RequestMapping(value = "/payUserMoneyArtificer", method = RequestMethod.POST) @Transactional(rollbackFor = Exception.class) - public Result payUserMoneyArtificer(@RequestAttribute Long userId,Long artificerId, Long payClassifyId, BigDecimal money, Integer classify) { +// public Result payUserMoneyArtificer(@RequestAttribute Long userId,Long artificerId, Long payClassifyId, BigDecimal money, Integer classify) { + public Result payUserMoneyArtificer(@RequestAttribute Long userId,Long artificerId, Long payClassifyId, BigDecimal money, Integer type) { //通知页面地址 CommonInfo one = commonInfoService.findOne(19); String returnUrl = one.getValue() + "/#/pages/my/index"; CommonInfo one3 = commonInfoService.findOne(12); String name =one3.getValue(); PayDetails payDetails = new PayDetails(); - if(payClassifyId!=null){ - PayClassify payClassify = payClassifyService.getById(payClassifyId); - money=payClassify.getPrice(); - payDetails.setRemark(String.valueOf(payClassifyId)); - } +// if(payClassifyId!=null){ +// PayClassify payClassify = payClassifyService.getById(payClassifyId); +// money=payClassify.getPrice(); +// payDetails.setRemark(String.valueOf(payClassifyId)); +// } String generalOrder = getGeneralOrder(); - payDetails = new PayDetails(); +// payDetails = new PayDetails(); payDetails.setState(0); payDetails.setCreateTime(sdf.format(new Date())); payDetails.setOrderId(generalOrder); @@ -1005,7 +1007,7 @@ public class AliPayController { payDetails.setType(6); payDetails.setRemark(String.valueOf(artificerId)); payDetailsDao.insert(payDetails); - if(classify==1){ + if(type==1){ return payApp(name,generalOrder,money.doubleValue()); } return payH5(name,generalOrder,money.doubleValue(),returnUrl); 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 6a2dd8a..aa79d19 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 @@ -344,11 +344,11 @@ public class WxServiceImpl implements WxService { @Override public Result payUserMoneyArtificer(Long userId,Long artificerId,Long payClassifyId,BigDecimal money,Integer classify,HttpServletRequest request) throws Exception { PayDetails payDetails = new PayDetails(); - if(payClassifyId!=null){ - PayClassify payClassify = payClassifyService.getById(payClassifyId); - money=payClassify.getPrice(); - payDetails.setRemark(String.valueOf(payClassifyId)); - } +// if(payClassifyId!=null){ +// PayClassify payClassify = payClassifyService.getById(payClassifyId); +// money=payClassify.getPrice(); +// payDetails.setRemark(String.valueOf(payClassifyId)); +// } String generalOrder = getGeneralOrder(); payDetails.setState(0); payDetails.setCreateTime(sdf.format(new Date())); @@ -1026,43 +1026,46 @@ public class WxServiceImpl implements WxService { }else if(payDetails.getType()==6){ double money=payDetails.getMoney(); - if(StringUtils.isNotBlank(payDetails.getRemark())){ - PayClassify payClassify = payClassifyService.getById(Long.parseLong(payDetails.getRemark())); - if(payClassify.getCouponId()!=null && payClassify.getGiveNum()>0){ - for(int i=0;i0){ +// for(int i=0;i().eq("user_id", payDetails.getUserId()).eq("artificer_id", artificerId)); - if(userMoneyArtificer==null){ - userMoneyArtificer=new UserMoneyArtificer(); - userMoneyArtificer.setUserId(payDetails.getUserId()); - userMoneyArtificer.setArtificerId(artificerId); - userMoneyArtificer.setMoney(BigDecimal.valueOf(money)); - userMoneyArtificer.setCreateTime(DateUtils.format(new Date())); - userMoneyArtificerService.save(userMoneyArtificer); - }else{ - userMoneyArtificerService.updateMoney(1, payDetails.getUserId(),artificerId, money); - } +// UserMoneyArtificer userMoneyArtificer = userMoneyArtificerService.getOne(new QueryWrapper().eq("user_id", payDetails.getUserId()).eq("artificer_id", artificerId)); +// if(userMoneyArtificer==null){ +// userMoneyArtificer=new UserMoneyArtificer(); +// userMoneyArtificer.setUserId(payDetails.getUserId()); +// userMoneyArtificer.setArtificerId(artificerId); +// userMoneyArtificer.setMoney(BigDecimal.valueOf(money)); +// userMoneyArtificer.setCreateTime(DateUtils.format(new Date())); +// userMoneyArtificerService.save(userMoneyArtificer); +// }else{ +// userMoneyArtificerService.updateMoney(1, payDetails.getUserId(),artificerId, money); +// } Artificer artificer = artificerService.getById(artificerId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //用户流水 @@ -1070,8 +1073,8 @@ public class WxServiceImpl implements WxService { userMoneyDetails.setClassify(8); userMoneyDetails.setManipulateType(1); userMoneyDetails.setUserId(payDetails.getUserId()); - userMoneyDetails.setTitle("微信给技师充值"); - userMoneyDetails.setContent("指定技师“"+artificer.getArtificerName()+"”钱包微信充值:"+money); + userMoneyDetails.setTitle("微信给技师打赏"); + userMoneyDetails.setContent("使用微信给指定技师“"+artificer.getArtificerName()+"”打赏:"+money); userMoneyDetails.setType(2); userMoneyDetails.setState(2); userMoneyDetails.setMoney(BigDecimal.valueOf(money)); @@ -1088,18 +1091,18 @@ public class WxServiceImpl implements WxService { UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(); //插入余额 userMoneyDetails2.setBalance(userNowMoney.getMoney()); - userMoneyDetails.setManipulateType(2); + userMoneyDetails2.setManipulateType(2); userMoneyDetails2.setClassify(8); userMoneyDetails2.setUserId(artificerId); - userMoneyDetails2.setTitle("用户微信充值"); - userMoneyDetails2.setContent("用户“"+userEntity.getUserName()+"”微信充值:"+money); + userMoneyDetails2.setTitle("用户微信打赏"); + userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”微信打赏:"+money); userMoneyDetails2.setType(1); userMoneyDetails2.setState(2); userMoneyDetails2.setMoney(BigDecimal.valueOf(money)); userMoneyDetails2.setCreateTime(sdf.format(new Date())); userMoneyDetails2.setBlRole(2); userMoneyDetails2.setBlFlag(1); - userMoneyDetailsService.save(userMoneyDetails); + userMoneyDetailsService.save(userMoneyDetails2); }else if(payDetails.getType()==7){ //服务包下单，分单 UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no); diff --git a/src/main/java/com/sqx/modules/sys/controller/app/AppDictController.java b/src/main/java/com/sqx/modules/sys/controller/app/AppDictController.java index ad78145..3937073 100644 --- a/src/main/java/com/sqx/modules/sys/controller/app/AppDictController.java +++ b/src/main/java/com/sqx/modules/sys/controller/app/AppDictController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.sqx.common.utils.Result; import com.sqx.modules.sys.entity.SysDictEntity; import com.sqx.modules.sys.service.SysDictService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +18,7 @@ import java.util.List; */ @RestController @RequestMapping("app/dict") +@Api(value = "项目分类", tags = {"项目分类"}) public class AppDictController { @Autowired private SysDictService sysDictService; @@ -24,6 +27,7 @@ public class AppDictController { * 列表 */ @RequestMapping("/list") + @ApiOperation("项目分类列表") public Result list(String type){ SysDictEntity sysDictEntity = sysDictService.getOne(new QueryWrapper().eq("type", type)); List sysDictEntityList = sysDictService.list(new QueryWrapper().eq("status",1).eq( "parent_id", sysDictEntity.getId()).orderByDesc("order_num")); diff --git a/src/main/resources/mapper/app/VipDetailsDao.xml b/src/main/resources/mapper/app/VipDetailsDao.xml index 1ad4f06..333efe2 100644 --- a/src/main/resources/mapper/app/VipDetailsDao.xml +++ b/src/main/resources/mapper/app/VipDetailsDao.xml @@ -10,7 +10,9 @@ a.rate, a.award, a.vip_type, - b.user_id + b.user_id, + b.end_time, + b.is_vip FROM vip_details a JOIN user_vip b ON a.vip_name_type = b.vip_name_type WHERE b.user_id = #{userId} diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml index 34bc904..e684460 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -4,15 +4,18 @@ @@ -179,13 +181,14 @@ \ No newline at end of file diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index 1b3ffba..d63c658 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -132,6 +132,9 @@ trip_way, + + user_package_id, + km @@ -263,6 +266,9 @@ #{tripWay}, + + #{userPackageId}, + #{km} diff --git a/src/main/resources/mapper/bl/collect/CollectMassageDao.xml b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml new file mode 100644 index 0000000..6b3cae6 --- /dev/null +++ b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml @@ -0,0 +1,64 @@ + + + + + + + + + insert into bl_collect_massage( + project_id, + user_id, + create_time, + classify, + flag + )values( + #{projectId}, + #{userId}, + #{createTime}, + #{classify}, + #{flag} + ) + + + + update bl_collect_massage + set create_time=#{createTime} + where collect_id=#{collectId} + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml index dcee1d5..bfc83d2 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml @@ -13,13 +13,16 @@ and m.type=#{params.type} + + and m.classify_id=#{params.classifyId} + and (m.city like concat('%',#{params.city},'%') or m.city='不限') and m.title like concat('%',#{params.title},'%') - order by type acs,sales desc,id acs + order by type asc,id desc @@ -51,15 +54,17 @@ - + insert into bl_user_package( user_id, package_id, @@ -58,7 +60,8 @@ content, content_img, labels, - city + city, + classify_id )values( #{userId}, #{packageId}, @@ -73,7 +76,8 @@ #{content}, #{contentImg}, #{labels}, - #{city} + #{city}, + #{classifyId} ) @@ -85,26 +89,63 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml index eff2a11..cd038e6 100644 --- a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml +++ b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml @@ -3,6 +3,34 @@ + + + + + select + a.id, + a.main_id, + a.package_detail_id, + a.massage_type_id, + a.status, + a.package_price, + a.interval_days, + a.create_time, + a.title, + a.massage_img, + a.content, + a.old_price, + a.price, + a.duration, + a.is_sex, + a.city, + a.content_img, + a.labels, + a.parent_id, + a.classify_id, + a.apply_people, + a.jianjie + from bl_user_package_detail a left join massage_type b on a.massage_type_id = b.massage_type_id + where main_id = #{mainId} + + + \ No newline at end of file