From 6784d8af46c2a9f69d48c854fa5114c95aee2d22 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 23 Jan 2024 18:37:37 +0800 Subject: [PATCH] 1/23 --- .../NewcomerRecoRecordDto.java | 1 + .../NewcomerRecoRecordMapper.java | 2 +- .../NewcomerRecoRecordRest.java | 9 ++-- .../NewcomerRecoRecordService.java | 46 ++++++++++++------- .../RecommendNewUserBagRest.java | 2 +- .../RecommendNewUserBagDetailsMapper.xml | 6 +-- .../yxt/yythmall/config/SaTokenConfigure.java | 3 ++ 7 files changed, 42 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java b/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java index a601422..92a777a 100644 --- a/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java +++ b/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java @@ -27,4 +27,5 @@ public class NewcomerRecoRecordDto implements Dto { private String state; private String giftName;//礼包名 private String customerSid;//礼包名 + private String orderSid; } diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java index cf3d5d1..45d68fd 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java @@ -26,6 +26,6 @@ public interface NewcomerRecoRecordMapper extends BaseMapper List selInOrderSid(@Param("orderSids") List orderSids); @Select("select *,goodsNumber as num from lpk_reserve_order_goods where orderSid=#{orderSid}") List selByOrderSids(String orderSid); - @Select("select * from newcomer_reco_record r where r.customerSid =#{customerSid} limit 5") + @Select("select * from newcomer_reco_record r where r.customerSid =#{customerSid} and recommendedSid is not null limit 5") List recordList(@Param("customerSid")String customerSid); } diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java index a4ce394..b9a6b0f 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java @@ -6,10 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author wangpengfei @@ -25,12 +22,12 @@ public class NewcomerRecoRecordRest { @ApiOperation("推荐新人用户") @PostMapping("/recommendNewUsers") - public ResultBean recommendNewUsers(NewcomerRecoRecordDto dto){ + public ResultBean recommendNewUsers(@RequestBody NewcomerRecoRecordDto dto){ return newcomerRecoRecordService.recommendNewUsers(dto); } @ApiOperation("新人助力") @PostMapping("/recommendedAssistance") - public ResultBean recommendedAssistance(NewcomerRecoRecordDto dto){ + public ResultBean recommendedAssistance(@RequestBody NewcomerRecoRecordDto dto){ return newcomerRecoRecordService.recommendedAssistance(dto); } @ApiOperation("新人推荐列表") diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java index 2d362f4..8b61bc3 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import com.yxt.yythmall.api.appletgiftbag.AppletGiftBag; import com.yxt.yythmall.api.appletgiftbag.AppletGiftBagVo; @@ -17,6 +18,9 @@ import com.yxt.yythmall.api.lpkgoods.LpkGoods; import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecord; import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecordDto; import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecordVo; +import com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBag; +import com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagVo; +import com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetails; import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto; import com.yxt.yythmall.api.vegetablecellar.vegeVo; import com.yxt.yythmall.biz.appletgiftbag.AppletGiftBagService; @@ -25,6 +29,8 @@ import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService; import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService; import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService; import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; +import com.yxt.yythmall.biz.recommendnewuserbag.RecommendNewUserBagService; +import com.yxt.yythmall.biz.recommendnewuserbagdetails.RecommendNewUserBagDetailsService; import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,6 +56,10 @@ public class NewcomerRecoRecordService extends MybatisBaseService getReserveByCardSid(String carSid, String goodsSid) { ResultBean rb = new ResultBean(); NewcomerRecoRecord goods = baseMapper.getReserveByCardSid(carSid, goodsSid); @@ -59,28 +69,35 @@ public class NewcomerRecoRecordService extends MybatisBaseService bags=recommendNewUserBagService.list(); + dto.setGiftBagSid(bags.get(0).getSid()); + dto.setGiftName(bags.get(0).getName()); BeanUtil.copyProperties(dto, newcomerRecoRecord, "id", "sid"); newcomerRecoRecord.setCreateTime(new Date()); + newcomerRecoRecord.setRecommendSid(dto.getCustomerSid()); baseMapper.insert(newcomerRecoRecord); - return rb.success().setData("推荐成功"); + return rb.success().setData(newcomerRecoRecord); } @Transactional(rollbackFor = Exception.class) public ResultBean recommendedAssistance(NewcomerRecoRecordDto dto) { ResultBean rb = new ResultBean().fail(); LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper().eq("sid",dto.getCustomerSid())); + if(null==customer){ + return rb.setMsg("参数不全"); + } if(!customer.getIsNewUser().equals("1")){ return rb.setMsg("您不是新人"); } NewcomerRecoRecord newcomerRecoRecord = baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); - newcomerRecoRecord.setRecommendedSid(dto.getRecommendedSid()); + newcomerRecoRecord.setRecommendedSid(dto.getCustomerSid()); newcomerRecoRecord.setAssistanceDate(new Date()); baseMapper.updateById(newcomerRecoRecord); - Listlist=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",dto.getGiftBagSid())); + Listlist=recommendNewUserBagDetailsService.list(new QueryWrapper().eq("giftbagSid",dto.getGiftBagSid())); +// Listlist=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",dto.getGiftBagSid())); VegetableCellarDto dto1=new VegetableCellarDto(); - dto1.setCustomerSid(dto.getRecommendSid()); + dto1.setCustomerSid(customer.getSid()); List vos=new ArrayList<>(); - for (AppletGiftBagGoods appletGiftBagGoods : list) { + for (RecommendNewUserBagDetails appletGiftBagGoods : list) { LpkGoods a=lpkGoodsService.getOne(new QueryWrapper().eq("sid",appletGiftBagGoods.getGoodsSid())); vegeVo vo=new vegeVo(); vo.setGoodsSid(appletGiftBagGoods.getGoodsSid()); @@ -97,19 +114,16 @@ public class NewcomerRecoRecordService extends MybatisBaseService vos=baseMapper.recordList(customerSid); for (NewcomerRecoRecordVo newcomerRecoRecordVo : vos) { -// lpkCustomerService.getOne(new QueryWrapper().eq("sid")) + RecommendNewUserBag r= recommendNewUserBagService.getOne(new QueryWrapper().eq("sid",newcomerRecoRecordVo.getGiftBagSid())); + //被推荐人的信息 + LpkCustomer l= lpkCustomerService.getOne(new QueryWrapper().eq("sid",newcomerRecoRecordVo.getRecommendedSid())); + //推荐人信息 + LpkCustomer p=lpkCustomerService.getOne(new QueryWrapper().eq("sid",newcomerRecoRecordVo.getRecommendSid())); + newcomerRecoRecordVo.setRemarks(l.getNick()+"助力您获得"+r.getName()); } - vo.setNewcomerRecoRecordVos(vos); - - -// AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31")); -// baseMapper.recordList() -// vos.forEach(s->{ -// s. -// }); return rb.success().setData("助力成功"); } } diff --git a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagRest.java b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagRest.java index 371a68c..0f6ff88 100644 --- a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagRest.java +++ b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagRest.java @@ -20,7 +20,7 @@ import java.util.List; @Api(tags = "小程序礼包信息") @RestController -@RequestMapping("RecommendNewUserBag") +@RequestMapping("ecommendnewuserbag") public class RecommendNewUserBagRest { @Autowired diff --git a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.xml b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.xml index 125633b..1476078 100644 --- a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.xml @@ -6,16 +6,16 @@ DELETE - FROM applet_giftbag_goods + FROM recommend_newuser_bag_details WHERE giftbagSid = #{sid} - insert into applet_giftbag_goods(sid,createTime,giftbagSid,goodsSid,goodsNumber) + insert into recommend_newuser_bag_details(sid,createTime,giftbagSid,goodsSid,goodsNumber) values (#{item.sid},#{item.createTime},#{item.giftbagSid},#{item.goodsSid},#{item.goodsNumber}) diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java index 3c8f078..b58b81a 100644 --- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java @@ -46,6 +46,9 @@ public class SaTokenConfigure implements WebMvcConfigurer { .excludePathPatterns("/lpksreservoorder/orderByCardSid/**") .excludePathPatterns("/lpksreservoorder/orderListByUserSid/**") .excludePathPatterns("/lpksreservoorder/orderDetails/**") + .excludePathPatterns("/newcomerrecorecord/recommendNewUsers") + .excludePathPatterns("/newcomerrecorecord/recommendedAssistance") + .excludePathPatterns("/newcomerrecorecord/recordList/**") .excludePathPatterns("/transferrecords/transferRecordsList") .excludePathPatterns("/empsreservoorder/createVegeOrder") .excludePathPatterns("/empsreservoorder/OrderDetails/**")