From d4890cdc42f4c4aee4fb4477b173ed48d2efd79d Mon Sep 17 00:00:00 2001 From: tangzh Date: Fri, 14 Mar 2025 16:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/ArticleController.java | 220 +++++++++--------- .../admin/controller/CategoryController.java | 2 +- .../controller/PlaceRegisterController.java | 83 ------- .../ShippingTemplatesFreeController.java | 9 - .../ShippingTemplatesRegionController.java | 9 - .../controller/WechatMediaController.java | 2 +- food-admin/src/main/resources/application.yml | 2 +- .../com/zbkj/common/config/CrmebConfig.java | 1 - .../common/constants/SysConfigConstants.java | 5 + .../zbkj/common/model/order/StoreOrder.java | 6 + .../common/model/order/StoreOrderInfo.java | 2 - .../common/model/order/StoreOrderReturn.java | 4 + .../model/order/StoreOrderReturnInfo.java | 21 ++ .../common/request/PreOrderDetailRequest.java | 3 - .../common/response/ApplyRecordsResponse.java | 59 +++++ .../response/CanApplyOrderResponse.java | 37 +++ .../java/com/zbkj/common/vo/OrderInfoVo.java | 3 - .../front/controller/ProductController.java | 17 +- .../front/controller/QrCodeController.java | 138 +++++------ .../controller/StoreOrderController.java | 2 +- .../StoreOrderReturnController.java | 47 +++- .../zbkj/front/controller/UserController.java | 16 +- food-front/src/main/resources/application.yml | 2 +- .../com/zbkj/front/user/ActivityTest.java | 85 ------- .../java/com/zbkj/front/user/GameTest.java | 113 --------- .../com/zbkj/front/user/GroupDataTest.java | 29 --- .../java/com/zbkj/front/user/IdexTest.java | 29 --- .../java/com/zbkj/front/user/ProductTest.java | 29 --- .../java/com/zbkj/front/user/UserTest.java | 25 -- .../zbkj/service/dao/PlaceRegisterDao.java | 16 -- .../com/zbkj/service/dao/StoreOrderDao.java | 13 +- .../zbkj/service/dao/StoreOrderReturnDao.java | 6 + .../service/dao/StoreOrderReturnInfoDao.java | 4 + .../zbkj/service/service/OrderService.java | 7 + .../service/service/PlaceRegisterService.java | 31 --- .../service/StoreOrderReturnInfoService.java | 4 + .../service/StoreOrderReturnService.java | 17 ++ .../service/service/StoreOrderService.java | 7 + .../service/impl/CategoryServiceImpl.java | 2 +- .../service/impl/OrderPayServiceImpl.java | 8 +- .../service/impl/OrderServiceImpl.java | 29 ++- .../service/impl/OrderTaskServiceImpl.java | 10 +- .../impl/PlaceRegisterServiceImpl.java | 131 ----------- .../impl/StoreOrderReturnInfoServiceImpl.java | 8 + .../impl/StoreOrderReturnServiceImpl.java | 38 +++ .../service/impl/StoreOrderServiceImpl.java | 9 +- .../service/impl/YlyPrintServiceImpl.java | 18 +- .../java/com/zbkj/service/util/YlyUtil.java | 19 +- .../mapper/place/PlaceRegisterMapper.xml | 36 --- .../mapper/store/StoreOrderMapper.xml | 13 ++ .../store/StoreOrderReturnInfoMapper.xml | 17 ++ .../mapper/store/StoreOrderReturnMapper.xml | 15 ++ 52 files changed, 582 insertions(+), 876 deletions(-) delete mode 100644 food-admin/src/main/java/com/zbkj/admin/controller/PlaceRegisterController.java create mode 100644 food-common/src/main/java/com/zbkj/common/response/ApplyRecordsResponse.java create mode 100644 food-common/src/main/java/com/zbkj/common/response/CanApplyOrderResponse.java delete mode 100644 food-front/src/main/test/java/com/zbkj/front/user/ActivityTest.java delete mode 100644 food-front/src/main/test/java/com/zbkj/front/user/GameTest.java delete mode 100644 food-front/src/main/test/java/com/zbkj/front/user/GroupDataTest.java delete mode 100644 food-front/src/main/test/java/com/zbkj/front/user/IdexTest.java delete mode 100644 food-front/src/main/test/java/com/zbkj/front/user/ProductTest.java delete mode 100644 food-front/src/main/test/java/com/zbkj/front/user/UserTest.java delete mode 100644 food-service/src/main/java/com/zbkj/service/dao/PlaceRegisterDao.java delete mode 100644 food-service/src/main/java/com/zbkj/service/service/PlaceRegisterService.java delete mode 100644 food-service/src/main/java/com/zbkj/service/service/impl/PlaceRegisterServiceImpl.java delete mode 100644 food-service/src/main/resources/mapper/place/PlaceRegisterMapper.xml create mode 100644 food-service/src/main/resources/mapper/store/StoreOrderReturnInfoMapper.xml create mode 100644 food-service/src/main/resources/mapper/store/StoreOrderReturnMapper.xml diff --git a/food-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java b/food-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java index 9de3cef..ab78736 100644 --- a/food-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java +++ b/food-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java @@ -1,110 +1,110 @@ -package com.zbkj.admin.controller; - -import com.zbkj.common.model.article.Article; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.ArticleRequest; -import com.zbkj.common.request.ArticleSearchRequest; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.vo.ArticleVo; -import com.zbkj.service.service.ArticleService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - - -/** - * 文章管理表 前端控制器 - - */ -@Slf4j -@RestController -@RequestMapping("api/admin/article") -@Api(tags = "文章管理") -public class ArticleController { - - @Autowired - private ArticleService articleService; - - /** - * 分页显示文章管理表 - * @param request ArticleSearchRequest 搜索条件 - * @param pageParamRequest 分页参数 - */ - @PreAuthorize("hasAuthority('admin:article:list')") - @ApiOperation(value = "分页列表") - @RequestMapping(value = "/list", method = RequestMethod.GET) - @ApiImplicitParam(name="keywords", value="搜索关键字") - public CommonResult> getList(@Validated ArticleSearchRequest request, - @Validated PageParamRequest pageParamRequest) { - return CommonResult.success(CommonPage.restPage(articleService.getAdminList(request, pageParamRequest))); - } - - /** - * 新增文章管理表 - * @param articleRequest 新增参数 - */ - @PreAuthorize("hasAuthority('admin:article:save')") - @ApiOperation(value = "新增") - @RequestMapping(value = "/save", method = RequestMethod.POST) - public CommonResult save(@RequestBody @Validated ArticleRequest articleRequest) { - if (articleService.create(articleRequest)) { - return CommonResult.success(); - } else { - return CommonResult.failed(); - } - } - - /** - * 删除文章管理表 - * @param id Integer - */ - @PreAuthorize("hasAuthority('admin:article:delete')") - @ApiOperation(value = "删除") - @RequestMapping(value = "/delete", method = RequestMethod.GET) - @ApiImplicitParam(name="id", value="文章ID") - public CommonResult delete(@RequestParam(value = "id") Integer id) { - if (articleService.deleteById(id)) { - return CommonResult.success(); - } else { - return CommonResult.failed(); - } - } - - /** - * 修改文章管理表 - * @param id integer id - * @param articleRequest 修改参数 - */ - @PreAuthorize("hasAuthority('admin:article:update')") - @ApiOperation(value = "修改") - @RequestMapping(value = "/update", method = RequestMethod.POST) - @ApiImplicitParam(name="id", value="文章ID") - public CommonResult update(@RequestParam Integer id, @RequestBody @Validated ArticleRequest articleRequest) { - if (articleService.updateArticle(id, articleRequest)) { - return CommonResult.success(); - } else { - return CommonResult.failed(); - } - } - - /** - * 查询文章管理表信息 - * @param id Integer - */ - @PreAuthorize("hasAuthority('admin:article:info')") - @ApiOperation(value = "详情") - @RequestMapping(value = "/info", method = RequestMethod.GET) - @ApiImplicitParam(name="id", value="文章ID") - public CommonResult
info(@RequestParam(value = "id") Integer id) { - return CommonResult.success(articleService.getDetail(id)); - } -} - - - +//package com.zbkj.admin.controller; +// +//import com.zbkj.common.model.article.Article; +//import com.zbkj.common.page.CommonPage; +//import com.zbkj.common.request.ArticleRequest; +//import com.zbkj.common.request.ArticleSearchRequest; +//import com.zbkj.common.request.PageParamRequest; +//import com.zbkj.common.response.CommonResult; +//import com.zbkj.common.vo.ArticleVo; +//import com.zbkj.service.service.ArticleService; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiImplicitParam; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.security.access.prepost.PreAuthorize; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.*; +// +// +///** +// * 文章管理表 前端控制器 +// +// */ +//@Slf4j +//@RestController +//@RequestMapping("api/admin/article") +//@Api(tags = "文章管理") +//public class ArticleController { +// +// @Autowired +// private ArticleService articleService; +// +// /** +// * 分页显示文章管理表 +// * @param request ArticleSearchRequest 搜索条件 +// * @param pageParamRequest 分页参数 +// */ +// @PreAuthorize("hasAuthority('admin:article:list')") +// @ApiOperation(value = "分页列表") +// @RequestMapping(value = "/list", method = RequestMethod.GET) +// @ApiImplicitParam(name="keywords", value="搜索关键字") +// public CommonResult> getList(@Validated ArticleSearchRequest request, +// @Validated PageParamRequest pageParamRequest) { +// return CommonResult.success(CommonPage.restPage(articleService.getAdminList(request, pageParamRequest))); +// } +// +// /** +// * 新增文章管理表 +// * @param articleRequest 新增参数 +// */ +// @PreAuthorize("hasAuthority('admin:article:save')") +// @ApiOperation(value = "新增") +// @RequestMapping(value = "/save", method = RequestMethod.POST) +// public CommonResult save(@RequestBody @Validated ArticleRequest articleRequest) { +// if (articleService.create(articleRequest)) { +// return CommonResult.success(); +// } else { +// return CommonResult.failed(); +// } +// } +// +// /** +// * 删除文章管理表 +// * @param id Integer +// */ +// @PreAuthorize("hasAuthority('admin:article:delete')") +// @ApiOperation(value = "删除") +// @RequestMapping(value = "/delete", method = RequestMethod.GET) +// @ApiImplicitParam(name="id", value="文章ID") +// public CommonResult delete(@RequestParam(value = "id") Integer id) { +// if (articleService.deleteById(id)) { +// return CommonResult.success(); +// } else { +// return CommonResult.failed(); +// } +// } +// +// /** +// * 修改文章管理表 +// * @param id integer id +// * @param articleRequest 修改参数 +// */ +// @PreAuthorize("hasAuthority('admin:article:update')") +// @ApiOperation(value = "修改") +// @RequestMapping(value = "/update", method = RequestMethod.POST) +// @ApiImplicitParam(name="id", value="文章ID") +// public CommonResult update(@RequestParam Integer id, @RequestBody @Validated ArticleRequest articleRequest) { +// if (articleService.updateArticle(id, articleRequest)) { +// return CommonResult.success(); +// } else { +// return CommonResult.failed(); +// } +// } +// +// /** +// * 查询文章管理表信息 +// * @param id Integer +// */ +// @PreAuthorize("hasAuthority('admin:article:info')") +// @ApiOperation(value = "详情") +// @RequestMapping(value = "/info", method = RequestMethod.GET) +// @ApiImplicitParam(name="id", value="文章ID") +// public CommonResult
info(@RequestParam(value = "id") Integer id) { +// return CommonResult.success(articleService.getDetail(id)); +// } +//} +// +// +// diff --git a/food-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java b/food-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java index 665d8ac..63a454a 100644 --- a/food-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java +++ b/food-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java @@ -134,7 +134,7 @@ public class CategoryController { @ApiOperation(value = "获取tree结构的列表") @RequestMapping(value = "/list/tree", method = RequestMethod.GET) @ApiImplicitParams({ - @ApiImplicitParam(name="type", value="类型ID | 类型，1 产品分类，2 附件分类，3 文章分类， 4 设置分类， 5 菜单分类， 6 配置分类， 7 秒杀配置", example = "1"), + @ApiImplicitParam(name="type", value="类型ID | 类型，1 产品分类，2 附件分类，3 文章分类， 4 设置分类， 5 菜单分类， 6 配置分类， 7 秒杀配置， 8 套餐分类", example = "1"), @ApiImplicitParam(name="status", value="-1=全部，0=未生效，1=已生效", example = "1"), @ApiImplicitParam(name="name", value="模糊搜索", example = "电视") }) diff --git a/food-admin/src/main/java/com/zbkj/admin/controller/PlaceRegisterController.java b/food-admin/src/main/java/com/zbkj/admin/controller/PlaceRegisterController.java deleted file mode 100644 index bc9fa6f..0000000 --- a/food-admin/src/main/java/com/zbkj/admin/controller/PlaceRegisterController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.zbkj.admin.controller; - -import com.zbkj.common.model.place.PlaceRegister; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.*; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.vo.PlaceRegisterVo; -import com.zbkj.service.service.PlaceRegisterService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - - -@Slf4j -@RestController -@RequestMapping("api/admin/place") -@Api(tags = "场地预约") -public class PlaceRegisterController { - - @Autowired - private PlaceRegisterService placeRegisterService; - - @PreAuthorize("hasAuthority('admin:place:list')") - @ApiOperation(value = "分页列表") - @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated PlaceRegisterSearchRequest request, - @Validated PageParamRequest pageParamRequest) { - return CommonResult.success(CommonPage.restPage(placeRegisterService.getAdminList(request, pageParamRequest))); - } - - /** - * 删除 - * @param id Integer - */ - @PreAuthorize("hasAuthority('admin:activity:delete')") - @ApiOperation(value = "删除参与记录") - @RequestMapping(value = "/records/delete", method = RequestMethod.GET) - @ApiImplicitParam(name="id", value="记录ID") - public CommonResult recordsDelete(@RequestParam(value = "id") Integer id) { - if (placeRegisterService.recordsDelete(id)) { - return CommonResult.success(); - } else { - return CommonResult.failed(); - } - } - - /** - * 修改 - * @param id integer id - * @param request 修改参数 - */ - @PreAuthorize("hasAuthority('admin:place:update')") - @ApiOperation(value = "修改") - @RequestMapping(value = "/update", method = RequestMethod.POST) - @ApiImplicitParam(name="id", value="预约ID") - public CommonResult updateRegister(@RequestParam Integer id, @RequestBody @Validated PlaceRegisterRequest request) { - if (placeRegisterService.updateRegister(id, request)) { - return CommonResult.success(); - } else { - return CommonResult.failed(); - } - } - - /** - * 查询 - * @param id Integer - */ - @PreAuthorize("hasAuthority('admin:place:info')") - @ApiOperation(value = "详情") - @RequestMapping(value = "/info", method = RequestMethod.GET) - @ApiImplicitParam(name="id", value="预约ID") - public CommonResult info(@RequestParam(value = "id") Integer id) { - return CommonResult.success(placeRegisterService.getDetail(id)); - } -} - - - diff --git a/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java b/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java index 1640987..9d5e762 100644 --- a/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java +++ b/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java @@ -17,15 +17,6 @@ import java.util.List; /** * 物流控制器 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- */ @Slf4j @RestController diff --git a/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java b/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java index 46a1dc7..8f7e7f6 100644 --- a/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java +++ b/food-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java @@ -17,15 +17,6 @@ import java.util.List; /** * 物流付费前端控制器 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- */ @Slf4j @RestController diff --git a/food-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java b/food-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java index 2fd9526..90d9866 100644 --- a/food-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java +++ b/food-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java @@ -37,7 +37,7 @@ public class WechatMediaController { @RequestMapping(value = "/upload", method = RequestMethod.POST) public CommonResult> upload( @RequestParam("media") @ApiParam(name = "media", value = "待上传素材图片文件", required = true) MultipartFile file, - @RequestParam("type") @ApiParam(name = "type", value = "媒体文件类型，分别有图片（image）、语音（voice", required = true, allowableValues = "range[image,voice]") String type + @RequestParam("type") @ApiParam(name = "type", value = "媒体文件类型，分别有图片（image）、语音（voice）", required = true, allowableValues = "range[image,voice]") String type ) { return CommonResult.success(wechatMediaService.upload(file, type)); } diff --git a/food-admin/src/main/resources/application.yml b/food-admin/src/main/resources/application.yml index 12b11ee..b8f8eab 100644 --- a/food-admin/src/main/resources/application.yml +++ b/food-admin/src/main/resources/application.yml @@ -29,7 +29,7 @@ spring: max-file-size: 50MB #设置单个文件大小 max-request-size: 50MB #设置单次请求文件的总大小 application: - name: cemrb-admin #这个很重要，这在以后的服务与服务之间相互调用一般都是根据这个name + name: food-admin #这个很重要，这在以后的服务与服务之间相互调用一般都是根据这个name jackson: locale: zh_CN time-zone: GMT+8 diff --git a/food-common/src/main/java/com/zbkj/common/config/CrmebConfig.java b/food-common/src/main/java/com/zbkj/common/config/CrmebConfig.java index 06fa265..e52cc04 100644 --- a/food-common/src/main/java/com/zbkj/common/config/CrmebConfig.java +++ b/food-common/src/main/java/com/zbkj/common/config/CrmebConfig.java @@ -1,6 +1,5 @@ package com.zbkj.common.config; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/food-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java b/food-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java index 6e22c7f..6c3dcf1 100644 --- a/food-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java +++ b/food-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java @@ -66,6 +66,11 @@ public class SysConfigConstants { /** 下单支付金额按比例赠送积分（实际支付1元赠送多少积分) */ public static final String CONFIG_KEY_INTEGRAL_RATE_ORDER_GIVE = "order_give_integral"; + /** 订单自动完成天数-配送 */ + public static final String DELIVERY_AUTO_COMPLETE_NUM = "delivery_auto_complete_num"; + /** 订单自动完成天数-快递 */ + public static final String EXPRESS_AUTO_COMPLETE_NUM = "express_auto_complete_num"; + /** 微信支付开关 */ public static final String CONFIG_PAY_WEIXIN_OPEN = "pay_weixin_open"; /** 余额支付状态 */ diff --git a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrder.java b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrder.java index e4afe59..612149d 100644 --- a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrder.java +++ b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrder.java @@ -84,6 +84,9 @@ public class StoreOrder implements Serializable { @ApiModelProperty(value = "创建时间") private Date createTime; + @ApiModelProperty(value = "签收时间") + private Date signForTime; + @ApiModelProperty(value = "订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）") private Integer status; @@ -117,6 +120,9 @@ public class StoreOrder implements Serializable { @ApiModelProperty(value = "快递单号/手机号") private String deliveryId; + @ApiModelProperty(value = "预约配送时间") + private String deliveryTime; + @ApiModelProperty(value = "消费赚取积分") private Integer gainIntegral; diff --git a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderInfo.java b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderInfo.java index 64dd1da..16845c8 100644 --- a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderInfo.java +++ b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderInfo.java @@ -88,6 +88,4 @@ public class StoreOrderInfo implements Serializable { @ApiModelProperty(value = "商品类型:0-普通，1-秒杀，2-砍价，3-拼团，4-视频号") private Integer productType; - @ApiModelProperty(value = "预约送达时间") - private String deliveryTime; } diff --git a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java index f5235f1..857bf5a 100644 --- a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java +++ b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java @@ -22,6 +22,10 @@ public class StoreOrderReturn implements Serializable { */ @TableId(value = "id", type = IdType.AUTO) private Integer id; + /** + * 用户id + */ + private Integer uid; /** * 订单id */ diff --git a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturnInfo.java b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturnInfo.java index 7a13abc..e9a4391 100644 --- a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturnInfo.java +++ b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturnInfo.java @@ -1,11 +1,15 @@ package com.zbkj.common.model.order; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.data.annotation.Transient; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -21,30 +25,47 @@ public class StoreOrderReturnInfo implements Serializable { /** * 退款表id */ + @ApiModelProperty(value = "退款表id") private Integer returnId; /** * 订单id */ + @ApiModelProperty(value = "订单id") private Integer orderId; /** * 商品id */ + @ApiModelProperty(value = "商品ID") private Integer productId; /** * 规格属性值id */ + @ApiModelProperty(value = "规格属性值id") private Integer attrValueId; /** * 商品数量 */ + @ApiModelProperty(value = "售后数量") private Integer returnNum; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; + @Transient + @TableField(exist = false) + @ApiModelProperty(value = "商品图片") + private String image; + + @Transient + @TableField(exist = false) + @ApiModelProperty(value = "商品名称") + private String storeName; + } diff --git a/food-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java b/food-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java index 588e215..2badbc7 100644 --- a/food-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java +++ b/food-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java @@ -31,9 +31,6 @@ public class PreOrderDetailRequest { @ApiModelProperty(value = "订单编号（再次购买必填）") private String orderNo; - @ApiModelProperty(value = "果实兑换商品id") - private Integer fruitExchangeId = 0; - @ApiModelProperty(value = "砍价商品id") private Integer bargainId = 0; diff --git a/food-common/src/main/java/com/zbkj/common/response/ApplyRecordsResponse.java b/food-common/src/main/java/com/zbkj/common/response/ApplyRecordsResponse.java new file mode 100644 index 0000000..3aedceb --- /dev/null +++ b/food-common/src/main/java/com/zbkj/common/response/ApplyRecordsResponse.java @@ -0,0 +1,59 @@ +package com.zbkj.common.response; + +import com.zbkj.common.model.order.StoreOrderReturnInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="ApplyRecordsResponse对象", description="ApplyRecordsResponse对象") +public class ApplyRecordsResponse implements Serializable { + + private static final long serialVersionUID = 1387727608277207652L; + + @ApiModelProperty(value = "申请id") + private Integer id; + + @ApiModelProperty(value = "申请编号") + private String code; + + @ApiModelProperty(value = "订单号") + private Integer orderId; + + @ApiModelProperty(value = "状态：1退款审核中 2审核通过 3审核拒绝 4退款失败") + private Integer returnState; + + @ApiModelProperty(value = "售后数量") + private Integer returnNum; + + @ApiModelProperty(value = "退款金额") + private BigDecimal returnAmount; + + @ApiModelProperty(value = "申请时间") + private Date createTime; + + @ApiModelProperty(value = "退款审核时间") + private Date returnVerifyDate; + + @ApiModelProperty(value = "退款原因") + private String returnReason; + + @ApiModelProperty(value = "退款图片") + private String returnImage; + + @ApiModelProperty(value = "申请退款失败原因") + private String refundVerifyFailReason; + + @ApiModelProperty(value = "售后详情对象列表") + private List returnInfoList; + +} diff --git a/food-common/src/main/java/com/zbkj/common/response/CanApplyOrderResponse.java b/food-common/src/main/java/com/zbkj/common/response/CanApplyOrderResponse.java new file mode 100644 index 0000000..ade4e2b --- /dev/null +++ b/food-common/src/main/java/com/zbkj/common/response/CanApplyOrderResponse.java @@ -0,0 +1,37 @@ +package com.zbkj.common.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="CanApplyOrderResponse对象", description="CanApplyOrderResponse对象") +public class CanApplyOrderResponse implements Serializable { + + private static final long serialVersionUID = 1387727608277207652L; + + @ApiModelProperty(value = "订单id") + private Integer id; + + @ApiModelProperty(value = "订单编号") + private String orderId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "支付金额") + private BigDecimal payPrice; + + @ApiModelProperty(value = "订单详情对象列表") + private List orderInfoList; + +} diff --git a/food-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.java b/food-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.java index f5ec0d3..a710389 100644 --- a/food-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.java +++ b/food-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.java @@ -79,9 +79,6 @@ public class OrderInfoVo { @ApiModelProperty(value = "用户砍价活动id") private Integer bargainUserId; - @ApiModelProperty(value = "果实兑换商品id") - private Integer fruitExchangeId = 0; - @ApiModelProperty(value = "拼团商品Id") private Integer combinationId = 0; diff --git a/food-front/src/main/java/com/zbkj/front/controller/ProductController.java b/food-front/src/main/java/com/zbkj/front/controller/ProductController.java index 8d28cc2..406dd44 100644 --- a/food-front/src/main/java/com/zbkj/front/controller/ProductController.java +++ b/food-front/src/main/java/com/zbkj/front/controller/ProductController.java @@ -87,15 +87,14 @@ public class ProductController { return CommonResult.success(productService.getSkuDetail(id)); } - /** - * 商品列表 - */ - @ApiOperation(value = "商品列表(个别分类模型使用)") - @RequestMapping(value = "/product/list", method = RequestMethod.GET) - public CommonResult> getProductList(@Validated ProductListRequest request, @Validated PageParamRequest pageParamRequest) { - return CommonResult.success(productService.getCategoryProductList(request, pageParamRequest)); - } - +// /** +// * 商品列表 +// */ +// @ApiOperation(value = "商品列表(个别分类模型使用)") +// @RequestMapping(value = "/product/list", method = RequestMethod.GET) +// public CommonResult> getProductList(@Validated ProductListRequest request, @Validated PageParamRequest pageParamRequest) { +// return CommonResult.success(productService.getCategoryProductList(request, pageParamRequest)); +// } /** * 商品详情评论 diff --git a/food-front/src/main/java/com/zbkj/front/controller/QrCodeController.java b/food-front/src/main/java/com/zbkj/front/controller/QrCodeController.java index 1c3a13b..aa95ce8 100644 --- a/food-front/src/main/java/com/zbkj/front/controller/QrCodeController.java +++ b/food-front/src/main/java/com/zbkj/front/controller/QrCodeController.java @@ -1,69 +1,69 @@ -package com.zbkj.front.controller; - -import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.front.service.QrCodeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 验证码 - - */ - -@Slf4j -@RestController -@RequestMapping("api/front/qrcode") -@Api(tags = "二维码服务") -public class QrCodeController { - - @Autowired - private QrCodeService qrCodeService; - - /** - * 获取二维码 - * @return CommonResult - */ - @ApiOperation(value="获取二维码") - @RequestMapping(value = "/get", method = RequestMethod.POST) - public CommonResult> get(@RequestBody JSONObject data) { - return CommonResult.success(qrCodeService.get(data)); - } - - /** - * 远程图片转base64 - * @return CommonResult - */ - @ApiOperation(value="远程图片转base64") - @RequestMapping(value = "/base64", method = RequestMethod.POST) - public CommonResult> get(@RequestParam String url) { - return CommonResult.success(qrCodeService.base64(url)); - } - - /** - * 将字符串 转base64 - * @return CommonResult - */ - @ApiOperation(value="将字符串 转base64") - @RequestMapping(value = "/str2base64", method = RequestMethod.POST) - public CommonResult> getQrcodeByString( - @RequestParam String text, - @RequestParam int width, - @RequestParam int height) { - if((width < 50 || height < 50) && (width > 500 || height > 500) && text.length() >= 999){ - throw new CrmebException(Constants.RESULT_QRCODE_PRAMERROR); - } - return CommonResult.success(qrCodeService.base64String(text, width,height)); - } -} - - - +//package com.zbkj.front.controller; +// +//import com.alibaba.fastjson.JSONObject; +//import com.zbkj.common.response.CommonResult; +//import com.zbkj.common.constants.Constants; +//import com.zbkj.common.exception.CrmebException; +//import com.zbkj.front.service.QrCodeService; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.*; +// +//import java.util.Map; +// +// +///** +// * 验证码 +// +// */ +// +//@Slf4j +//@RestController +//@RequestMapping("api/front/qrcode") +//@Api(tags = "二维码服务") +//public class QrCodeController { +// +// @Autowired +// private QrCodeService qrCodeService; +// +// /** +// * 获取二维码 +// * @return CommonResult +// */ +// @ApiOperation(value="获取二维码") +// @RequestMapping(value = "/get", method = RequestMethod.POST) +// public CommonResult> get(@RequestBody JSONObject data) { +// return CommonResult.success(qrCodeService.get(data)); +// } +// +// /** +// * 远程图片转base64 +// * @return CommonResult +// */ +// @ApiOperation(value="远程图片转base64") +// @RequestMapping(value = "/base64", method = RequestMethod.POST) +// public CommonResult> get(@RequestParam String url) { +// return CommonResult.success(qrCodeService.base64(url)); +// } +// +// /** +// * 将字符串 转base64 +// * @return CommonResult +// */ +// @ApiOperation(value="将字符串 转base64") +// @RequestMapping(value = "/str2base64", method = RequestMethod.POST) +// public CommonResult> getQrcodeByString( +// @RequestParam String text, +// @RequestParam int width, +// @RequestParam int height) { +// if((width < 50 || height < 50) && (width > 500 || height > 500) && text.length() >= 999){ +// throw new CrmebException(Constants.RESULT_QRCODE_PRAMERROR); +// } +// return CommonResult.success(qrCodeService.base64String(text, width,height)); +// } +//} +// +// +// diff --git a/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java b/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java index 15dc6be..4048497 100644 --- a/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java +++ b/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java @@ -101,7 +101,7 @@ public class StoreOrderController { @ApiOperation(value = "订单列表") @RequestMapping(value = "/list", method = RequestMethod.GET) @ApiImplicitParams ({ - @ApiImplicitParam(name = "type", value = "评价等级|null=全部,0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,5=备货中,-3=售后/退款"), + @ApiImplicitParam(name = "type", value = "类型|null=全部,0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,5=备货中,-3=售后/退款"), }) public CommonResult> orderList(@RequestParam(name = "type") Integer type, @ModelAttribute PageParamRequest pageRequest) { return CommonResult.success(orderService.list(type, pageRequest)); diff --git a/food-front/src/main/java/com/zbkj/front/controller/StoreOrderReturnController.java b/food-front/src/main/java/com/zbkj/front/controller/StoreOrderReturnController.java index 9bdeb67..830f5d4 100644 --- a/food-front/src/main/java/com/zbkj/front/controller/StoreOrderReturnController.java +++ b/food-front/src/main/java/com/zbkj/front/controller/StoreOrderReturnController.java @@ -1,8 +1,10 @@ package com.zbkj.front.controller; +import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; import com.zbkj.service.service.OrderService; +import com.zbkj.service.service.StoreOrderReturnService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -16,15 +18,15 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "售后") public class StoreOrderReturnController { - @Autowired - private OrderService orderService; + @Autowired private OrderService orderService; + @Autowired private StoreOrderReturnService storeOrderReturnService; /** * 获取申请订单退款信息 * @param orderId 订单编号 */ @ApiOperation(value = "获取申请订单退款信息") - @RequestMapping(value = "/refund/{orderId}", method = RequestMethod.GET) + @RequestMapping(value = "/getOrder/{orderId}", method = RequestMethod.GET) public CommonResult refundApplyOrder(@PathVariable String orderId) { return CommonResult.success(orderService.applyRefundOrderInfo(orderId)); } @@ -33,7 +35,7 @@ public class StoreOrderReturnController { * 根据参数计算订单价格 */ @ApiOperation(value = "获取退款计算") - @RequestMapping(value = "/refund/computedPrice", method = RequestMethod.POST) + @RequestMapping(value = "/computedPrice", method = RequestMethod.POST) public CommonResult refundComputedPrice(@Validated @RequestBody RefundComputedRequest request) { return CommonResult.success(orderService.refundComputedPrice(request)); } @@ -44,12 +46,45 @@ public class StoreOrderReturnController { * @param request OrderRefundApplyRequest 订单id */ @ApiOperation(value = "订单退款申请") - @RequestMapping(value = "/refund", method = RequestMethod.POST) - public CommonResult refundApply(@RequestBody @Validated OrderRefundApplyRequest request) { + @RequestMapping(value = "/returnApply", method = RequestMethod.POST) + public CommonResult returnApply(@RequestBody @Validated OrderRefundApplyRequest request) { if(orderService.refundApply(request)) { return CommonResult.success(); }else{ return CommonResult.failed(); } } + + /** + * 退款/售后-售后申请列表 + * @param pageRequest 分页 + * @return 订单列表 + */ + @ApiOperation(value = "退款/售后-售后申请列表") + @RequestMapping(value = "/canApplyOrderList", method = RequestMethod.GET) + public CommonResult> canApplyOrderList(@ModelAttribute PageParamRequest pageRequest) { + return CommonResult.success(orderService.canApplyOrderList(pageRequest)); + } + + /** + * 退款/售后-售后记录 + * @param pageRequest 分页 + * @return 订单列表 + */ + @ApiOperation(value = "退款/售后-售后记录") + @RequestMapping(value = "/applyRecordsList", method = RequestMethod.GET) + public CommonResult> applyRecordsList(@ModelAttribute PageParamRequest pageRequest) { + return CommonResult.success(storeOrderReturnService.applyRecordsList(pageRequest)); + } + + /** + * 售后记录详情 + * @param id + * @return + */ + @ApiOperation(value = "售后记录详情") + @RequestMapping(value = "/getApplyRecord/{id}", method = RequestMethod.GET) + public CommonResult getApplyRecord(@PathVariable String id) { + return CommonResult.success(storeOrderReturnService.getApplyRecord(id)); + } } diff --git a/food-front/src/main/java/com/zbkj/front/controller/UserController.java b/food-front/src/main/java/com/zbkj/front/controller/UserController.java index 5f76050..83f3388 100644 --- a/food-front/src/main/java/com/zbkj/front/controller/UserController.java +++ b/food-front/src/main/java/com/zbkj/front/controller/UserController.java @@ -92,14 +92,14 @@ public class UserController { // return CommonResult.success(userService.updatePhone(request)); // } - /** - * 用户中心菜单 - */ - @ApiOperation(value = "获取个人中心菜单") - @RequestMapping(value = "/menu/user", method = RequestMethod.GET) - public CommonResult> getMenuUser() { - return CommonResult.success(systemGroupDataService.getMenuUser()); - } +// /** +// * 用户中心菜单 +// */ +// @ApiOperation(value = "获取个人中心菜单") +// @RequestMapping(value = "/menu/user", method = RequestMethod.GET) +// public CommonResult> getMenuUser() { +// return CommonResult.success(systemGroupDataService.getMenuUser()); +// } // /** // * 推广数据接口(昨天的佣金 累计提现金额 当前佣金) diff --git a/food-front/src/main/resources/application.yml b/food-front/src/main/resources/application.yml index ded5011..93392d0 100644 --- a/food-front/src/main/resources/application.yml +++ b/food-front/src/main/resources/application.yml @@ -23,7 +23,7 @@ spring: resources: static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${crmeb.filePath} application: - name: front-front #这个很重要，这在以后的服务与服务之间相互调用一般都是根据这个name + name: food-front #这个很重要，这在以后的服务与服务之间相互调用一般都是根据这个name jackson: locale: zh_CN time-zone: GMT+8 diff --git a/food-front/src/main/test/java/com/zbkj/front/user/ActivityTest.java b/food-front/src/main/test/java/com/zbkj/front/user/ActivityTest.java deleted file mode 100644 index fbeddee..0000000 --- a/food-front/src/main/test/java/com/zbkj/front/user/ActivityTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.zbkj.front.user; - -import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageInfo; -import com.zbkj.common.model.game.Game; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.request.RegisterThirdUserRequest; -import com.zbkj.common.response.*; -import com.zbkj.common.vo.SystemCityTreeVo; -import com.zbkj.front.service.UserCenterService; -import com.zbkj.service.service.*; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.List; - -@SpringBootTest -@RunWith(SpringRunner.class) -public class ActivityTest { - - @Autowired private ActivityService activityService; - @Autowired private ActivityRegisterService activityRegisterService; - @Autowired private UserCenterService userCenterService; - @Autowired private TeaPlantService teaPlantService; - @Autowired private SystemCityService systemCityService; - - @Test - public void getListTree(){ - List listTree = systemCityService.getListTree(); - System.out.println(JSON.toJSONString(listTree)); - } - - @Test - public void nowMoneyBillRecord(){ - String type = "all"; - PageParamRequest page = new PageParamRequest(); - page.setPage(1); - page.setLimit(99999999); - CommonPage list = userCenterService.nowMoneyBillRecord(type, page); - System.out.println(JSON.toJSONString(list)); - } - - @Test - public void myRegisterList(){ - String cid = "746"; - PageParamRequest page = new PageParamRequest(); - page.setPage(1); - page.setLimit(10); - PageInfo list= activityRegisterService.myRegisterList(cid, page); - System.out.println(JSON.toJSONString(list)); - } - - @Test - public void getList(){ - PageParamRequest page = new PageParamRequest(); - page.setPage(1); - page.setLimit(10); - PageInfo list = teaPlantService.getList(page); - System.out.println(JSON.toJSONString(list)); - } - - @Test - public void weChatAuthorizeProgramLogin(){ - String code = "123456789"; - RegisterThirdUserRequest request = new RegisterThirdUserRequest(); - request.setOpenId("123456789"); - request.setProvince(""); - request.setCity(""); - request.setCountry(""); - userCenterService.weChatAuthorizeProgramLogin(code, request); - } - - @Test - public void list(){ - PageParamRequest page = new PageParamRequest(); - page.setPage(1); - page.setLimit(10); - PageInfo list = activityService.getList("753", page); - System.out.println(JSON.toJSONString(list)); - } -} \ No newline at end of file diff --git a/food-front/src/main/test/java/com/zbkj/front/user/GameTest.java b/food-front/src/main/test/java/com/zbkj/front/user/GameTest.java deleted file mode 100644 index 7063b55..0000000 --- a/food-front/src/main/test/java/com/zbkj/front/user/GameTest.java +++ /dev/null @@ -1,113 +0,0 @@ -//package com.zbkj.front.user; -// -//import com.alibaba.fastjson.JSON; -//import com.github.pagehelper.PageInfo; -//import com.zbkj.common.constants.Constants; -//import com.zbkj.common.model.game.Game; -//import com.zbkj.common.request.*; -//import com.zbkj.common.response.*; -//import com.zbkj.common.utils.DateUtil; -//import com.zbkj.front.service.ProductService; -//import com.zbkj.service.service.GameService; -//import com.zbkj.service.service.GameTreeProductService; -//import com.zbkj.service.service.SystemGroupDataService; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//import java.util.HashMap; -//import java.util.List; -// -//@SpringBootTest -//@RunWith(SpringRunner.class) -//public class GameTest { -// -// @Autowired private GameService gameService; -// @Autowired private GameTreeProductService gameTreeProductService; -// -// @Test -// public void fruitExchange(){ -// UserExchangeRequest request = new UserExchangeRequest(); -// request.setTreeProductId("2"); -// request.setStoreId("1"); -// request.setNumber("1"); -// request.setPhone("16621399662"); -// request.setRealName("唐"); -// Boolean b = gameTreeProductService.fruitExchange(request); -// System.out.println(b); -// } -// -// @Test -// public void gameTreeProductService(){ -// PageParamRequest page = new PageParamRequest(); -// page.setLimit(10); -// page.setPage(1); -// GameTreeProductListRequest request = new GameTreeProductListRequest(); -// PageInfo res = gameTreeProductService.getList(request, page); -// System.out.println(JSON.toJSONString(res)); -// } -// -// @Test -// public void getUserFarm(){ -// UserTreeFarmRequest request = new UserTreeFarmRequest(); -// request.setGameId("3"); -// UserTreeFarmResponse userFarm = gameService.getUserFarm(request); -// System.out.println(JSON.toJSONString(userFarm)); -// } -// -// @Test -// public void info(){ -// GameResponse res = gameService.getVoByFront("2"); -// System.out.println(JSON.toJSONString(res)); -// } -// -// @Test -// public void getUserWater(){ -// UserWaterRequest req = new UserWaterRequest(); -// req.setUserItemId("1"); -// UserWaterResponse userWater = gameService.getUserWater(req); -// System.out.println(JSON.toJSONString(userWater)); -// } -// -// @Test -// public void getGameItem(){ -// Object gameItem = gameService.getGameItem("3", "9"); -// System.out.println(JSON.toJSONString(gameItem)); -// } -// -// @Test -// public void getPrizeDraw(){ -// GameResponse data = gameService.getVoByFront("2"); -// System.out.println(JSON.toJSONString(data)); -// } -// -// @Test -// public void getTree(){ -// GameResponse data = gameService.getVoByFront("3"); -// System.out.println(JSON.toJSONString(data)); -// } -// -// @Test -// public void getGameItemList(){ -// PageParamRequest page = new PageParamRequest(); -// page.setLimit(10); -// page.setPage(1); -// PageInfo list = gameService.getGameItemList("2", page); -// System.out.println(JSON.toJSONString(list)); -// } -// -// @Test -// public void detail(){ -// Game detail = gameService.getDetail(2); -// System.out.println(JSON.toJSONString(detail)); -// } -// -// @Test -// public void prizeDraw(){ -// PrizeDrawResponse res = gameService.prizeDraw("2"); -// System.out.println(JSON.toJSONString(res)); -// } -// -//} \ No newline at end of file diff --git a/food-front/src/main/test/java/com/zbkj/front/user/GroupDataTest.java b/food-front/src/main/test/java/com/zbkj/front/user/GroupDataTest.java deleted file mode 100644 index 37147d9..0000000 --- a/food-front/src/main/test/java/com/zbkj/front/user/GroupDataTest.java +++ /dev/null @@ -1,29 +0,0 @@ -//package com.zbkj.front.user; -// -//import com.alibaba.fastjson.JSON; -//import com.zbkj.common.vo.CategoryTreeVo; -//import com.zbkj.front.service.ProductService; -//import com.zbkj.service.service.SystemGroupDataService; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//import java.util.HashMap; -//import java.util.List; -// -//@SpringBootTest -//@RunWith(SpringRunner.class) -//public class GroupDataTest { -// -// @Autowired private SystemGroupDataService systemGroupDataService; -// @Autowired private ProductService productService; -// -// @Test -// public void getMenuUser(){ -// List> data = systemGroupDataService.getListMapByGid(37); -// System.out.println(JSON.toJSONString(data)); -// } -// -//} \ No newline at end of file diff --git a/food-front/src/main/test/java/com/zbkj/front/user/IdexTest.java b/food-front/src/main/test/java/com/zbkj/front/user/IdexTest.java deleted file mode 100644 index 3e7fc5a..0000000 --- a/food-front/src/main/test/java/com/zbkj/front/user/IdexTest.java +++ /dev/null @@ -1,29 +0,0 @@ -//package com.zbkj.front.user; -// -//import com.alibaba.fastjson.JSON; -//import com.zbkj.common.response.IndexInfoResponse; -//import com.zbkj.common.vo.CategoryTreeVo; -//import com.zbkj.front.service.IndexService; -//import com.zbkj.front.service.ProductService; -//import com.zbkj.service.service.SystemGroupDataService; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//import java.util.List; -// -//@SpringBootTest -//@RunWith(SpringRunner.class) -//public class IdexTest { -// -// @Autowired private IndexService indexService; -// -// @Test -// public void getMenuUser(){ -// IndexInfoResponse res = indexService.getIndexInfo(); -// System.out.println(JSON.toJSONString(res)); -// } -// -//} \ No newline at end of file diff --git a/food-front/src/main/test/java/com/zbkj/front/user/ProductTest.java b/food-front/src/main/test/java/com/zbkj/front/user/ProductTest.java deleted file mode 100644 index 4c3b99e..0000000 --- a/food-front/src/main/test/java/com/zbkj/front/user/ProductTest.java +++ /dev/null @@ -1,29 +0,0 @@ -//package com.zbkj.front.user; -// -//import com.alibaba.fastjson.JSON; -//import com.zbkj.common.vo.CategoryTreeVo; -//import com.zbkj.front.service.ProductService; -//import com.zbkj.service.service.SystemGroupDataService; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//import java.util.HashMap; -//import java.util.List; -// -//@SpringBootTest -//@RunWith(SpringRunner.class) -//public class ProductTest { -// -// @Autowired private SystemGroupDataService systemGroupDataService; -// @Autowired private ProductService productService; -// -// @Test -// public void getMenuUser(){ -// List res = productService.getCategory(); -// System.out.println(JSON.toJSONString(res)); -// } -// -//} \ No newline at end of file diff --git a/food-front/src/main/test/java/com/zbkj/front/user/UserTest.java b/food-front/src/main/test/java/com/zbkj/front/user/UserTest.java deleted file mode 100644 index f434997..0000000 --- a/food-front/src/main/test/java/com/zbkj/front/user/UserTest.java +++ /dev/null @@ -1,25 +0,0 @@ -//package com.zbkj.front.user; -// -//import com.alibaba.fastjson.JSON; -//import com.zbkj.service.service.SystemGroupDataService; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//import java.util.HashMap; -// -//@SpringBootTest -//@RunWith(SpringRunner.class) -//public class UserTest { -// -// @Autowired private SystemGroupDataService systemGroupDataService; -// -// @Test -// public void getMenuUser(){ -// HashMap menuUser = systemGroupDataService.getMenuUser(); -// System.out.println(JSON.toJSONString(menuUser)); -// } -// -//} \ No newline at end of file diff --git a/food-service/src/main/java/com/zbkj/service/dao/PlaceRegisterDao.java b/food-service/src/main/java/com/zbkj/service/dao/PlaceRegisterDao.java deleted file mode 100644 index 8bae819..0000000 --- a/food-service/src/main/java/com/zbkj/service/dao/PlaceRegisterDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zbkj.service.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zbkj.common.model.place.PlaceRegister; -import com.zbkj.common.response.PlaceRegisterResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface PlaceRegisterDao extends BaseMapper { - - List myRegisterList(@Param("userId") Integer uid); - -} diff --git a/food-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java b/food-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java index 58be006..354c6d9 100644 --- a/food-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java +++ b/food-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java @@ -4,10 +4,7 @@ import com.zbkj.common.model.order.StoreOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zbkj.common.request.StoreDateRangeSqlPram; import com.zbkj.common.request.StoreOrderStaticsticsRequest; -import com.zbkj.common.response.OrderBrokerageData; -import com.zbkj.common.response.OrderReplyListResponse; -import com.zbkj.common.response.StoreOrderStatisticsChartItemResponse; -import com.zbkj.common.response.StoreStaffDetail; +import com.zbkj.common.response.*; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; @@ -69,4 +66,12 @@ public interface StoreOrderDao extends BaseMapper { * @return */ List selectOrderReplyList(@Param("uid") Integer uid, @Param("type") Integer type); + + /** + * 可售后的订单列表 + * @param userId + * @return + */ + List canApplyOrderList(Integer userId); + } diff --git a/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnDao.java b/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnDao.java index fd43b92..da7e559 100644 --- a/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnDao.java +++ b/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnDao.java @@ -2,7 +2,13 @@ package com.zbkj.service.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zbkj.common.model.order.StoreOrderReturn; +import com.zbkj.common.response.ApplyRecordsResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface StoreOrderReturnDao extends BaseMapper { + List applyRecordsList(@Param("uid") Integer userId, @Param("returnId") Integer returnId); + } diff --git a/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnInfoDao.java b/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnInfoDao.java index b54c257..74d348f 100644 --- a/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnInfoDao.java +++ b/food-service/src/main/java/com/zbkj/service/dao/StoreOrderReturnInfoDao.java @@ -4,6 +4,10 @@ package com.zbkj.service.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zbkj.common.model.order.StoreOrderReturnInfo; +import java.util.List; + public interface StoreOrderReturnInfoDao extends BaseMapper { + List selectByReturnId(Integer id); + } diff --git a/food-service/src/main/java/com/zbkj/service/service/OrderService.java b/food-service/src/main/java/com/zbkj/service/service/OrderService.java index 6b91d89..342e3e5 100644 --- a/food-service/src/main/java/com/zbkj/service/service/OrderService.java +++ b/food-service/src/main/java/com/zbkj/service/service/OrderService.java @@ -155,4 +155,11 @@ public interface OrderService { */ RefundComputedResponse refundComputedPrice(RefundComputedRequest request); + /** + * 可申请售后的订单列表 + * @param pageRequest + * @return + */ + CommonPage canApplyOrderList(PageParamRequest pageRequest); + } diff --git a/food-service/src/main/java/com/zbkj/service/service/PlaceRegisterService.java b/food-service/src/main/java/com/zbkj/service/service/PlaceRegisterService.java deleted file mode 100644 index f854170..0000000 --- a/food-service/src/main/java/com/zbkj/service/service/PlaceRegisterService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zbkj.service.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; -import com.zbkj.common.model.place.PlaceRegister; -import com.zbkj.common.request.*; -import com.zbkj.common.response.PlaceRegisterResponse; -import com.zbkj.common.vo.PlaceRegisterVo; - -import java.util.List; - - -public interface PlaceRegisterService extends IService { - - Boolean subscribe(PlaceRegisterFrontRequest request); - - PageInfo getAdminList(PlaceRegisterSearchRequest request, PageParamRequest pageParamRequest); - - Boolean updateRegister(Integer id, PlaceRegisterRequest request); - - PlaceRegister getDetail(Integer id); - - PageInfo myRegisterList(PageParamRequest pageParamRequest); - - Boolean cancel(PlaceCancelRequest request); - - Boolean recordsDelete(Integer id); - -} - diff --git a/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnInfoService.java b/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnInfoService.java index 143dd24..f643b5b 100644 --- a/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnInfoService.java +++ b/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnInfoService.java @@ -4,7 +4,11 @@ package com.zbkj.service.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zbkj.common.model.order.StoreOrderReturnInfo; +import java.util.List; + public interface StoreOrderReturnInfoService extends IService { + List selectByReturnId(Integer id); + } diff --git a/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnService.java b/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnService.java index e42b9ad..0e872c1 100644 --- a/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnService.java +++ b/food-service/src/main/java/com/zbkj/service/service/StoreOrderReturnService.java @@ -2,6 +2,9 @@ package com.zbkj.service.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zbkj.common.model.order.StoreOrderReturn; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.ApplyRecordsResponse; public interface StoreOrderReturnService extends IService { @@ -11,5 +14,19 @@ public interface StoreOrderReturnService extends IService { void refundOk(Integer orderId); + /** + * 售后申请记录 + * @param pageRequest + * @return + */ + CommonPage applyRecordsList(PageParamRequest pageRequest); + + /** + * 售后详情 + * @param id + * @return + */ + ApplyRecordsResponse getApplyRecord(String id); + } diff --git a/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java b/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java index 118042a..66a69a9 100644 --- a/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java +++ b/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java @@ -378,4 +378,11 @@ public interface StoreOrderService extends IService { * @return */ List selectOrderReplyList(Integer userId, Integer type); + + /** + * 查询可申请售后的订单 + * @param userId + * @return + */ + List canApplyOrderList(Integer userId); } diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java index f47beca..3bc11eb 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java @@ -227,7 +227,7 @@ public class CategoryServiceImpl extends ServiceImpl impl */ @Override public List getListTree(Integer type, Integer status, String name) { - return getTree(type, status,name,null); + return getTree(type, status, name, null); } /** diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java index 32833ae..9d76ac0 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java @@ -235,13 +235,13 @@ public class OrderPayServiceImpl implements OrderPayService { } Boolean execute = transactionTemplate.execute(e -> { - //订单日志 + // 订单日志 storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_PAY_SUCCESS, Constants.ORDER_LOG_MESSAGE_PAY_SUCCESS); // 用户信息变更 userService.updateById(user); - //资金变动 + // 资金变动 userBillService.saveBatch(billList); // 积分记录 @@ -250,7 +250,7 @@ public class OrderPayServiceImpl implements OrderPayService { // 经验记录 userExperienceRecordService.save(experienceRecord); - //经验升级 + // 经验升级 userLevelService.upLevel(user); // // 佣金记录 @@ -292,7 +292,7 @@ public class OrderPayServiceImpl implements OrderPayService { } if (payNotification.getIsWechat().equals(1) || payNotification.getIsRoutine().equals(1)) { - //下发模板通知 + // 下发模板通知 pushMessageOrder(storeOrder, user, payNotification); } diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java index 5e9c83a..c3fbae8 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java @@ -255,6 +255,7 @@ public class OrderServiceImpl implements OrderService { } //已收货，待评价 storeOrder.setStatus(Constants.ORDER_STATUS_INT_BARGAIN); + storeOrder.setSignForTime(new Date()); boolean result = storeOrderService.updateById(storeOrder); if (result) { //后续操作放入redis @@ -317,6 +318,7 @@ public class OrderServiceImpl implements OrderService { existStoreOrder.setRefundPrice(new BigDecimal(refundComputedResponse.getReturnAmount())); StoreOrderReturn oReturn = new StoreOrderReturn(); + oReturn.setUid(existStoreOrder.getUid()); oReturn.setOrderId(existStoreOrder.getId()); oReturn.setContactPhone(request.getContactPhone()); oReturn.setReturnReason(existStoreOrder.getRefundReasonWap()); @@ -875,6 +877,31 @@ public class OrderServiceImpl implements OrderService { return res; } + @Override + public CommonPage canApplyOrderList(PageParamRequest page) { + Integer userId = userService.getUserIdException(); + PageHelper.startPage(page.getPage(), page.getLimit()); + List orderList = storeOrderService.canApplyOrderList(userId); + for (CanApplyOrderResponse storeOrder : orderList) { + // 订单详情对象列表 + List orderInfoList = storeOrderInfoService.getListByOrderNo(storeOrder.getOrderId()); + List infoResponseList = CollUtil.newArrayList(); + orderInfoList.forEach(e -> { + OrderInfoResponse orderInfoResponse = new OrderInfoResponse(); + orderInfoResponse.setStoreName(e.getProductName()); + orderInfoResponse.setImage(e.getImage()); + orderInfoResponse.setCartNum(e.getPayNum()); + orderInfoResponse.setPrice(ObjectUtil.isNotNull(e.getVipPrice()) ? e.getVipPrice() : e.getPrice()); + orderInfoResponse.setProductId(e.getProductId()); + orderInfoResponse.setCouponPrice(e.getCouponPrice()); + orderInfoResponse.setAttrId(e.getAttrValueId()); + infoResponseList.add(orderInfoResponse); + }); + storeOrder.setOrderInfoList(infoResponseList); + } + return CommonPage.restPage(orderList); + } + private ComputedOrderPriceResponse computedPrice(OrderComputedPriceRequest request, OrderInfoVo orderInfoVo, User user) { // 计算各种价格 ComputedOrderPriceResponse priceResponse = new ComputedOrderPriceResponse(); @@ -1270,7 +1297,6 @@ public class OrderServiceImpl implements OrderService { soInfo.setWeight(detailVo.getWeight()); soInfo.setVolume(detailVo.getVolume()); soInfo.setCouponPrice(detailVo.getCouponPrice()); - soInfo.setDeliveryTime(request.getDeliveryTime()); if (ObjectUtil.isNotNull(detailVo.getGiveIntegral()) && detailVo.getGiveIntegral() > 0) { soInfo.setGiveIntegral(detailVo.getGiveIntegral()); } else { @@ -1369,6 +1395,7 @@ public class OrderServiceImpl implements OrderService { storeOrder.setPaid(false); storeOrder.setCost(BigDecimal.ZERO); storeOrder.setType(0); + storeOrder.setDeliveryTime(request.getDeliveryTime()); if (orderInfoVo.getIsVideo()) { storeOrder.setType(1);// 视频号订单 } diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java index 09a35ce..58f0e63 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.SysConfigConstants; import com.zbkj.common.constants.TaskConstants; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.order.StoreOrder; @@ -59,6 +60,9 @@ public class OrderTaskServiceImpl implements OrderTaskService { @Autowired private OrderPayService orderPayService; + @Autowired + private SystemConfigService systemConfigService; + /** * 用户取消订单 * @author Mr.Zhang @@ -269,6 +273,8 @@ public class OrderTaskServiceImpl implements OrderTaskService { if (CollUtil.isEmpty(orderList)) { return ; } + String delivery_auto_complete_num = systemConfigService.getValueByKey(SysConfigConstants.DELIVERY_AUTO_COMPLETE_NUM); + // String express_auto_complete_num = systemConfigService.getValueByKey(SysConfigConstants.EXPRESS_AUTO_COMPLETE_NUM); logger.info("OrderTaskServiceImpl.autoComplete | size:0"); // 根据订单状态表判断订单是否可以自动完成 @@ -279,7 +285,8 @@ public class OrderTaskServiceImpl implements OrderTaskService { continue ; } // 判断是否到自动完成时间（收货时间向后偏移7天） - String comTime = DateUtil.addDay(orderStatus.getCreateTime(), 7, Constants.DATE_FORMAT); + // 快递是7天，配送是2天 + String comTime = DateUtil.addDay(orderStatus.getCreateTime(), Integer.parseInt(delivery_auto_complete_num), Constants.DATE_FORMAT); int compareDate = DateUtil.compareDate(comTime, DateUtil.nowDateTime(Constants.DATE_FORMAT), Constants.DATE_FORMAT); if (compareDate < 0) { continue ; @@ -328,6 +335,7 @@ public class OrderTaskServiceImpl implements OrderTaskService { reply.setAvatar(user.getAvatar()); reply.setSku(orderInfo.getInfo().getSku()); reply.setCreateTime(DateUtil.nowDateTime()); + reply.setIsPrivacy(1); // 是否匿名 0否，1是 replyList.add(reply); } order.setStatus(Constants.ORDER_STATUS_INT_COMPLETE); diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/PlaceRegisterServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/PlaceRegisterServiceImpl.java deleted file mode 100644 index 9c2b4f1..0000000 --- a/food-service/src/main/java/com/zbkj/service/service/impl/PlaceRegisterServiceImpl.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.zbkj.service.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.model.activity.ActivityRegister; -import com.zbkj.common.model.game.Game; -import com.zbkj.common.model.place.PlaceRegister; -import com.zbkj.common.model.user.User; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.*; -import com.zbkj.common.response.ActivityRegisterResponse; -import com.zbkj.common.response.PlaceRegisterResponse; -import com.zbkj.common.vo.PlaceRegisterVo; -import com.zbkj.service.dao.PlaceRegisterDao; -import com.zbkj.service.service.PlaceRegisterService; -import com.zbkj.service.service.UserService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import javax.annotation.Resource; -import java.util.Date; -import java.util.List; - -@Service -public class PlaceRegisterServiceImpl extends ServiceImpl implements PlaceRegisterService { - - @Resource private PlaceRegisterDao dao; - - @Autowired private UserService userService; - - @Override - public Boolean subscribe(PlaceRegisterFrontRequest request) { - Integer userId = userService.getUserIdException(); - LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); - lambdaQueryWrapper.select(PlaceRegister::getId); - lambdaQueryWrapper.eq(PlaceRegister::getUid, userId); - lambdaQueryWrapper.eq(PlaceRegister::getStatus, 0); - List list = dao.selectList(lambdaQueryWrapper); - if (list.size() > 0) { - throw new CrmebException("您目前存在正在审核的预约信息，请注意来电"); - } - PlaceRegister add = JSON.parseObject(JSON.toJSONString(request), PlaceRegister.class); - add.setUid(userId); - add.setStatus(0); - dao.insert(add); - return true; - } - - @Override - public PageInfo getAdminList(PlaceRegisterSearchRequest request, PageParamRequest pageParamRequest) { - Page page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); - LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); - if (!StringUtils.isBlank(request.getKeywords())) { - lambdaQueryWrapper.and(i -> i - .or().like(PlaceRegister::getUserName, request.getKeywords()) - .or().like(PlaceRegister::getCellPhone, request.getKeywords())); - } - if (null != request.getStatus()) { - lambdaQueryWrapper.eq(PlaceRegister::getStatus, request.getStatus()); - } - if (null != request.getBeginDate()) { - lambdaQueryWrapper.ge(PlaceRegister::getSubscribeDate, request.getBeginDate()); - } - if (null != request.getEndDate()) { - lambdaQueryWrapper.le(PlaceRegister::getSubscribeDate, request.getEndDate()); - } - lambdaQueryWrapper.eq(PlaceRegister::getIsShow, false); - lambdaQueryWrapper.orderByAsc(PlaceRegister::getStatus).orderByDesc(PlaceRegister::getId); - List list = dao.selectList(lambdaQueryWrapper); - List voList = JSON.parseArray(JSON.toJSONString(list), PlaceRegisterVo.class); - return CommonPage.copyPageInfo(page, voList); - } - - @Override - public Boolean updateRegister(Integer id, PlaceRegisterRequest request) { - PlaceRegister upd = JSON.parseObject(JSON.toJSONString(request), PlaceRegister.class); - upd.setId(id); - if (null != upd.getStatus() && upd.getStatus() == 2) { upd.setCancelData(new Date()); } - dao.updateById(upd); - return true; - } - - @Override - public PlaceRegister getDetail(Integer id) { - PlaceRegister pr = getById(id); - if (ObjectUtil.isNull(pr)) { - throw new CrmebException("数据不存在"); - } - return pr; - } - - @Override - public PageInfo myRegisterList(PageParamRequest pageParamRequest) { - User info = userService.getInfoException(); - Page page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); - List list = dao.myRegisterList(info.getUid()); - return CommonPage.copyPageInfo(page, list); - } - - @Override - public Boolean cancel(PlaceCancelRequest request) { - PlaceRegister pr = dao.selectById(Integer.parseInt(request.getPlaceActivityId())); - if (null != pr && pr.getStatus() == 0) { - PlaceRegister upd = new PlaceRegister(); - upd.setId(pr.getId()); - upd.setStatus(2); - upd.setCancelReason(request.getCancelReason()); - dao.updateById(upd); - } else { - throw new CrmebException("当前状态不能取消了欧"); - } - return true; - } - - @Override - public Boolean recordsDelete(Integer id) { - PlaceRegister upd = new PlaceRegister(); - upd.setId(id); - upd.setIsShow(1); - dao.updateById(upd); - return true; - } -} diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnInfoServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnInfoServiceImpl.java index 9f1d2eb..d88e244 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnInfoServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnInfoServiceImpl.java @@ -4,10 +4,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zbkj.common.model.order.StoreOrderReturnInfo; import com.zbkj.service.dao.StoreOrderReturnInfoDao; import com.zbkj.service.service.StoreOrderReturnInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class StoreOrderReturnInfoServiceImpl extends ServiceImpl implements StoreOrderReturnInfoService { + @Autowired private StoreOrderReturnInfoDao dao; + @Override + public List selectByReturnId(Integer id) { + return dao.selectByReturnId(id); + } } diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java index 6e0d385..0dc9fd2 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java @@ -2,19 +2,32 @@ package com.zbkj.service.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.order.StoreOrderReturn; +import com.zbkj.common.model.order.StoreOrderReturnInfo; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.ApplyRecordsResponse; import com.zbkj.service.dao.StoreOrderReturnDao; import com.zbkj.service.service.StoreOrderReturnInfoService; import com.zbkj.service.service.StoreOrderReturnService; +import com.zbkj.service.service.StoreOrderService; +import com.zbkj.service.service.UserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Date; +import java.util.List; @Service public class StoreOrderReturnServiceImpl extends ServiceImpl implements StoreOrderReturnService { @Autowired private StoreOrderReturnDao dao; + @Autowired private UserService userService; + @Autowired @Lazy private StoreOrderService storeOrderService; @Autowired private StoreOrderReturnInfoService storeOrderReturnInfoService; @Override @@ -48,4 +61,29 @@ public class StoreOrderReturnServiceImpl extends ServiceImpl applyRecordsList(PageParamRequest page) { + Integer userId = userService.getUserIdException(); + PageHelper.startPage(page.getPage(), page.getLimit()); + List list = dao.applyRecordsList(userId, null); + PageHelper.clearPage(); + for (ApplyRecordsResponse ar : list) { + ar.setReturnInfoList(storeOrderReturnInfoService.selectByReturnId(ar.getId())); + } + return CommonPage.restPage(list); + } + + @Override + public ApplyRecordsResponse getApplyRecord(String id) { + Integer userId = userService.getUserIdException(); + List list = dao.applyRecordsList(userId, Integer.parseInt(id)); + if (list.isEmpty()) { throw new CrmebException("未找到信息"); } + + ApplyRecordsResponse response = list.get(0); + List returnInfoList = storeOrderReturnInfoService.selectByReturnId(response.getId()); + response.setReturnInfoList(returnInfoList); + response.setReturnNum(returnInfoList.stream().map(StoreOrderReturnInfo::getReturnNum).reduce(0, Integer::sum)); + return response; + } } diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java index d87c472..2722bda 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java @@ -37,6 +37,7 @@ import com.zbkj.service.service.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; @@ -118,7 +119,8 @@ public class StoreOrderServiceImpl extends ServiceImpl canApplyOrderList(Integer userId) { + return dao.canApplyOrderList(userId); + } + ///////////////////////////////////////////////////////////////////////////////////////////////////// 以下为自定义方法 /** diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/YlyPrintServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/YlyPrintServiceImpl.java index a3ffcf9..29de80f 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/YlyPrintServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/YlyPrintServiceImpl.java @@ -24,7 +24,6 @@ import java.util.List; /** * 易联云打印订单 service - */ @Service public class YlyPrintServiceImpl implements YlyPrintService { @@ -40,34 +39,35 @@ public class YlyPrintServiceImpl implements YlyPrintService { @Autowired private YlyUtil ylyUtil; + /** * 易联云打印商品信息 * * @param orderId 订单id - * @param isAuto 是否自动打印 + * @param isAuto 是否自动打印 */ @Override - public void YlyPrint(String orderId,boolean isAuto) { - if(ylyUtil.checkYlyPrintStatus()){ + public void YlyPrint(String orderId, boolean isAuto) { + if (ylyUtil.checkYlyPrintStatus()) { throw new CrmebException("易联云 未开启打印"); } // 判断是否开启自动打印 - if(isAuto && ylyUtil.checkYlyPrintAfterPaySuccess()){ + if (isAuto && ylyUtil.checkYlyPrintAfterPaySuccess()) { return; } StoreOrder exitOrder = storeOrderService.getByOderId(orderId); - if(ObjectUtil.isNull(exitOrder)){ + if (ObjectUtil.isNull(exitOrder)) { throw new CrmebException("易联云 打印时未找到 订单信息"); } - if(!exitOrder.getPaid()){ + if (!exitOrder.getPaid()) { throw new CrmebException("易联云 打印时出错， 订单未支付"); } List exitOrderInfo = storeOrderInfoService.getOrderListByOrderId(exitOrder.getId()); List goods = new ArrayList<>(); for (StoreOrderInfoOldVo storeOrderInfo : exitOrderInfo) { goods.add(new YlyPrintRequestGoods(storeOrderInfo.getInfo().getProductName() - ,storeOrderInfo.getInfo().getPrice().toString(), - storeOrderInfo.getInfo().getPayNum()+"", + , storeOrderInfo.getInfo().getPrice().toString(), + storeOrderInfo.getInfo().getPayNum() + "", exitOrder.getPayPrice().toString())); } diff --git a/food-service/src/main/java/com/zbkj/service/util/YlyUtil.java b/food-service/src/main/java/com/zbkj/service/util/YlyUtil.java index b12ecb2..300e8da 100644 --- a/food-service/src/main/java/com/zbkj/service/util/YlyUtil.java +++ b/food-service/src/main/java/com/zbkj/service/util/YlyUtil.java @@ -21,18 +21,9 @@ import java.net.URLEncoder; import java.util.List; import java.util.concurrent.TimeUnit; - -/** 易联云 工具类 - * +---------------------------------------------------------------------- - * * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * * +---------------------------------------------------------------------- - * * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * * +---------------------------------------------------------------------- - * * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * * +---------------------------------------------------------------------- - * * | Author: CRMEB Team - * * +---------------------------------------------------------------------- - **/ +/** + * 易联云 工具类 + */ @Component public class YlyUtil { private static final Logger logger = LoggerFactory.getLogger(YlyUtil.class); @@ -117,8 +108,8 @@ public class YlyUtil { instant(); RequestMethod.getInstance().printerSetVoice( ylyAccessTokenResponse.getBody().getAccess_token(), - machine_code,"[\"CRMEB 来新单了\",9,0]","false", - "0","ORDER xxx"); + machine_code,"[\"FOOD 来新单了\",9,0]","false", + "0","FOOD xxx"); logger.info("设置语音成功"); } diff --git a/food-service/src/main/resources/mapper/place/PlaceRegisterMapper.xml b/food-service/src/main/resources/mapper/place/PlaceRegisterMapper.xml deleted file mode 100644 index 6fa921c..0000000 --- a/food-service/src/main/resources/mapper/place/PlaceRegisterMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/food-service/src/main/resources/mapper/store/StoreOrderMapper.xml b/food-service/src/main/resources/mapper/store/StoreOrderMapper.xml index 654fe04..0fece65 100644 --- a/food-service/src/main/resources/mapper/store/StoreOrderMapper.xml +++ b/food-service/src/main/resources/mapper/store/StoreOrderMapper.xml @@ -2,6 +2,19 @@ + + + SELECT + oi.product_id productId, + oi.product_name storeName, + oi.image, + oi.attr_value_id attrValueId, + ri.return_num returnNum + FROM eb_store_order_info oi + INNER JOIN eb_store_order_return_info ri ON oi.order_id = ri.order_id AND oi.attr_value_id = ri.attr_value_id + where ri.return_id = #{id} + + + diff --git a/food-service/src/main/resources/mapper/store/StoreOrderReturnMapper.xml b/food-service/src/main/resources/mapper/store/StoreOrderReturnMapper.xml new file mode 100644 index 0000000..a6c9c9c --- /dev/null +++ b/food-service/src/main/resources/mapper/store/StoreOrderReturnMapper.xml @@ -0,0 +1,15 @@ + + + + + + +