From 77036a71ba5a48e8006102066bd9f45c56d85f85 Mon Sep 17 00:00:00 2001 From: OPGame <1242479791@qq.com> Date: Wed, 7 Aug 2019 16:27:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PointsChangeController.java | 98 ------------- .../admin/controller/PointsController.java | 131 ------------------ .../controller/PointsProdController.java | 95 ------------- .../controller/PointsWalletController.java | 95 ------------- .../shop/api/controller/ProdController.java | 43 +++--- .../java/com/yami/shop/bean/model/Points.java | 65 --------- .../yami/shop/bean/model/PointsChange.java | 77 ---------- .../com/yami/shop/bean/model/PointsProd.java | 71 ---------- .../yami/shop/bean/model/PointsWallet.java | 57 -------- .../com/yami/shop/dao/PointsChangeMapper.java | 17 --- .../java/com/yami/shop/dao/PointsMapper.java | 27 ---- .../com/yami/shop/dao/PointsProdMapper.java | 17 --- .../com/yami/shop/dao/PointsWalletMapper.java | 17 --- .../com/yami/shop/dao/ProdCommMapper.java | 3 - .../java/com/yami/shop/dao/ProductMapper.java | 2 - .../shop/service/PointsChangeService.java | 22 --- .../yami/shop/service/PointsProdService.java | 22 --- .../com/yami/shop/service/PointsService.java | 30 ---- .../shop/service/PointsWalletService.java | 22 --- .../com/yami/shop/service/ProductService.java | 2 - .../service/impl/PointsChangeServiceImpl.java | 32 ----- .../service/impl/PointsProdServiceImpl.java | 32 ----- .../shop/service/impl/PointsServiceImpl.java | 50 ------- .../service/impl/PointsWalletServiceImpl.java | 32 ----- .../shop/service/impl/ProductServiceImpl.java | 5 - .../resources/mapper/PointsChangeMapper.xml | 16 --- .../main/resources/mapper/PointsMapper.xml | 57 -------- .../resources/mapper/PointsProdMapper.xml | 18 --- .../resources/mapper/PointsWalletMapper.xml | 16 --- .../main/resources/mapper/ProductMapper.xml | 14 -- 30 files changed, 16 insertions(+), 1169 deletions(-) delete mode 100644 yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsChangeController.java delete mode 100644 yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsController.java delete mode 100644 yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsProdController.java delete mode 100644 yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsWalletController.java delete mode 100644 yami-shop-bean/src/main/java/com/yami/shop/bean/model/Points.java delete mode 100644 yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsChange.java delete mode 100644 yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsProd.java delete mode 100644 yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsWallet.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/dao/PointsChangeMapper.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/dao/PointsMapper.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/dao/PointsProdMapper.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/dao/PointsWalletMapper.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/PointsChangeService.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/PointsProdService.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/PointsService.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/PointsWalletService.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsChangeServiceImpl.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsProdServiceImpl.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsServiceImpl.java delete mode 100644 yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsWalletServiceImpl.java delete mode 100644 yami-shop-service/src/main/resources/mapper/PointsChangeMapper.xml delete mode 100644 yami-shop-service/src/main/resources/mapper/PointsMapper.xml delete mode 100644 yami-shop-service/src/main/resources/mapper/PointsProdMapper.xml delete mode 100644 yami-shop-service/src/main/resources/mapper/PointsWalletMapper.xml diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsChangeController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsChangeController.java deleted file mode 100644 index 039b7e3..0000000 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsChangeController.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.admin.controller; - -import javax.validation.Valid; -import java.util.List; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import com.yami.shop.common.util.PageParam; -import com.baomidou.mybatisplus.core.metadata.IPage; - - - - -import com.yami.shop.service.PointsChangeService; -import com.yami.shop.bean.model.PointsChange; - -/** - * - * @author lgh on 2019/04/10. - */ -@RestController -@RequestMapping("/admin/pointsChange") -public class PointsChangeController { - - @Autowired - private PointsChangeService pointsChangeService; - - /** - * 分页获取 - */ - @GetMapping("/page") -// @PreAuthorize("@pms.hasPermission('admin:pointsChange:page')") - public ResponseEntity> page(PointsChange pointsChange,PageParam page){ - IPage list = pointsChangeService.page(page,new LambdaQueryWrapper()); - return ResponseEntity.ok(list); - } - - /** - * 获取信息 - */ - @GetMapping("/info/{id}") - //@PreAuthorize("@pms.hasPermission('admin:pointsChange:info')") - public ResponseEntity info(@PathVariable("id") Long id){ - PointsChange pointsChange = pointsChangeService.getById(id); - return ResponseEntity.ok(pointsChange); - } - - /** - * 保存 - */ - @PostMapping -// @PreAuthorize("@pms.hasPermission('admin:pointsChange:save')") - public ResponseEntity save(@RequestBody @Valid PointsChange pointsChange){ - pointsChangeService.save(pointsChange); - return ResponseEntity.ok().build(); - } - - /** - * 修改 - */ - @PutMapping -// @PreAuthorize("@pms.hasPermission('admin:pointsChange:update')") - public ResponseEntity update(@RequestBody @Valid PointsChange pointsChange){ - pointsChangeService.updateById(pointsChange); - return ResponseEntity.ok().build(); - } - - /** - * 删除 - */ - @DeleteMapping("/{id}") - //@PreAuthorize("@pms.hasPermission('admin:pointsChange:delete')") - public ResponseEntity delete(@PathVariable Long id){ - pointsChangeService.removeById(id); - return ResponseEntity.ok().build(); - } -} diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsController.java deleted file mode 100644 index 0d877b3..0000000 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsController.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.admin.controller; - -import javax.validation.Valid; -import java.util.Date; -import java.util.List; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.yami.shop.security.util.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import com.yami.shop.common.util.PageParam; -import com.baomidou.mybatisplus.core.metadata.IPage; - - - - -import com.yami.shop.service.PointsService; -import com.yami.shop.bean.model.Points; - -/** - * - * @author lgh on 2019/04/10. - */ -@RestController -@RequestMapping("/points/points") -public class PointsController { - - @Autowired - private PointsService pointsService; - - /** - * 分页获取 - */ - @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('points:points:page')") - public ResponseEntity> page(Points points,PageParam page){ - IPage list = pointsService.page(page,new LambdaQueryWrapper()); - return ResponseEntity.ok(list); - } - - - /** - * 分页获取(携带user) - */ - @GetMapping("/page/anduser") - @PreAuthorize("@pms.hasPermission('points:points:page')") - public ResponseEntity> andUserPage( Points points ,PageParam< Points> page){ - points.setShopId(SecurityUtils.getSysUser().getShopId()); - IPage list = pointsService.getPointsAndSysUserPage(page,points); - return ResponseEntity.ok(list); - } - - /** - * 分页获取(只取name和id) - */ - @GetMapping("/page/name") - @PreAuthorize("@pms.hasPermission('points:points:page')") - public ResponseEntity> nameAndIdPage(Points points){ - points.setShopId(SecurityUtils.getSysUser().getShopId()); - List list = pointsService.getNameAndId(points); - return ResponseEntity.ok(list); - } - - - /** - * 获取信息 - */ - @GetMapping("/info/{id}") - @PreAuthorize("@pms.hasPermission('points:points:info')") - public ResponseEntity info(@PathVariable("id") Long id){ - Points points = pointsService.getById(id); - return ResponseEntity.ok(points); - } - - - - /** - * 保存 - */ - @PostMapping - @PreAuthorize("@pms.hasPermission('points:points:save')") - public ResponseEntity save(@RequestBody @Valid Points points){ - points.setModifier(SecurityUtils.getSysUser().getUserId()); - points.setUpdateTime(new Date()); - points.setShopId(SecurityUtils.getSysUser().getShopId()); - pointsService.save(points); - return ResponseEntity.ok().build(); - } - - /** - * 修改 - */ - @PutMapping - @PreAuthorize("@pms.hasPermission('points:points:update')") - public ResponseEntity update(@RequestBody @Valid Points points){ - points.setModifier(SecurityUtils.getSysUser().getUserId()); - points.setUpdateTime(new Date()); - pointsService.updateById(points); - return ResponseEntity.ok().build(); - } - - /** - * 删除 - */ - @DeleteMapping - @PreAuthorize("@pms.hasPermission('points:points:delete')") - public ResponseEntity delete(@RequestBody List ids){ - pointsService.removeByIds(ids); - return ResponseEntity.ok().build(); - } -} diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsProdController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsProdController.java deleted file mode 100644 index 389b25a..0000000 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsProdController.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.admin.controller; - -import javax.validation.Valid; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import com.yami.shop.common.util.PageParam; -import com.baomidou.mybatisplus.core.metadata.IPage; - - - - -import com.yami.shop.service.PointsProdService; -import com.yami.shop.bean.model.PointsProd; - -/** - * - * @author lgh on 2019/04/10. - */ -@RestController -@RequestMapping("/admin/pointsProd") -public class PointsProdController { - - @Autowired - private PointsProdService pointsProdService; - - /** - * 分页获取 - */ - @GetMapping("/page") - //@PreAuthorize("@pms.hasPermission('admin:pointsProd:page')") - public ResponseEntity> page(PointsProd pointsProd,PageParam page){ - IPage list = pointsProdService.page(page,new LambdaQueryWrapper()); - return ResponseEntity.ok(list); - } - - /** - * 获取信息 - */ - @GetMapping("/info/{id}") - //@PreAuthorize("@pms.hasPermission('admin:pointsProd:info')") - public ResponseEntity info(@PathVariable("id") Long id){ - PointsProd pointsProd = pointsProdService.getById(id); - return ResponseEntity.ok(pointsProd); - } - - /** - * 保存 - */ - @PostMapping -// @PreAuthorize("@pms.hasPermission('admin:pointsProd:save')") - public ResponseEntity save(@RequestBody @Valid PointsProd pointsProd){ - pointsProdService.save(pointsProd); - return ResponseEntity.ok().build(); - } - - /** - * 修改 - */ - @PutMapping -//@PreAuthorize("@pms.hasPermission('admin:pointsProd:update')") - public ResponseEntity update(@RequestBody @Valid PointsProd pointsProd){ - pointsProdService.updateById(pointsProd); - return ResponseEntity.ok().build(); - } - - /** - * 删除 - */ - @DeleteMapping("/{id}") - //@PreAuthorize("@pms.hasPermission('admin:pointsProd:delete')") - public ResponseEntity delete(@PathVariable Long id){ - pointsProdService.removeById(id); - return ResponseEntity.ok().build(); - } -} diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsWalletController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsWalletController.java deleted file mode 100644 index 23570cb..0000000 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PointsWalletController.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.admin.controller; - -import javax.validation.Valid; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import com.yami.shop.common.util.PageParam; -import com.baomidou.mybatisplus.core.metadata.IPage; - - - -import com.yami.shop.service.PointsWalletService; -import com.yami.shop.bean.model.PointsWallet; - -/** - * - * @author lgh on 2019/04/10. - */ -@RestController -@RequestMapping("/admin/pointsWallet") -public class PointsWalletController { - - @Autowired - private PointsWalletService pointsWalletService; - - /** - * 分页获取 - */ - @GetMapping("/page") - //@PreAuthorize("@pms.hasPermission('admin:pointsWallet:page')") - public ResponseEntity> page(PointsWallet pointsWallet,PageParam page){ - IPage list = pointsWalletService.page(page,new LambdaQueryWrapper()); - return ResponseEntity.ok(list); - } - - /** - * 获取信息 - */ - @GetMapping("/info/{id}") - //@PreAuthorize("@pms.hasPermission('admin:pointsWallet:info')") - public ResponseEntity info(@PathVariable("id") Long id){ - PointsWallet pointsWallet = pointsWalletService.getById(id); - return ResponseEntity.ok(pointsWallet); - } - - /** - * 保存 - */ - @PostMapping - //@PreAuthorize("@pms.hasPermission('admin:pointsWallet:save')") - public ResponseEntity save(@RequestBody @Valid PointsWallet pointsWallet){ - pointsWalletService.save(pointsWallet); - return ResponseEntity.ok().build(); - } - - /** - * 修改 - */ - @PutMapping - //@PreAuthorize("@pms.hasPermission('admin:pointsWallet:update')") - public ResponseEntity update(@RequestBody @Valid PointsWallet pointsWallet){ - pointsWalletService.updateById(pointsWallet); - return ResponseEntity.ok().build(); - } - - /** - * 删除 - */ - @DeleteMapping("/{id}") - //@PreAuthorize("@pms.hasPermission('admin:pointsWallet:delete')") - public ResponseEntity delete(@PathVariable Long id){ - pointsWalletService.removeById(id); - return ResponseEntity.ok().build(); - } -} diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java index 827d9d6..6a73e1f 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java @@ -10,32 +10,30 @@ package com.yami.shop.api.controller; -import java.util.List; -import java.util.stream.Collectors; - import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yami.shop.common.util.PageParam; -import com.fasterxml.jackson.annotation.JsonView; -import com.yami.shop.bean.app.dto.SkuDto; -import com.yami.shop.bean.app.dto.TagProductDto; -import com.yami.shop.bean.model.Basket; -import com.yami.shop.bean.model.Sku; -import com.yami.shop.common.exception.YamiShopBindException; -import com.yami.shop.security.service.YamiUser; -import com.yami.shop.service.*; -import io.swagger.annotations.ApiImplicitParams; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - import com.yami.shop.bean.app.dto.ProductDto; +import com.yami.shop.bean.app.dto.TagProductDto; import com.yami.shop.bean.model.Product; +import com.yami.shop.bean.model.Sku; import com.yami.shop.bean.model.Transport; - +import com.yami.shop.common.util.PageParam; +import com.yami.shop.service.ProductService; +import com.yami.shop.service.SkuService; +import com.yami.shop.service.TransportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import ma.glasnost.orika.MapperFacade; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.stream.Collectors; @RestController @RequestMapping("/prod") @@ -106,15 +104,6 @@ public class ProdController { return ResponseEntity.ok(productDtoIPage); } - @GetMapping("/discountProdList") - @ApiOperation(value = "限时特惠", notes = "获取限时特惠商品列表") - @ApiImplicitParams({ - }) - public ResponseEntity> discountProdList(PageParam page) { - IPage productDtoIPage = prodService.discountProdList(page); - return ResponseEntity.ok(productDtoIPage); - } - @GetMapping("/moreBuyProdList") @ApiOperation(value = "每日疯抢", notes = "获取销量最多的商品列表") @ApiImplicitParams({}) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Points.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Points.java deleted file mode 100644 index 0fc37f8..0000000 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Points.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.bean.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yami.shop.bean.vo.SysUserVO; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; - -@Data -@TableName( "tz_points") -public class Points { - /** - * 积分id - */ - @TableId - - private Long pointsId; - - /** - * 店铺id - */ - - private Long shopId; - - /** - * 积分名称 - */ - private String name; - - /** - * 状态(0 禁用 1启用) - */ - private Integer state; - - /** - * 更新时间 - */ - - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - /** - * 操作人 - */ - private Long modifier; - - /** - * 关联操作人 - */ - @TableField(exist = false) - private SysUserVO sysUser; - -} \ No newline at end of file diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsChange.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsChange.java deleted file mode 100644 index 291925e..0000000 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsChange.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.bean.model; - -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; - -@Data -@TableName( "tz_points_change") -public class PointsChange { - /** - * 积分流动记录表 - */ - - private Long pointsChangeId; - - /** - * 积分钱包id - */ - - private Long pointsWalletId; - - /** - * 增加或减少(增加 0 减少 1) - */ - - private Integer addOrReduce; - - /** - * 原因(订单，邀请，签到，兑换) - */ - private Integer reason; - - /** - * 积分状态（0:用户未收货待结算，1:已结算 2:用户退货退单） - */ - private Integer state; - - /** - * 积分数额 - */ - - private Double pointsNumber; - - /** - * 关联订单id - */ - - private Long orderId; - - /** - * 商户订单id - */ - - private Long merchantOrderId; - - /** - * 创建时间 - */ - - private Date createTime; - - /** - * 更新时间 - */ - - private Date updateTime; -} \ No newline at end of file diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsProd.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsProd.java deleted file mode 100644 index a40be58..0000000 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsProd.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.bean.model; - -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; - - -@Data -@TableName( "tz_points_prod") -public class PointsProd { - /** - * 积分商品id - */ - - private Long pointsProdId; - - /** - * 所需积分id - */ - - private Long pointsId; - - /** - * 所需积分量 - */ - - private Double pointsNumber; - - /** - * 所需金额 - */ - private Double amount; - - /** - * 关联商品id - */ - - private Long prodId; - - /** - * 库存 - */ - private Integer stocks; - - /** - * 状态(0下架 1上架) - */ - private Integer state; - - /** - * 上架时间 - */ - - private Date upperShelfTime; - - /** - * 下架时间 - */ - - private Date lowerShelf; -} \ No newline at end of file diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsWallet.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsWallet.java deleted file mode 100644 index 8634859..0000000 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PointsWallet.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.bean.model; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; - -@Data -@TableName( "tz_points_wallet") -public class PointsWallet { - /** - * 积分钱包id - */ - - private Long pointsWalletId; - - /** - * 积分Id - */ - - private Long pointsId; - - /** - * 用户id - */ - - private Long userId; - - /** - * 待结算积分 - */ - private Double unsettled; - - /** - * 已结算积分 - */ - private Double settled; - - /** - * 积累收益积分 - */ - private Double addup; - - /** - * 乐观锁 - */ - @Version - private Integer version; -} \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsChangeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/PointsChangeMapper.java deleted file mode 100644 index 9579034..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsChangeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.dao; - -import com.yami.shop.bean.model.PointsChange; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface PointsChangeMapper extends BaseMapper { -} \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/PointsMapper.java deleted file mode 100644 index 52aca81..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.dao; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yami.shop.bean.model.Points; -import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import java.util.List; - -public interface PointsMapper extends BaseMapper { - IPage getPointsAndSysUserPage(Page page, @Param("points") Points points); - - List getNameAndId(@Param("points") Points points); - - void deleteByIds(@Param("ids") List ids); -} \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsProdMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/PointsProdMapper.java deleted file mode 100644 index 1b3769d..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsProdMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.dao; - -import com.yami.shop.bean.model.PointsProd; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface PointsProdMapper extends BaseMapper { -} \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsWalletMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/PointsWalletMapper.java deleted file mode 100644 index c10ba81..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/PointsWalletMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.dao; - -import com.yami.shop.bean.model.PointsWallet; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface PointsWalletMapper extends BaseMapper { -} \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java index dcb9577..9051951 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java @@ -14,14 +14,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yami.shop.bean.app.dto.ProdCommDataDto; import com.yami.shop.bean.app.dto.ProdCommDto; -import com.yami.shop.bean.model.PointsWallet; import com.yami.shop.bean.model.ProdComm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - public interface ProdCommMapper extends BaseMapper { ProdCommDataDto getProdCommDataByProdId(@Param("prodId") Long prodId, @Param("userId") String userId); diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java index 3ebcf1e..4f726fc 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java @@ -37,8 +37,6 @@ public interface ProductMapper extends BaseMapper { IPage pageByTagId(Page page, @Param("tagId") Long tagId); - IPage discountProdList(Page page); - IPage moreBuyProdList(Page page); IPage pageByCategoryId(Page page, @Param("categoryId") Long categoryId); diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PointsChangeService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PointsChangeService.java deleted file mode 100644 index 739a11f..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PointsChangeService.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.yami.shop.bean.model.PointsChange; - -/** - * - * @author lgh on 2019/04/10. - */ -public interface PointsChangeService extends IService { - -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PointsProdService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PointsProdService.java deleted file mode 100644 index 6c5f108..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PointsProdService.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.yami.shop.bean.model.PointsProd; - -/** - * - * @author lgh on 2019/04/10. - */ -public interface PointsProdService extends IService { - -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PointsService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PointsService.java deleted file mode 100644 index 2c41557..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PointsService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.yami.shop.bean.model.Points; - -import java.util.List; - -/** - * - * @author lgh on 2019/04/10. - */ -public interface PointsService extends IService { - IPage getPointsAndSysUserPage(Page page ,Points points); - - List getNameAndId(Points points); - - void deleteByIds(List ids); -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PointsWalletService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PointsWalletService.java deleted file mode 100644 index b694650..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PointsWalletService.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.yami.shop.bean.model.PointsWallet; - -/** - * - * @author lgh on 2019/04/10. - */ -public interface PointsWalletService extends IService { - -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java index e33fd00..038969f 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java @@ -57,8 +57,6 @@ public interface ProductService extends IService { IPage pageByTagId(Page page, Long tagId); - IPage discountProdList(Page page); - IPage moreBuyProdList(Page page); IPage pageByCategoryId(Page page, Long categoryId); diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsChangeServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsChangeServiceImpl.java deleted file mode 100644 index 4ddb4b5..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsChangeServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.yami.shop.bean.model.PointsChange; -import com.yami.shop.dao.PointsChangeMapper; - -import com.yami.shop.service.PointsChangeService; - -/** - * - * @author lgh on 2019/04/10. - */ -@Service -public class PointsChangeServiceImpl extends ServiceImpl implements PointsChangeService { - - @Autowired - private PointsChangeMapper pointsChangeMapper; - -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsProdServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsProdServiceImpl.java deleted file mode 100644 index 731aec5..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsProdServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.yami.shop.bean.model.PointsProd; -import com.yami.shop.dao.PointsProdMapper; - -import com.yami.shop.service.PointsProdService; - -/** - * - * @author lgh on 2019/04/10. - */ -@Service -public class PointsProdServiceImpl extends ServiceImpl implements PointsProdService { - - @Autowired - private PointsProdMapper pointsProdMapper; - -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsServiceImpl.java deleted file mode 100644 index 19a4b55..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.yami.shop.bean.model.Points; -import com.yami.shop.dao.PointsMapper; - -import com.yami.shop.service.PointsService; - -import java.util.List; - -/** - * - * @author lgh on 2019/04/10. - */ -@Service -public class PointsServiceImpl extends ServiceImpl implements PointsService { - - @Autowired - private PointsMapper pointsMapper; - - @Override - public IPage getPointsAndSysUserPage(Page page,Points points) { - return pointsMapper.getPointsAndSysUserPage(page,points); - } - - @Override - public List getNameAndId(Points points) { - return pointsMapper.getNameAndId(points); - } - - @Override - public void deleteByIds(List ids) { - pointsMapper.deleteByIds(ids); - } -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsWalletServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsWalletServiceImpl.java deleted file mode 100644 index c3e05ae..0000000 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsWalletServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.yami.shop.bean.model.PointsWallet; -import com.yami.shop.dao.PointsWalletMapper; - -import com.yami.shop.service.PointsWalletService; - -/** - * - * @author lgh on 2019/04/10. - */ -@Service -public class PointsWalletServiceImpl extends ServiceImpl implements PointsWalletService { - - @Autowired - private PointsWalletMapper pointsWalletMapper; - -} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java index 3436957..3c0181a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java @@ -169,11 +169,6 @@ public class ProductServiceImpl extends ServiceImpl impl return productMapper.pageByTagId(page, tagId); } - @Override - public IPage discountProdList(Page page) { - return productMapper.discountProdList(page); - } - @Override public IPage moreBuyProdList(Page page) { return productMapper.moreBuyProdList(page); diff --git a/yami-shop-service/src/main/resources/mapper/PointsChangeMapper.xml b/yami-shop-service/src/main/resources/mapper/PointsChangeMapper.xml deleted file mode 100644 index 7bdc3dc..0000000 --- a/yami-shop-service/src/main/resources/mapper/PointsChangeMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yami-shop-service/src/main/resources/mapper/PointsMapper.xml b/yami-shop-service/src/main/resources/mapper/PointsMapper.xml deleted file mode 100644 index eeb6444..0000000 --- a/yami-shop-service/src/main/resources/mapper/PointsMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - delete from tz_points where points_id in - - #{id} - - - \ No newline at end of file diff --git a/yami-shop-service/src/main/resources/mapper/PointsProdMapper.xml b/yami-shop-service/src/main/resources/mapper/PointsProdMapper.xml deleted file mode 100644 index 8cda62d..0000000 --- a/yami-shop-service/src/main/resources/mapper/PointsProdMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yami-shop-service/src/main/resources/mapper/PointsWalletMapper.xml b/yami-shop-service/src/main/resources/mapper/PointsWalletMapper.xml deleted file mode 100644 index 152aee6..0000000 --- a/yami-shop-service/src/main/resources/mapper/PointsWalletMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yami-shop-service/src/main/resources/mapper/ProductMapper.xml b/yami-shop-service/src/main/resources/mapper/ProductMapper.xml index e70f6ac..8325322 100644 --- a/yami-shop-service/src/main/resources/mapper/ProductMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/ProductMapper.xml @@ -125,20 +125,6 @@ ORDER BY putaway_time DESC - -