Skip to content

吕鸿磊 / putaojuzi

Go to a project
Toggle navigation
Toggle navigation pinning
ad8afff4 by lv
Options

去除无用接口

1 parent 924a8158
Inline Side-by-side
Showing 23 changed files with 457 additions and 246 deletions
blade-service-api/blade-store-api/src/main/java/org/springblade/store/entity/Coupon.java
......@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
* 实体类
*
* @author BladeX
* @since 2019-11-06
* @since 2019-11-07
*/
@Data
@TableName("fs_coupon")
......
blade-service-api/blade-store-api/src/main/java/org/springblade/store/entity/Order.java
......@@ -17,6 +17,8 @@
package org.springblade.store.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -30,7 +32,7 @@ import java.time.LocalDateTime;
* 实体类
*
* @author BladeX
* @since 2019-11-06
* @since 2019-11-07
*/
@Data
@TableName("fs_order")
......@@ -48,12 +50,14 @@ public class Order extends BaseEntity {
/**
* 用户ID
*/
@ApiModelProperty(value = "用户ID")
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "用户ID")
private Long userId;
/**
* 园区地址ID
*/
@ApiModelProperty(value = "园区地址ID")
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "园区地址ID")
private Long addressId;
/**
* 园区地址
......@@ -70,14 +74,16 @@ public class Order extends BaseEntity {
*/
@ApiModelProperty(value = "预计配送时间")
private LocalDateTime deliveryTime;
/**
* 商品id
*/
private Long productId;
/**
/**
* 商品id
*/
@ApiModelProperty(value = "商品id")
private Long productId;
/**
* 品类Id
*/
@ApiModelProperty(value = "品类Id")
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "品类Id")
private Long categoryId;
/**
* 数量
......@@ -90,9 +96,15 @@ public class Order extends BaseEntity {
@ApiModelProperty(value = "总价")
private BigDecimal totalPrice;
/**
* 优惠价
*/
@ApiModelProperty(value = "优惠价")
private BigDecimal discountPrice;
/**
* 优惠券ID
*/
@ApiModelProperty(value = "优惠券ID")
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "优惠券ID")
private Long couponId;
/**
* 优惠名
......@@ -102,7 +114,8 @@ public class Order extends BaseEntity {
/**
* 用户优惠券ID
*/
@ApiModelProperty(value = "用户优惠券ID")
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "用户优惠券ID")
private Long userCouponId;
......
blade-service-api/blade-store-api/src/main/java/org/springblade/store/entity/Product.java
......@@ -18,18 +18,18 @@ package org.springblade.store.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 实体类
*
* @author BladeX
* @since 2019-11-06
* @since 2019-11-07
*/
@Data
@TableName("fs_product")
......@@ -39,11 +39,31 @@ public class Product extends BaseEntity {
private static final long serialVersionUID = 1L;
private String name;
private String img;
private String describe;
private String contactUs;
private LocalDateTime deliveryTime;
/**
* 商品名
*/
@ApiModelProperty(value = "商品名")
private String productName;
/**
* 图片
*/
@ApiModelProperty(value = "图片")
private String img;
/**
* 商品简介
*/
@ApiModelProperty(value = "商品简介")
private String describe;
/**
* 商品介绍
*/
@ApiModelProperty(value = "商品介绍")
private String contactUs;
/**
* 配送时间
*/
@ApiModelProperty(value = "配送时间")
private LocalDateTime deliveryTime;
}
......
blade-service-api/blade-store-api/src/main/java/org/springblade/store/entity/ProductCategory.java
......@@ -17,7 +17,10 @@
package org.springblade.store.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
......@@ -28,7 +31,7 @@ import java.math.BigDecimal;
* 实体类
*
* @author BladeX
* @since 2019-11-06
* @since 2019-11-07
*/
@Data
@TableName("fs_product_category")
......@@ -38,9 +41,22 @@ public class ProductCategory extends BaseEntity {
private static final long serialVersionUID = 1L;
private Long productId;
private String categoryName;
private BigDecimal price;
/**
* 商品id
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "商品id")
private Long productId;
/**
* 分类名
*/
@ApiModelProperty(value = "分类名")
private String categoryName;
/**
* 价格
*/
@ApiModelProperty(value = "价格")
private BigDecimal price;
}
......
blade-service-api/blade-store-api/src/main/java/org/springblade/store/entity/ShippingAddress.java
......@@ -27,7 +27,7 @@ import org.springblade.core.mp.base.BaseEntity;
* 实体类
*
* @author BladeX
* @since 2019-11-06
* @since 2019-11-07
*/
@Data
@TableName("fs_shipping_address")
......@@ -43,5 +43,11 @@ public class ShippingAddress extends BaseEntity {
@ApiModelProperty(value = "配送地址")
private String addressName;
/**
* 地区编号
*/
@ApiModelProperty(value = "地区编号")
private String addressNum;
}
......
blade-service-api/blade-store-api/src/main/java/org/springblade/store/entity/UserCoupon.java
......@@ -17,6 +17,8 @@
package org.springblade.store.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -29,7 +31,7 @@ import java.time.LocalDateTime;
* 实体类
*
* @author BladeX
* @since 2019-11-06
* @since 2019-11-07
*/
@Data
@TableName("fs_user_coupon")
......@@ -42,12 +44,14 @@ public class UserCoupon extends BaseEntity {
/**
* 用户ID
*/
@ApiModelProperty(value = "用户ID")
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "用户ID")
private Long userId;
/**
* 优惠券ID
*/
@ApiModelProperty(value = "优惠券ID")
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "优惠券ID")
private Long couponId;
/**
* 领取时间
......
blade-service/blade-store/src/main/java/org/springblade/store/controller/CouponController.java
......@@ -16,6 +16,7 @@
*/
package org.springblade.store.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -25,11 +26,16 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.store.entity.Coupon;
import org.springblade.store.service.ICouponService;
import org.springblade.store.vo.CouponVO;
import org.springblade.store.vo.coupon.CouponAddVO;
import org.springblade.store.vo.coupon.CouponUpdateVO;
import org.springblade.store.wrapper.CouponWrapper;
import org.springframework.context.annotation.Bean;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
......@@ -52,29 +58,24 @@ public class CouponController extends BladeController {
* 详情
*/
@GetMapping("/detail")
@ApiOperation(value = "详情", notes = "传入coupon", position = 1)
public R<CouponVO> detail(Coupon coupon) {
Coupon detail = couponService.getOne(Condition.getQueryWrapper(coupon));
@ApiOperation(value = "详情", notes = "传入couponId", position = 1)
public R<CouponVO> detail(Long couponId) {
Coupon detail = couponService.getById(couponId);
return R.data(CouponWrapper.build().entityVO(detail));
}
/**
* 分页
*/
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入coupon", position = 2)
public R<IPage<CouponVO>> list(Coupon coupon, Query query) {
IPage<Coupon> pages = couponService.page(Condition.getPage(query), Condition.getQueryWrapper(coupon));
return R.data(CouponWrapper.build().pageVO(pages));
}
/**
* 自定义分页
* 分页
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入coupon", position = 3)
public R<IPage<CouponVO>> page(CouponVO coupon, Query query) {
IPage<CouponVO> pages = couponService.selectCouponPage(Condition.getPage(query), coupon);
@ApiOperation(value = "分页", notes = "传入coupon", position = 2)
public R<IPage<Coupon>> page(String keyword, Query query) {
QueryWrapper<Coupon> wrapper = new QueryWrapper<>();
if(StringUtil.isNotBlank(keyword)){
wrapper.like("coupon_name",keyword);
}
wrapper.orderByDesc("update_time");
IPage<Coupon> pages = couponService.page(Condition.getPage(query), wrapper);
return R.data(pages);
}
......@@ -82,8 +83,10 @@ public class CouponController extends BladeController {
* 新增
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入coupon", position = 4)
public R save(@Valid @RequestBody Coupon coupon) {
@ApiOperation(value = "新增", notes = "传入coupon", position = 3)
public R save(@Valid @RequestBody CouponAddVO couponAddVO) {
Coupon coupon = new Coupon();
BeanUtil.copy(couponAddVO,coupon);
return R.status(couponService.save(coupon));
}
......@@ -91,26 +94,19 @@ public class CouponController extends BladeController {
* 修改
*/
@PostMapping("/update")
@ApiOperation(value = "修改", notes = "传入coupon", position = 5)
public R update(@Valid @RequestBody Coupon coupon) {
@ApiOperation(value = "修改", notes = "传入coupon", position = 4)
public R update(@Valid @RequestBody CouponUpdateVO couponUpdateVO) {
Coupon coupon = new Coupon();
BeanUtil.copy(couponUpdateVO,coupon);
return R.status(couponService.updateById(coupon));
}
/**
* 新增或修改
*/
@PostMapping("/submit")
@ApiOperation(value = "新增或修改", notes = "传入coupon", position = 6)
public R submit(@Valid @RequestBody Coupon coupon) {
return R.status(couponService.saveOrUpdate(coupon));
}
/**
* 删除
*/
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 5)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(couponService.deleteLogic(Func.toLongList(ids)));
}
......
blade-service/blade-store/src/main/java/org/springblade/store/controller/OrderController.java
......@@ -70,8 +70,8 @@ public class OrderController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperation(value = "详情", notes = "传入order", position = 1)
public R<OrderVO> detail(Order order) {
Order detail = orderService.getOne(Condition.getQueryWrapper(order));
public R<OrderVO> detail(Long orderId) {
Order detail = orderService.getById(orderId);
return R.data(OrderWrapper.build().entityVO(detail));
}
......@@ -86,16 +86,6 @@ public class OrderController extends BladeController {
}
/**
* 自定义分页
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入order", position = 3)
public R<IPage<OrderVO>> page(OrderVO order, Query query) {
IPage<OrderVO> pages = orderService.selectOrderPage(Condition.getPage(query), order);
return R.data(pages);
}
/**
* 新增
*/
@PostMapping("/save")
......@@ -177,11 +167,10 @@ public class OrderController extends BladeController {
/**
* 获取用户订单
* @param userId
* @return
*/
@GetMapping("/order_list")
public R getOrderList(String userId){
public R getOrderList(){
List<Order> orderList = orderService.getOrderList();
return R.data(orderList);
}
......@@ -201,7 +190,6 @@ public class OrderController extends BladeController {
map.put("timeStamp", WXPayUtil.generateNonceStr());
//微信下单
String prepayId = WXOrderUtil.pay(order.getOrderId(), order.getTotalPrice(), "");
map.put("appId", WXPayConstants.APP_ID);
map.put("nonceStr",WXPayUtil.generateNonceStr());
map.put("package","prepay_id="+prepayId);
......
blade-service/blade-store/src/main/java/org/springblade/store/controller/ProductCategoryController.java
......@@ -16,6 +16,7 @@
*/
package org.springblade.store.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -25,14 +26,19 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.store.entity.ProductCategory;
import org.springblade.store.service.IProductCategoryService;
import org.springblade.store.vo.ProductCategoryVO;
import org.springblade.store.vo.productcategory.CategoryAddVO;
import org.springblade.store.vo.productcategory.CategoryUpdateVO;
import org.springblade.store.wrapper.ProductCategoryWrapper;
import org.springframework.context.annotation.Bean;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* 控制器
......@@ -49,41 +55,23 @@ public class ProductCategoryController extends BladeController {
private IProductCategoryService productCategoryService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperation(value = "详情", notes = "传入productCategory", position = 1)
public R<ProductCategoryVO> detail(ProductCategory productCategory) {
ProductCategory detail = productCategoryService.getOne(Condition.getQueryWrapper(productCategory));
return R.data(ProductCategoryWrapper.build().entityVO(detail));
}
/**
* 分页
* 列表
*/
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入productCategory", position = 2)
public R<IPage<ProductCategoryVO>> list(ProductCategory productCategory, Query query) {
IPage<ProductCategory> pages = productCategoryService.page(Condition.getPage(query), Condition.getQueryWrapper(productCategory));
return R.data(ProductCategoryWrapper.build().pageVO(pages));
}
/**
* 自定义分页
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入productCategory", position = 3)
public R<IPage<ProductCategoryVO>> page(ProductCategoryVO productCategory, Query query) {
IPage<ProductCategoryVO> pages = productCategoryService.selectProductCategoryPage(Condition.getPage(query), productCategory);
return R.data(pages);
@ApiOperation(value = "列表", notes = "传入productId", position = 1)
public R<List<ProductCategory>> list(Long productId) {
List<ProductCategory> list = productCategoryService.list(new QueryWrapper<ProductCategory>().eq("product_id",productId));
return R.data(list);
}
/**
* 新增
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入productCategory", position = 4)
public R save(@Valid @RequestBody ProductCategory productCategory) {
@ApiOperation(value = "新增", notes = "传入productCategory", position = 2)
public R save(@Valid @RequestBody CategoryAddVO categoryAddVO) {
ProductCategory productCategory = new ProductCategory();
BeanUtil.copy(categoryAddVO,productCategory);
return R.status(productCategoryService.save(productCategory));
}
......@@ -91,26 +79,18 @@ public class ProductCategoryController extends BladeController {
* 修改
*/
@PostMapping("/update")
@ApiOperation(value = "修改", notes = "传入productCategory", position = 5)
public R update(@Valid @RequestBody ProductCategory productCategory) {
@ApiOperation(value = "修改", notes = "传入productCategory", position = 3)
public R update(@Valid @RequestBody CategoryUpdateVO categoryUpdateVO) {
ProductCategory productCategory = new ProductCategory();
BeanUtil.copy(categoryUpdateVO,productCategory);
return R.status(productCategoryService.updateById(productCategory));
}
/**
* 新增或修改
*/
@PostMapping("/submit")
@ApiOperation(value = "新增或修改", notes = "传入productCategory", position = 6)
public R submit(@Valid @RequestBody ProductCategory productCategory) {
return R.status(productCategoryService.saveOrUpdate(productCategory));
}
/**
* 删除
*/
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 4)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(productCategoryService.deleteLogic(Func.toLongList(ids)));
}
......
blade-service/blade-store/src/main/java/org/springblade/store/controller/ProductController.java
......@@ -25,10 +25,13 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.store.entity.Product;
import org.springblade.store.service.IProductService;
import org.springblade.store.vo.ProductVO;
import org.springblade.store.vo.product.ProductAddVO;
import org.springblade.store.vo.product.ProductUpdateVO;
import org.springblade.store.wrapper.ProductWrapper;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......@@ -54,27 +57,18 @@ public class ProductController extends BladeController {
* 详情
*/
@GetMapping("/detail")
@ApiOperation(value = "详情", notes = "传入product", position = 1)
public R<ProductVO> detail(Product product) {
Product detail = productService.getOne(Condition.getQueryWrapper(product));
@ApiOperation(value = "详情", notes = "传入id", position = 1)
public R<ProductVO> detail(Long id) {
Product detail = productService.getById(id);
return R.data(ProductWrapper.build().entityVO(detail));
}
/**
* 分页
*/
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入product", position = 2)
public R<IPage<ProductVO>> list(Product product, Query query) {
IPage<Product> pages = productService.page(Condition.getPage(query), Condition.getQueryWrapper(product));
return R.data(ProductWrapper.build().pageVO(pages));
}
/**
* 自定义分页
* 分页
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入product", position = 3)
@ApiOperation(value = "分页", notes = "传入product", position = 2)
public R<IPage<ProductVO>> page(ProductVO product, Query query) {
IPage<ProductVO> pages = productService.selectProductPage(Condition.getPage(query), product);
return R.data(pages);
......@@ -84,8 +78,10 @@ public class ProductController extends BladeController {
* 新增
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入product", position = 4)
public R save(@Valid @RequestBody Product product) {
@ApiOperation(value = "新增", notes = "传入product", position = 3)
public R save(@Valid @RequestBody ProductAddVO productAddVO) {
Product product = new Product();
BeanUtil.copy(productAddVO,product);
return R.status(productService.save(product));
}
......@@ -93,26 +89,18 @@ public class ProductController extends BladeController {
* 修改
*/
@PostMapping("/update")
@ApiOperation(value = "修改", notes = "传入product", position = 5)
public R update(@Valid @RequestBody Product product) {
@ApiOperation(value = "修改", notes = "传入product", position = 4)
public R update(@Valid @RequestBody ProductUpdateVO productUpdateVO) {
Product product = new Product();
BeanUtil.copy(productUpdateVO,product);
return R.status(productService.updateById(product));
}
/**
* 新增或修改
*/
@PostMapping("/submit")
@ApiOperation(value = "新增或修改", notes = "传入product", position = 6)
public R submit(@Valid @RequestBody Product product) {
return R.status(productService.saveOrUpdate(product));
}
/**
* 删除
*/
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 5)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(productService.deleteLogic(Func.toLongList(ids)));
}
......
blade-service/blade-store/src/main/java/org/springblade/store/controller/ShippingAddressController.java
......@@ -16,6 +16,7 @@
*/
package org.springblade.store.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -25,20 +26,18 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.store.entity.ShippingAddress;
import org.springblade.store.service.IShippingAddressService;
import org.springblade.store.vo.ShippingAddressVO;
import org.springblade.store.vo.shippingaddress.AddressAddVO;
import org.springblade.store.vo.shippingaddress.AddressUpdateVO;
import org.springblade.store.wrapper.ShippingAddressWrapper;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 控制器
......@@ -54,43 +53,31 @@ public class ShippingAddressController extends BladeController {
private IShippingAddressService shippingAddressService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperation(value = "详情", notes = "传入shippingAddress", position = 1)
public R<ShippingAddressVO> detail(ShippingAddress shippingAddress) {
ShippingAddress detail = shippingAddressService.getOne(Condition.getQueryWrapper(shippingAddress));
return R.data(ShippingAddressWrapper.build().entityVO(detail));
}
/**
* 分页
*/
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入shippingAddress", position = 2)
public R<IPage<ShippingAddressVO>> list(ShippingAddress shippingAddress, Query query) {
IPage<ShippingAddress> pages = shippingAddressService.page(Condition.getPage(query), Condition.getQueryWrapper(shippingAddress));
public R<IPage<ShippingAddressVO>> list(String keyword, Query query) {
QueryWrapper<ShippingAddress> wrapper = new QueryWrapper<>();
if(StringUtil.isNotBlank(keyword)){
wrapper.like("address_name",keyword);
}
wrapper.orderByDesc("update_time");
IPage<ShippingAddress> pages = shippingAddressService.page(Condition.getPage(query),wrapper);
return R.data(ShippingAddressWrapper.build().pageVO(pages));
}
/**
* 自定义分页
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入shippingAddress", position = 3)
public R<IPage<ShippingAddressVO>> page(ShippingAddressVO shippingAddress, Query query) {
IPage<ShippingAddressVO> pages = shippingAddressService.selectShippingAddressPage(Condition.getPage(query), shippingAddress);
return R.data(pages);
}
/**
* 新增
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入shippingAddress", position = 4)
public R save(@Valid @RequestBody ShippingAddress shippingAddress) {
return R.status(shippingAddressService.save(shippingAddress));
public R save(@Valid @RequestBody AddressAddVO addressAddVO) {
ShippingAddress address = new ShippingAddress();
BeanUtil.copy(addressAddVO,address);
return R.status(shippingAddressService.save(address));
}
/**
......@@ -98,17 +85,10 @@ public class ShippingAddressController extends BladeController {
*/
@PostMapping("/update")
@ApiOperation(value = "修改", notes = "传入shippingAddress", position = 5)
public R update(@Valid @RequestBody ShippingAddress shippingAddress) {
return R.status(shippingAddressService.updateById(shippingAddress));
}
/**
* 新增或修改
*/
@PostMapping("/submit")
@ApiOperation(value = "新增或修改", notes = "传入shippingAddress", position = 6)
public R submit(@Valid @RequestBody ShippingAddress shippingAddress) {
return R.status(shippingAddressService.saveOrUpdate(shippingAddress));
public R update(@Valid @RequestBody AddressUpdateVO addressUpdateVO) {
ShippingAddress address = new ShippingAddress();
BeanUtil.copy(addressUpdateVO,address);
return R.status(shippingAddressService.updateById(address));
}
......
blade-service/blade-store/src/main/java/org/springblade/store/controller/UserCouponController.java
......@@ -35,6 +35,7 @@ import org.springblade.store.wrapper.UserCouponWrapper;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -52,80 +53,24 @@ public class UserCouponController extends BladeController {
private IUserCouponService userCouponService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperation(value = "详情", notes = "传入userCoupon", position = 1)
public R<UserCouponVO> detail(UserCoupon userCoupon) {
UserCoupon detail = userCouponService.getOne(Condition.getQueryWrapper(userCoupon));
return R.data(UserCouponWrapper.build().entityVO(detail));
}
/**
* 分页
*/
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入userCoupon", position = 2)
public R<IPage<UserCouponVO>> list(UserCoupon userCoupon, Query query) {
IPage<UserCoupon> pages = userCouponService.page(Condition.getPage(query), Condition.getQueryWrapper(userCoupon));
return R.data(UserCouponWrapper.build().pageVO(pages));
}
/**
* 自定义分页
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入userCoupon", position = 3)
public R<IPage<UserCouponVO>> page(UserCouponVO userCoupon, Query query) {
IPage<UserCouponVO> pages = userCouponService.selectUserCouponPage(Condition.getPage(query), userCoupon);
return R.data(pages);
}
/**
* 新增
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入userCoupon", position = 4)
@ApiOperation(value = "新增", notes = "传入userCoupon", position = 1)
public R save(@Valid @RequestBody UserCoupon userCoupon) {
return R.status(userCouponService.save(userCoupon));
}
/**
* 修改
*/
@PostMapping("/update")
@ApiOperation(value = "修改", notes = "传入userCoupon", position = 5)
public R update(@Valid @RequestBody UserCoupon userCoupon) {
return R.status(userCouponService.updateById(userCoupon));
}
/**
* 新增或修改
*/
@PostMapping("/submit")
@ApiOperation(value = "新增或修改", notes = "传入userCoupon", position = 6)
public R submit(@Valid @RequestBody UserCoupon userCoupon) {
return R.status(userCouponService.saveOrUpdate(userCoupon));
}
/**
* 删除
*/
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(userCouponService.deleteLogic(Func.toLongList(ids)));
}
/**
* 获取用户优惠券
* @return
*/
@GetMapping("/coupon")
@GetMapping("/list")
@ApiOperation(value = "新增", notes = "获取用户优惠券", position = 1)
public R coupon(){
List<UserCoupon> userCoupon= userCouponService.list(new QueryWrapper<UserCoupon>().eq("user_id",getUser().getUserId()));
List<UserCoupon> userCoupon= userCouponService.list(new QueryWrapper<UserCoupon>().eq("user_id",getUser().getUserId()).le("expired_date", LocalDateTime.now()));
return R.data(userCoupon);
}
......
blade-service/blade-store/src/main/java/org/springblade/store/mapper/ProductMapper.xml
......@@ -11,7 +11,7 @@
<result column="create_user" property="createUser"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="name" property="name"/>
<result column="product_name" property="productName"/>
<result column="img" property="img"/>
<result column="describe" property="describe"/>
<result column="contact_us" property="contactUs"/>
......
blade-service/blade-store/src/main/java/org/springblade/store/service/impl/OrderServiceImpl.java
......@@ -64,9 +64,8 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
List<Order> list = list(new QueryWrapper<Order>().eq("state", 2));
Delivery delivery = new Delivery();
BigDecimal bigDecimal = new BigDecimal(0);
for (Order o : list) {
//计算商品总价
//总价
BigDecimal totalPrice = o.getTotalPrice();
BigDecimal add = bigDecimal.add(totalPrice);
bigDecimal = add;
......@@ -154,7 +153,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
userCouponService.deleteLogic(list);
}
}
Product product = productService.getById(order.getProductId());
order.setDeliveryTime(product.getDeliveryTime() );
return R.status(save(order));
......
blade-service/blade-store/src/main/java/org/springblade/store/vo/coupon/CouponAddVO.java 0 → 100644
package org.springblade.store.vo.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @author 吕鸿磊
* @date 2019-11-07 20:28
*/
@Data
@ApiModel(value = "CouponAddVO对象", description = "CouponAddVO对象")
public class CouponAddVO {
/**
* 优惠券名
*/
@ApiModelProperty(value = "优惠券名")
private String couponName;
/**
* 优惠券类型
*/
@ApiModelProperty(value = "优惠券类型")
private Integer couponType;
/**
* 优惠金额/折扣
*/
@ApiModelProperty(value = "优惠金额/折扣")
private BigDecimal discounts;
/**
* 优惠券使用范围
*/
@ApiModelProperty(value = "优惠券使用范围")
private String scope;
/**
* 优惠券使用条件(金额)
*/
@ApiModelProperty(value = "优惠券使用条件(金额)")
private BigDecimal orderCondition;
/**
* 优惠券有效时间
*/
@ApiModelProperty(value = "优惠券有效时间")
private Integer validTime;
/**
* 优惠券过期时间
*/
@ApiModelProperty(value = "优惠券过期时间")
private LocalDateTime expiredDate;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/coupon/CouponUpdateVO.java 0 → 100644
package org.springblade.store.vo.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 吕鸿磊
* @date 2019-11-07 20:28
*/
@Data
@ApiModel(value = "CouponUpdateVO对象", description = "CouponUpdateVO对象")
public class CouponUpdateVO extends CouponAddVO {
@ApiModelProperty(value = "id")
private Long id;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/order/OrderQueryVO.java 0 → 100644
package org.springblade.store.vo.order;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @author 吕鸿磊
* @date 2019-11-07 21:58
*/
@Data
@ApiModel(value = "OrderQueryVO对象", description = "OrderQueryVO对象")
public class OrderQueryVO {
/**
* 订单Id
*/
@ApiModelProperty(value = "订单Id")
private String orderId;
/**
* 用户ID
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "用户ID")
private Long userId;
/**
* 园区地址
*/
@ApiModelProperty(value = "园区地址")
private String address;
/**
* 预留手机号
*/
@ApiModelProperty(value = "预留手机号")
private String mobile;
/**
* 开始时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始时间")
private LocalDateTime startTime;
/**
* 结束时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "结束时间")
private LocalDateTime endTime;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/product/ProductAddVO.java 0 → 100644
package org.springblade.store.vo.product;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author 吕鸿磊
* @date 2019-11-07 19:29
*/
@Data
@ApiModel(value = "ProductAddVO对象", description = "ProductAddVO对象")
public class ProductAddVO {
/**
* 商品名
*/
@ApiModelProperty(value = "商品名")
private String productName;
/**
* 图片
*/
@ApiModelProperty(value = "图片")
private String img;
/**
* 商品简介
*/
@ApiModelProperty(value = "商品简介")
private String describe;
/**
* 商品介绍
*/
@ApiModelProperty(value = "商品介绍")
private String contactUs;
/**
* 配送时间
*/
@ApiModelProperty(value = "配送时间")
private LocalDateTime deliveryTime;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/product/ProductUpdateVO.java 0 → 100644
package org.springblade.store.vo.product;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 吕鸿磊
* @date 2019-11-07 19:44
*/
@Data
@ApiModel(value = "ProductUpdateVO对象", description = "ProductUpdateVO对象")
public class ProductUpdateVO extends ProductAddVO {
@ApiModelProperty(value = "id")
private Long id;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/productcategory/CategoryAddVO.java 0 → 100644
package org.springblade.store.vo.productcategory;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author 吕鸿磊
* @date 2019-11-07 19:56
*/
@Data
@ApiModel(value = "CategoryAddVO对象", description = "CategoryAddVO对象")
public class CategoryAddVO {
/**
* 商品id
*/
@ApiModelProperty(value = "商品id")
private Long productId;
/**
* 分类名
*/
@ApiModelProperty(value = "分类名")
private String categoryName;
/**
* 价格
*/
@ApiModelProperty(value = "价格")
private BigDecimal price;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/productcategory/CategoryUpdateVO.java 0 → 100644
package org.springblade.store.vo.productcategory;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author 吕鸿磊
* @date 2019-11-07 19:58
*/
@Data
@ApiModel(value = "CategoryUpdateVO对象", description = "CategoryUpdateVO对象")
public class CategoryUpdateVO extends CategoryAddVO{
private Long id;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/shippingaddress/AddressAddVO.java 0 → 100644
package org.springblade.store.vo.shippingaddress;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 吕鸿磊
* @date 2019-11-07 20:41
*/
@Data
@ApiModel(value = "AddressAddVO对象", description = "AddressAddVO对象")
public class AddressAddVO {
/**
* 配送地址
*/
@ApiModelProperty(value = "配送地址")
private String addressName;
/**
* 地区编号
*/
@ApiModelProperty(value = "地区编号")
private String addressNum;
}
blade-service/blade-store/src/main/java/org/springblade/store/vo/shippingaddress/AddressUpdateVO.java 0 → 100644
package org.springblade.store.vo.shippingaddress;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 吕鸿磊
* @date 2019-11-07 21:27
*/
@Data
@ApiModel(value = "AddressUpdateVO对象", description = "AddressUpdateVO对象")
public class AddressUpdateVO extends AddressAddVO{
@ApiModelProperty(value = "id")
private Long id;
}
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!