springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
New file @@ -0,0 +1,41 @@ package com.panzhihua.common.model.dtos.shop; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; import java.util.Date; /** * @ClasssName OrderSearchDTO * @Description 订单搜索DTO * @Author cedoo * @Date 2021/4/16 * @Version 1.0 **/ @Data public class PageComShopOrderSearchDTO { @ApiModelProperty(value = "订单编号",example = "316356541616") private String orderNo; @ApiModelProperty(value = "用户账号") private String userAccount; @ApiModelProperty(value = "收货人",example = "张三") private String receiverAccount; @ApiModelProperty(value = "收货人电话",example = "13123456789") private String receiverPhone; @ApiModelProperty(value = "商品",example = "鞋") private String goodsName; @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)",example = "1") private Date status; @ApiModelProperty(value = "下单时间-开始",example = "1") private String createAtStart; @ApiModelProperty(value = "下单时间-结束",example = "1") private Date createAtEnd; @ApiModelProperty(value = "分页-当前页数",example = "1", required = true) private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10", required = true) private Long pageSize; @JsonIgnore private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderVO.java
New file @@ -0,0 +1,82 @@ package com.panzhihua.common.model.vos.shop; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; /** * @auther lyq * @create 2021-04-14 15:03:01 * @describe 订单表实体类 */ @Data @ApiModel("商品订单") public class ComShopOrderVO implements Serializable { @ApiModelProperty("订单id") private Long id; @ApiModelProperty("店铺id") private Long storeId; @ApiModelProperty("用户id") private Long userId; @ApiModelProperty("订单号") private String orderNo; @ApiModelProperty("支付单号") private String payNo; @ApiModelProperty("微信交易单号") private String wxTardeNo; @ApiModelProperty("订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)") private Integer status; @ApiModelProperty("支付状态(1.未支付 2.已支付)") private Integer payStatus; @ApiModelProperty("订单收货人id") private Long receiverId; @ApiModelProperty("订单总金额") private BigDecimal totalAmount; @ApiModelProperty("优惠总金额") private BigDecimal discountAmount; @ApiModelProperty("支付总金额") private BigDecimal payAmount; @ApiModelProperty("支付方式（1.微信支付）") private Integer payType; @ApiModelProperty("支付时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payTime; @ApiModelProperty("配送方式（1.商家配送 2.快递物流）") private Integer deliveryType; @ApiModelProperty("订单发货状态（1.未发货 2.已发货）") private Integer deliveryStatus; @ApiModelProperty("物流公司") private String logisticsCompany; @ApiModelProperty("物流单号") private String logisticsNo; @ApiModelProperty("下单时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5,6 +5,7 @@ import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -1809,4 +1810,12 @@ */ @PostMapping("/shop/pageShopOperLog") R pageShopOperLog(@RequestBody PageDTO pageDTO); /** * 分页查询 商家后台操作日志 * @param pageComShopOrderSearchDTO 分页数据 * @return 分页日志 */ @PostMapping("/shop/order/page") R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -2,12 +2,14 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.service_community.service.ComShopOperLogService; import com.panzhihua.service_community.service.ComShopOrderService; import com.panzhihua.service_community.service.ComShopStoreService; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; @@ -25,6 +27,8 @@ private ComShopStoreService comShopStoreService; @Resource private ComShopOperLogService comShopOperLogService; @Resource private ComShopOrderService comShopOrderService; /** * 店铺列表-分页查询 @@ -102,4 +106,15 @@ public R pageShopOperLog(@RequestBody PageDTO pageDTO) { return comShopOperLogService.pageShopOperLog(pageDTO); } /** * 分页查询 商家订单 * @param pageComShopOrderSearchDTO 分页数据 * @return 分页订单 */ @PostMapping("/order/page") public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) { return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -1,15 +1,42 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.vos.shop.ComShopOrderVO; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.service_community.model.dos.ComShopOrderDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; /** * @auther lyq * @create 2021-04-14 15:03:01 * @auther cedoo * @create 2021-4-17 17:35:51 * @describe 订单表mapper类 */ @Mapper public interface ComShopOrderDAO extends BaseMapper<ComShopOrderDO> { @Select("<script> " + "SELECT\n" + "id,\n" + "`name`,\n" + "photo_path,\n" + "phone,\n" + "integral,\n" + "create_at \n" + "FROM\n" + "com_mng_volunteer_mng \n" + " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" + "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" + " and name like concat(#{comMngVolunteerMngVO.name},'%') \n" + " </if> " + "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" + "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " + " </if> " + " order by integral desc,create_at desc"+ "</script>") IPage<ComShopOrderVO> pageOrderBy(PageDTO page, PageComShopOrderSearchDTO pageComShopOrderSearchDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
@@ -1,6 +1,8 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.model.dos.ComShopOrderDO; /** @@ -10,4 +12,10 @@ */ public interface ComShopOrderService extends IService<ComShopOrderDO> { /** * 分页搜索订单记录 * @param pageComShopOrderSearchDTO 分页数据 * @return 分页订单 */ R pageShopOrder(PageComShopOrderSearchDTO pageComShopOrderSearchDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java
@@ -50,6 +50,11 @@ comShopOperLogDOIPage.convert(comShopOperLogDO -> { ShopOperLogVO shopOperLogVO = new ShopOperLogVO(); BeanUtils.copyProperties(comShopOperLogDO, shopOperLogVO); /** * 隐藏敏感信息 */ shopOperLogVO.setJsonResult("****"); shopOperLogVO.setOperParam("****"); return shopOperLogVO; }); return R.ok(comShopOperLogVOIPage); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -1,6 +1,10 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.dao.ComShopOrderDAO; import com.panzhihua.service_community.model.dos.ComShopOrderDO; import com.panzhihua.service_community.service.ComShopOrderService; @@ -16,4 +20,23 @@ @Service public class ComShopOrderServiceImpl extends ServiceImpl<ComShopOrderDAO, ComShopOrderDO> implements ComShopOrderService { @Override public R pageShopOrder(PageComShopOrderSearchDTO pageComShopOrderSearchDTO) { Long pageNum = pageComShopOrderSearchDTO.getPageNum(); Long pageSize = pageComShopOrderSearchDTO.getPageSize(); PageDTO page = new PageDTO(); page.setPageNum(pageNum); page.setPageSize(pageSize); if(pageNum==null||new Long(0).equals(pageNum.longValue())){ page.setPageNum(1l); } if(pageSize==null||new Long(0).equals(pageSize.longValue())){ page.setPageSize(10l); } this.baseMapper.pageOrderBy(page, pageComShopOrderSearchDTO); return null; } }
