diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index 9dc966c..4aa0a6b 100644 --- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -260,8 +260,12 @@ public class HanHaiMember implements Serializable { @Excel(name = "员工管理权限", width = 15) @ApiModelProperty(value = "员工管理权限") private java.lang.String isUserRole; - /**推广官管理权限*/ - @Excel(name = "推广官管理权限", width = 15) + /**推广官管理权限*/ + @Excel(name = "推广官管理权限", width = 15) @ApiModelProperty(value = "推广官管理权限") private java.lang.String isTuiRole; + /**是否拉黑*/ + @Excel(name = "是否拉黑", width = 15) + @ApiModelProperty(value = "是否拉黑") + private java.lang.String isBlack; } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletClassController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletClassController.java index daa778c..9e27c9a 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletClassController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletClassController.java @@ -5,69 +5,63 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletAddressService; +import org.jeecg.api.service.AppletClassService; import org.jeecg.common.api.vo.Result; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + @Api(tags="商品分类相关接口") @RestController @RequestMapping("/applet/class") @Slf4j public class AppletClassController { + @Resource + private AppletClassService appletClassService; //获取价格预览分类列表 @ApiOperation(value="获取价格预览分类列表", notes="获取价格预览分类列表") @GetMapping(value = "/getPricePreviewClassList") public Result getPricePreviewClassList(){ - return Result.ok("获取价格预览分类列表成功"); + return appletClassService.getPricePreviewClassList(); } //根据分类标识获取分类商品列表带分页 @ApiOperation(value="根据分类标识获取分类商品列表带分页", notes="根据分类标识获取分类商品列表带分页") @GetMapping(value = "/getClassGoodsList") - public Result getClassGoodsList(PageBean pageBean){ - return Result.ok("根据分类标识获取分类商品列表带分页成功"); + public Result getClassGoodsList(String classId,PageBean pageBean){ + return appletClassService.getClassGoodsList(classId,pageBean); } + + //根据商品标识查询商品详情 + @ApiOperation(value="根据商品标识查询商品详情", notes="根据商品标识查询商品详情") + @GetMapping(value = "/getGoodsDetail") + public Result getGoodsDetail(String goodsId){ + return appletClassService.getGoodsDetail(goodsId); + } + + + //根据商品标识查询商品回收规则 @ApiOperation(value="根据商品标识查询商品回收规则", notes="根据商品标识查询商品回收规则") @GetMapping(value = "/getGoodsRecycleRule") public Result getGoodsRecycleRule(String goodsId){ - return Result.ok("根据商品标识查询商品回收规则成功"); + return appletClassService.getGoodsRecycleRule(goodsId); } //根据商品标识查询商品可回品牌 @ApiOperation(value="根据商品标识查询商品可回品牌", notes="根据商品标识查询商品可回品牌") @GetMapping(value = "/getGoodsBrandList") - public Result getGoodsBrandList(String goodsId){ - return Result.ok("根据商品标识查询商品可回品牌成功"); - } - - - - - - - - - - - //查询质检报告列表带分页 - @ApiOperation(value="查询质检报告列表带分页", notes="查询质检报告列表带分页") - @GetMapping(value = "/getQualityReportList") - public Result getQualityReportList(PageBean pageBean){ - return Result.ok("查询质检报告列表带分页成功"); + public Result getGoodsBrandList(String name,String iconId,PageBean pageBean){ + return appletClassService.getGoodsBrandList(name,iconId,pageBean); } - //查询质检报告商品详情 - @ApiOperation(value="查询质检报告商品详情", notes="查询质检报告商品详情") - @GetMapping(value = "/getQualityReportGoodsDetail") - public Result getQualityReportGoodsDetail(){ - return Result.ok("查询质检报告商品详情成功"); - } } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java index 423feb7..a3a7160 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java @@ -31,14 +31,6 @@ public class AppletIndexController { } - //查询首页关于我们配置信息 - @ApiOperation(value="查询首页关于我们配置信息", notes="查询首页关于我们配置信息") - @GetMapping(value = "/getAboutUs") - public Result getAboutUs(){ - return null; - } - - //获取金刚区回收流程列表文案 @ApiOperation(value="获取金刚区回收流程列表文案", notes="获取金刚区回收流程列表文案") @@ -53,7 +45,7 @@ public class AppletIndexController { @ApiOperation(value="查询回收商品分类品类", notes="查询回收商品分类品类") @GetMapping(value = "/getClassList") public Result getClassList(){ - return null; + return appletIndexService.getClassList(); } @@ -62,7 +54,7 @@ public class AppletIndexController { @ApiOperation(value="查询已开通包邮城市", notes="查询已开通包邮城市") @GetMapping(value = "/getFreeCityList") public Result getFreeCityList(){ - return null; + return appletIndexService.getFreeCityList(); } @@ -70,14 +62,15 @@ public class AppletIndexController { @ApiOperation(value="查询最近回收商品", notes="查询最近回收商品") @GetMapping(value = "/getRecentGoodsList") public Result getRecentGoodsList(){ - return null; + return appletIndexService.getRecentGoodsList(); } - //查询回收去向信息 - @ApiOperation(value="查询回收去向信息", notes="查询回收去向信息") - @GetMapping(value = "/getRecycleToList") - public Result getRecycleToList(){ - return null; + + //根据最近回收商品标识查看相关质量检测报告 + @ApiOperation(value="根据最近回收商品标识查看相关质量检测报告", notes="根据最近回收商品标识查看相关质量检测报告") + @GetMapping(value = "/getQualityReport") + public Result getQualityReport(String goodsId){ + return appletIndexService.getQualityReport(goodsId); } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletInfoTeamController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletInfoTeamController.java index 2806b60..2398032 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletInfoTeamController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletInfoTeamController.java @@ -2,10 +2,15 @@ package org.jeecg.api.controller; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletIndexService; +import org.jeecg.api.service.AppletInfoTeamService; import org.jeecg.common.api.vo.Result; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; @Api(tags="管理员-用户管理") @RestController @@ -13,52 +18,53 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j public class AppletInfoTeamController { + @Resource + private AppletInfoTeamService appletInfoTeamService; //获取员工信息列表带分页搜索 - @RequestMapping(value = "/getInfoTeamListPage") - public Result getInfoTeamListPage() { - return Result.ok(""); + @ApiOperation(value="获取员工信息列表带分页搜索", notes="获取员工信息列表带分页搜索") + @GetMapping(value = "/getInfoTeamListPage") + public Result getInfoTeamListPage(@RequestHeader("X-Access-Token") String token, String name, PageBean pageBean) { + return appletInfoTeamService.getInfoTeamListPage(token,name,pageBean); } //拉黑用户 - @RequestMapping(value = "/blackUser") - public Result blackUser() { - return Result.ok(""); + @ApiOperation(value="拉黑用户", notes="拉黑用户") + @PostMapping(value = "/blackUser") + public Result blackUser(@RequestHeader("X-Access-Token") String token,String userId) { + return appletInfoTeamService.blackUser(token,userId); } - //升级成推广官 - @RequestMapping(value = "/upgrade") - public Result upgrade() { - return Result.ok(""); - } + @ApiOperation(value="升级推广官", notes="升级成广官") + @PostMapping(value = "/upgrade") + public Result upgrade(@RequestHeader("X-Access-Token") String token) { + return appletInfoTeamService.upgrade(token); + } - //根据用户标识查询该用户历史订单列表带分页 - @RequestMapping(value = "/getOrderListPage") - public Result getOrderListPage() { - return Result.ok(""); + @ApiOperation(value="根据用户标识查询该用户历史订单列表带分页", notes="根据用户标识查询该用户历史订单列表带分页") + @GetMapping(value = "/getOrderListPage") + public Result getOrderListPage(@RequestHeader("X-Access-Token") String token,String userId,PageBean pageBean) { + return appletInfoTeamService.getOrderListPage(token,userId,pageBean); } //查询订单详情 - @RequestMapping(value = "/getOrderDetail") - public Result getOrderDetail() { - return Result.ok(""); + @ApiOperation(value="查询订单详情", notes="查询订单详情") + @GetMapping(value = "/getOrderDetail") + public Result getOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId) { + return appletInfoTeamService.getOrderDetail(token,orderId); } //点击查看质检报告 - @RequestMapping(value = "/clickQualityReport") - public Result clickQualityReport() { - return Result.ok(""); + @ApiOperation(value="点击查看质检报告", notes="点击查看质检报告") + @GetMapping(value = "/clickQualityReport") + public Result clickQualityReport(@RequestHeader("X-Access-Token") String token,String orderId) { + return appletInfoTeamService.clickQualityReport(token,orderId); } - - - - - } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java index 487778d..8086d73 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java @@ -31,18 +31,4 @@ public class AppletMoneyLogController { } - //获取我的提现记录 - @ApiOperation( value="获取我的提现记录", notes="获取我的提现记录") - @GetMapping(value = "/getMyMoneyNum") - public Result getMyMoneyLogPage(@RequestHeader("X-Access-Token") String token){ - return appletMoneyLogService.getMyMoneyNum(token); - } - - - //获取我的收益明细 - @ApiOperation( value="获取我的收益明细", notes="获取我的收益明细") - @GetMapping(value = "/getMyIncome") - public Result getMyIncome(@RequestHeader("X-Access-Token") String token){ - return null; - } } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletMyTeamController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletMyTeamController.java index 2af1a95..8077821 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletMyTeamController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletMyTeamController.java @@ -2,10 +2,14 @@ package org.jeecg.api.controller; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletInfoTeamService; import org.jeecg.common.api.vo.Result; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; @Api(tags="管理员 - 员工管理") @RestController @@ -13,17 +17,31 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j public class AppletMyTeamController { - //查询我的员工管理 - @RequestMapping(value = "/getMyTeamList") - public Result getMyTeamList() { - return Result.OK("查询成功"); + @Resource + private AppletInfoTeamService appletInfoTeamService; + + //获取员工信息列表带分页搜索 + @ApiOperation(value="获取员工信息列表带分页搜索", notes="获取员工信息列表带分页搜索") + @GetMapping(value = "/getMyTeamList") + public Result getMyTeamList(@RequestHeader("X-Access-Token") String token, String name, PageBean pageBean) { + return appletInfoTeamService.getMyTeamList(token,name,pageBean); + } + + + //查看员工详情信息 + @ApiOperation(value="查看员工详情信息", notes="查看员工详情信息") + @GetMapping(value = "/getMemberInfo") + public Result getMemberInfo(@RequestHeader("X-Access-Token") String token, String id) { + return appletInfoTeamService.getMemberInfo(token,id); } + //解除员工 - @RequestMapping(value = "/removeMember") - public Result removeMember() { - return Result.OK("解除成功"); + @ApiOperation(value="解除员工", notes="解除员工") + @PostMapping(value = "/removeMember") + public Result removeMember(String token,String id) { + return appletInfoTeamService.removeMember(token,id); } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletOrderController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletOrderController.java index 1265456..f97f78e 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletOrderController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletOrderController.java @@ -3,10 +3,12 @@ package org.jeecg.api.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletOrderService; import org.jeecg.common.api.vo.Result; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; @Api(tags="首页-订单相关接口") @RestController @@ -14,12 +16,41 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j public class AppletOrderController { + @Resource + private AppletOrderService appletOrderService; + // 联系客服问题相关列表数据带分页 + @ApiOperation(value="联系客服问题相关列表数据带分页", notes="联系客服问题相关列表数据带分页") + @GetMapping(value = "/getQuestionList") + public Result getQuestionList(PageBean pageBean) { + return appletOrderService.getQuestionList(pageBean); + } + + //获取订单列表信息带分页 + @ApiOperation(value="获取订单列表信息带分页", notes="获取订单列表信息带分页") + @GetMapping(value = "/getOrderListPage") + public Result getOrderListPage(@RequestHeader("X-Access-Token") String token,Integer status, PageBean pageBean) { + return appletOrderService.getOrderList(token,status,pageBean); + } + + //获取订单详情 + @ApiOperation(value="获取订单详情", notes="获取订单详情") + @GetMapping(value = "/getOrderDetail") + public Result getOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId) { + return appletOrderService.getOrderDetail(token,orderId); + } + + //取消订单 + @ApiOperation(value="取消订单", notes="取消订单") + @PostMapping(value = "/cancelOrder") + public Result cancelOrder(@RequestHeader("X-Access-Token") String token,String orderId) { + return appletOrderService.cancelOrder(token,orderId); + } //创建预约订单 @ApiOperation(value="创建预约订单", notes="创建预约订单") @GetMapping(value = "/createOrder") public Result createOrder() { - return Result.OK("预约订单创建成功"); + return Result.OK("接口未处理"); } @@ -28,30 +59,11 @@ public class AppletOrderController { @ApiOperation(value="获取预约时间断", notes="获取预约时间断") @GetMapping(value = "/getOrderTime") public Result getOrderTime() { - return Result.OK("预约时间断获取成功"); + return Result.OK("接口为处理"); } - //获取订单列表信息带分页 - @ApiOperation(value="获取订单列表信息带分页", notes="获取订单列表信息带分页") - @GetMapping(value = "/getOrderListPage") - public Result getOrderListPage() { - return Result.OK("订单列表信息获取成功"); - } - - //获取订单详情 - @ApiOperation(value="获取订单详情", notes="获取订单详情") - @GetMapping(value = "/getOrderDetail") - public Result getOrderDetail() { - return Result.OK("订单详情获取成功"); - } - //取消订单 - @ApiOperation(value="取消订单", notes="取消订单") - @GetMapping(value = "/cancelOrder") - public Result cancelOrder() { - return Result.OK("订单取消成功"); - } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java index e03d138..80af117 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java @@ -2,49 +2,54 @@ package org.jeecg.api.controller; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletOrderService; +import org.jeecg.api.service.AppletOrderTeamService; import org.jeecg.common.api.vo.Result; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + @Api(tags="管理员-订单相关接口") @RestController @RequestMapping("/applet/info_team_order") @Slf4j public class AppletOrderTeamController { - //联系客服问题相关列表数据带分页 - @RequestMapping(value = "/getQuestionList") - public Result getQuestionList() { - return Result.OK("查询成功"); - } - + @Resource + private AppletOrderTeamService appletOrderTeamService; //管理员：订单列表带分页搜索 - @RequestMapping(value = "/getOrderList") - public Result getOrderList() { + @ApiOperation(value="管理员：订单列表带分页搜索", notes="管理员：订单列表带分页搜索") + @GetMapping(value = "/getOrderList") + public Result getOrderList(@RequestHeader("X-Access-Token") String token, Integer status, PageBean pageBean) { return Result.OK("查询成功"); } //管理员：订单详情 @RequestMapping(value = "/getOrderDetail") - public Result getOrderDetail() { + public Result getOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId) { return Result.OK("查询成功"); } //管理员：订单通过 @RequestMapping(value = "/passOrder") - public Result passOrder() { + public Result passOrder(@RequestHeader("X-Access-Token") String token,String orderId) { return Result.OK("查询成功"); } //管理员：订单驳回 @RequestMapping(value = "/rejectOrder") - public Result rejectOrder() { + public Result rejectOrder(@RequestHeader("X-Access-Token") String token,String orderId) { return Result.OK("查询成功"); } @@ -52,7 +57,7 @@ public class AppletOrderTeamController { //管理员：质检信息提交 @RequestMapping(value = "/submitQualityInfo") public Result submitQualityInfo() { - return Result.OK("查询成功"); + return Result.OK("订单未处理"); } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java index 17bc043..57a1d2a 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java @@ -13,18 +13,6 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j public class AppletPromotionController { - //获取推广banner - @RequestMapping(value = "/getBanner") - public Result getBanner(){ - return Result.OK("推广banner"); - } - - //获取我的推广基础信息 - @RequestMapping(value = "/getBaseInfo") - public Result getBaseInfo(){ - return Result.OK("推广基础信息"); - } - //获取推广排行版带分页 @RequestMapping(value = "/getRankList") @@ -48,7 +36,4 @@ public class AppletPromotionController { - - - } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletAchievementService.java b/module-common/src/main/java/org/jeecg/api/service/AppletAchievementService.java deleted file mode 100644 index ad137ba..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/AppletAchievementService.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.api.service; - -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.commonBookAchievementLog.entity.CommonBookAchievementLog; - -public interface AppletAchievementService { - - - // 获取读者成就列表 - Result getAchievementList(); - - // 设置读者成就等级名称 - Result setAchievementName(String token, CommonBookAchievementLog bookAchievementLog ); - - // 根据用户标识和书籍标识查询该用户的成就等级 - Result getAchievement(String token , String bookId); - - -} diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletBookService.java b/module-common/src/main/java/org/jeecg/api/service/AppletBookService.java deleted file mode 100644 index df73421..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/AppletBookService.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.jeecg.api.service; - -import org.jeecg.api.bean.PageBean; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.commonBook.entity.CommonBook; -import org.jeecg.modules.commonBookNovel.entity.CommonBookNovel; -import org.jeecg.modules.commonMyBook.entity.CommonMyBook; - -public interface AppletBookService { - - //获取我阅读过的书籍列表带分页 - Result getReadBookPage(String token,PageBean pageBean); - - //增加我的书架阅读记录 - Result addReadBook(String token, CommonBook commonBook); - - //移除我阅读过的书籍根据书籍标识 - Result removeReadBook(String token,String bookId); - - //批量移除我阅读过的数据根据书籍标识 - Result batchRemoveReadBook(String token,String bookIds); - - - - -} diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletClassService.java b/module-common/src/main/java/org/jeecg/api/service/AppletClassService.java new file mode 100644 index 0000000..9d0a3d8 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/AppletClassService.java @@ -0,0 +1,31 @@ +package org.jeecg.api.service; + +import org.jeecg.api.bean.PageBean; +import org.jeecg.common.api.vo.Result; + +public interface AppletClassService { + + + //获取价格预览分类列表 + Result getPricePreviewClassList(); + + + //根据分类标识获取分类商品列表带分页 + Result getClassGoodsList(String classId, PageBean pageBean); + + + //根据商品标识查询商品详情 + Result getGoodsDetail(String goodsId); + + + //根据商品标识查询商品回收规则 + Result getGoodsRecycleRule(String goodsId); + + + //根据商品标识查询商品可回品牌 + Result getGoodsBrandList(String name,String iconId,PageBean pageBean); + + + + +} diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletCommentService.java b/module-common/src/main/java/org/jeecg/api/service/AppletCommentService.java deleted file mode 100644 index 6eac9c1..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/AppletCommentService.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.jeecg.api.service; - -import org.jeecg.api.bean.PageBean; -import org.jeecg.common.api.vo.Result; - -public interface AppletCommentService { - - - //查询我未读的评论次数 - Result getMyCommentNum(String token); - - //查询我未读的评论列表 - Result getMyCommentList(String token, PageBean pageBean); - - //根据书籍标识查询评论信息列表带分页 - Result getCommentList(String bookId, PageBean pageBean); - - //保存评论信息 - Result saveComment(String token, String bookId, String content); - - //删除评论信息 - Result deleteComment(String token, String commentId); - - //回复评论信息 - Result replyComment(String token, String commentId, String content); - - //修改评论为已读 - Result updateCommentRead(String token, String commentId); - - //查看评论详情 - Result getCommentDetail(String token, String commentId); -} diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java index 8e8f785..38164f6 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java @@ -9,17 +9,23 @@ public interface AppletIndexService { // 获取首页banner Result getBanner(); - // 获取首页公告 - Result getNotice(); - // 获取公告列表带分页 - Result getNoticePage(PageBean pageBean); + // 获取金刚区回收流程列表 + Result getAreaList(); - // 获取公告详情 - Result getNoticeById(String id); + // 查询回收商品分类品类 + Result getClassList(); + + // 查询已开通包邮城市 + Result getFreeCityList(); + + // 查询最近回收商品 + Result getRecentGoodsList(); + + + //根据最近回收商品标识查看相关质量检测报告 + Result getQualityReport(String goodsId); - // 获取金刚区回收流程列表文案 - Result getAreaList(); } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletInfoTeamService.java b/module-common/src/main/java/org/jeecg/api/service/AppletInfoTeamService.java new file mode 100644 index 0000000..e4fdd48 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/AppletInfoTeamService.java @@ -0,0 +1,35 @@ +package org.jeecg.api.service; + +import org.jeecg.api.bean.PageBean; +import org.jeecg.common.api.vo.Result; + +public interface AppletInfoTeamService { + + //获取用户列表带分页搜索 + Result getInfoTeamListPage(String token,String name,PageBean pageBean); + + //拉黑用户 + Result blackUser(String token,String userId); + + //升级推广官 + Result upgrade(String token); + + Result getOrderListPage(String token,String userId,PageBean pageBean); + + //获取订单详情 + Result getOrderDetail(String token,String orderId); + + //点击质量报告 + Result clickQualityReport(String token,String orderId); + + + //获取员工信息列表 + Result getMyTeamList(String token,String name,PageBean pageBean); + + //查看员工详情信息 + Result getMemberInfo(String token,String id); + + //移除员工 + Result removeMember(String token,String id); + +} diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java b/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java index 87216ee..bf01680 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java @@ -6,9 +6,6 @@ import org.jeecg.common.api.vo.Result; public interface AppletMoneyLogService { - //获取我的积分数量 - Result getMyMoneyNum(String token); - //查询我的流水信息列表带分页 Result getMyMoneyLogPage(String token,Integer status, PageBean pageBean); diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletMyBookService.java b/module-common/src/main/java/org/jeecg/api/service/AppletMyBookService.java deleted file mode 100644 index 377c02c..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/AppletMyBookService.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.jeecg.api.service; - -import org.jeecg.api.bean.PageBean; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.commonBookNovel.entity.CommonBookNovel; -import org.jeecg.modules.commonMyBook.entity.CommonMyBook; -import org.jeecg.modules.commonShop.entity.CommonShop; - -public interface AppletMyBookService { - - //获取我的作品带分页 - Result getMyShopPage(String token, PageBean pageBean); - - //增加或者修改我的作品 - Result saveOrUpdateShop(String token, CommonShop commonShop); - - //获取我的小说章节列表带分页 - Result getMyShopNovelPage(String token, String bookId,Integer status,Integer reverse, PageBean pageBean); - - //增加或修改我的小说章节 - Result saveOrUpdateShopNovel(String token, CommonBookNovel commonBookNovel); - - //删除我的作品 - Result deleteMyShop(String token, String bookId); - - //多选删除我的作品 - Result deleteMyShopList(String token, String bookIds); - - //删除作品章节 - Result deleteMyShopNovel(String token, String bookId, String novelId); -} diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletOrderService.java b/module-common/src/main/java/org/jeecg/api/service/AppletOrderService.java index 91798c3..9582ea0 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletOrderService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletOrderService.java @@ -5,28 +5,18 @@ import org.jeecg.common.api.vo.Result; public interface AppletOrderService { + // 联系客服问题相关列表数据带分页 + Result getQuestionList(PageBean pageBean); - //查询互动打赏礼物信息列表 - Result getInteractionGiftList(PageBean pageBean); + // 获取订单列表信息带分页 + Result getOrderList(String token, Integer status,PageBean pageBean); + // 获取订单详情 + Result getOrderDetail(String token, String orderId); - //查询我的礼物盒中的礼物列表 - Result getMyGiftList(String token, PageBean pageBean); + // 取消订单 + Result cancelOrder(String token, String orderId); - //根据礼物标识查询礼物详情 - Result getGiftDetail(String giftId); - - - //传入礼物标识，数量创建打赏订单 - Result createOrder(String token, String giftId, Integer num); - - - //根据礼物订单进行打赏 - Result payOrder(String token, String orderId); - - - //支付成功支付回调 - Result paySuccess(String orderId); } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletOrderTeamService.java b/module-common/src/main/java/org/jeecg/api/service/AppletOrderTeamService.java new file mode 100644 index 0000000..333416a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/AppletOrderTeamService.java @@ -0,0 +1,22 @@ +package org.jeecg.api.service; + +import org.jeecg.api.bean.PageBean; +import org.jeecg.common.api.vo.Result; + +public interface AppletOrderTeamService { + + //管理员：订单列表带分页搜索 + Result getOrderListPage(String token, Integer status, PageBean pageBean); + + //管理员：订单详情 + Result getOrderDetail(String token,String orderId); + + //管理员：订单通过 + Result passOrder(String token,String orderId); + + //管理员：订单拒绝 + Result rejectOrder(String token,String orderId); + + //管理员：提交质量信息 + Result submitQualityInfo(); +} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java deleted file mode 100644 index 666bd71..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.jeecg.api.service.impl; - -import org.apache.commons.lang3.StringUtils; -import org.jeecg.api.service.AppletAchievementService; -import org.jeecg.common.api.vo.Result; -import org.jeecg.config.shiro.ShiroRealm; -import org.jeecg.modules.commonBookAchievement.entity.CommonBookAchievement; -import org.jeecg.modules.commonBookAchievement.service.ICommonBookAchievementService; -import org.jeecg.modules.commonBookAchievementLog.entity.CommonBookAchievementLog; -import org.jeecg.modules.commonBookAchievementLog.service.ICommonBookAchievementLogService; -import org.jeecg.modules.commonShop.entity.CommonShop; -import org.jeecg.modules.commonShop.service.ICommonShopService; -import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class AppletAchievementServiceImpl implements AppletAchievementService { - - //权限 - @Resource - private ShiroRealm shiroRealm; - @Autowired - private ICommonBookAchievementService commonBookAchievementService; - @Autowired - private ICommonBookAchievementLogService commonBookAchievementLogService; - @Autowired - private ICommonShopService commonShopService; - - // 获取读者成就列表 - @Override - public Result getAchievementList(){ - List list = commonBookAchievementService.list(); - return Result.OK("读者成就列表",list); - } - - // 设置读者成就等级名称 - @Override - public Result setAchievementName(String token, CommonBookAchievementLog bookAchievementLog){ - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //书籍标识不能为空 - if(StringUtils.isEmpty(bookAchievementLog.getBookId())){ - return Result.error("书籍标识不能为空"); - } - //根据书籍标识查询书籍信息 - CommonShop commonShop = commonShopService.getById(bookAchievementLog.getBookId()); - if(commonShop==null){ - return Result.error("书籍不存在"); - } - CommonBookAchievementLog one = commonBookAchievementLogService.lambdaQuery() - .eq(CommonBookAchievementLog::getBookId, bookAchievementLog.getBookId()) - .eq(CommonBookAchievementLog::getUserId, member.getId()) - .one(); - if(one!=null){ - bookAchievementLog.setId(one.getId()); - commonBookAchievementLogService.save(bookAchievementLog); - return Result.OK("修改成功"); - }else{ - bookAchievementLog.setBookId(commonShop.getId()); - bookAchievementLog.setUserId(member.getId()); - commonBookAchievementLogService.save(bookAchievementLog); - return Result.OK("设置成功"); - } - - } - - // 根据用户标识和书籍标识查询该用户的成就等级 - @Override - public Result getAchievement(String token, String bookId){ - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - CommonBookAchievementLog one = commonBookAchievementLogService.lambdaQuery() - .eq(CommonBookAchievementLog::getBookId, bookId) - .eq(CommonBookAchievementLog::getUserId, member.getId()) - .one(); - return Result.OK("查询成功",one); - } - -} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java deleted file mode 100644 index 3139f6c..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.jeecg.api.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.commons.lang3.StringUtils; -import org.jeecg.api.bean.PageBean; -import org.jeecg.api.service.AppletBookService; -import org.jeecg.common.api.vo.Result; -import org.jeecg.config.shiro.ShiroRealm; -import org.jeecg.modules.commonBanner.service.ICommonBannerService; -import org.jeecg.modules.commonBook.entity.CommonBook; -import org.jeecg.modules.commonBook.service.ICommonBookService; -import org.jeecg.modules.commonBookNovel.entity.CommonBookNovel; -import org.jeecg.modules.commonBookNovel.service.ICommonBookNovelService; -import org.jeecg.modules.commonGiftBack.service.ICommonGiftBackService; -import org.jeecg.modules.commonIconImage.service.ICommonIconImageService; -import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; -import org.jeecg.modules.commonMyBook.entity.CommonMyBook; -import org.jeecg.modules.commonMyBook.service.ICommonMyBookService; -import org.jeecg.modules.commonMyGift.service.ICommonMyGiftService; -import org.jeecg.modules.commonNotice.service.ICommonNoticeService; -import org.jeecg.modules.commonRanking.service.ICommonRankingService; -import org.jeecg.modules.commonShop.service.ICommonShopService; -import org.jeecg.modules.commonShopClass.service.ICommonShopClassService; -import org.jeecg.modules.commonSign.service.ICommonSignService; -import org.jeecg.modules.commonSignLog.service.ICommonSignLogService; -import org.jeecg.modules.commonTask.service.ICommonTaskService; -import org.jeecg.modules.commonTaskLog.service.ICommonTaskLogService; -import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Arrays; - -@Service -public class AppletBookServiceImpl implements AppletBookService { - - - - //权限 - @Resource - private ShiroRealm shiroRealm; - @Autowired - private ICommonBannerService commonBannerService; - @Autowired - private ICommonBookService commonBookService; - @Autowired - private ICommonNoticeService commonNoticeService; - @Autowired - private ICommonShopService commonShopService; - @Autowired - private ICommonShopClassService commonShopClassService; - @Autowired - private ICommonIconImageService commonIconImageService; - @Autowired - private ICommonRankingService commonRankingService; - @Autowired - private ICommonSignService commonSignService; - @Autowired - private ICommonSignLogService commonSignLogService; - @Autowired - private ICommonTaskService commonTaskService; - @Autowired - private ICommonTaskLogService commonTaskLogService; - @Autowired - private ICommonMyGiftService commonMyGiftService; - - @Autowired - private ICommonMoneyLogService commonMoneyLogService; - @Autowired - private ICommonGiftBackService commonGiftBackService; - @Autowired - private ICommonBookNovelService commonBookNovelService; - - @Resource - private IHanHaiMemberService hanHaiMemberService; - - //获取我阅读过的书籍列表带分页 - @Override - public Result getReadBookPage(String token, PageBean pageBean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询阅读过的书籍列表带分页 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - IPage pageList = commonBookService - .lambdaQuery() - .eq(CommonBook::getUserId,hanHaiMember.getId()) - .page(page); - return Result.OK("我阅读过的书籍列表",pageList); - } - - //增加我的书架阅读记录 - @Override - public Result addReadBook(String token, CommonBook commonBook) { - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - commonBook.setUserId(hanHaiMember.getId()); - commonBookService.save(commonBook); - return Result.OK("保存成功"); - } - - - //移除我阅读过的书籍根据书籍标识 - @Override - public Result removeReadBook(String token,String bookId){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - commonBookService.removeById(bookId); - return Result.OK("移除成功"); - } - - - //批量移除我阅读过的数据根据书籍标识 - @Override - public Result batchRemoveReadBook(String token,String bookIds){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - commonBookService.removeByIds(Arrays.asList(bookIds.split(","))); - return Result.OK("移除成功"); - } - - - -} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java new file mode 100644 index 0000000..0ed1d83 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java @@ -0,0 +1,96 @@ +package org.jeecg.api.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletClassService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.commonAddress.service.ICommonAddressService; +import org.jeecg.modules.commonShop.entity.CommonShop; +import org.jeecg.modules.commonShop.service.ICommonShopService; +import org.jeecg.modules.commonShopClass.entity.CommonShopClass; +import org.jeecg.modules.commonShopClass.service.ICommonShopClassService; +import org.jeecg.modules.commonVip.entity.CommonVip; +import org.jeecg.modules.commonVip.service.ICommonVipService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class AppletClassServiceImpl implements AppletClassService { + + //权限验证 + @Resource + private ShiroRealm shiroRealm; + @Resource + private ICommonAddressService commonAddressService; + @Resource + private ICommonShopService commonShopService; + @Resource + private ICommonShopClassService commonShopClassService; + @Resource + private ICommonVipService commonVipService; + + //获取价格预览分类列表 + @Override + public Result getPricePreviewClassList(){ + List list = commonShopClassService.list(); + return Result.OK("价格预览分类列表",list); + } + + + //根据分类标识获取分类商品列表带分页 + @Override + public Result getClassGoodsList(String classId, PageBean pageBean){ + Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); + IPage pageList = commonShopService + .lambdaQuery() + .eq(CommonShop::getShopClass,classId) + .page(page); + return Result.OK("分类商品列表",pageList); + } + + + //根据商品标识查询商品详情 + @Override + public Result getGoodsDetail(String goodsId){ + CommonShop commonShop = commonShopService.getById(goodsId); + return Result.OK("商品详情",commonShop); + } + + + //根据商品标识查询商品回收规则 + @Override + public Result getGoodsRecycleRule(String goodsId){ + CommonShop commonShop = commonShopService.getById(goodsId); + return Result.OK("商品详情",commonShop.getDetails()); + } + + + //根据商品标识查询商品可回品牌 + @Override + public Result getGoodsBrandList(String name,String iconId,PageBean pageBean){ + Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); + IPage pageList = commonVipService + .lambdaQuery() + .eq(CommonVip::getPid, iconId) + .page(page); + //如果名称不为空 + if(name != null){ + pageList = commonVipService + .lambdaQuery() + .eq(CommonVip::getPid, iconId) + .like(CommonVip::getName, name) + .page(page); + } + + return Result.OK("商品品牌",pageList); + } + + + + + +} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java deleted file mode 100644 index b2f90d3..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java +++ /dev/null @@ -1,198 +0,0 @@ -package org.jeecg.api.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.commons.lang3.StringUtils; -import org.jeecg.api.bean.PageBean; -import org.jeecg.api.service.AppletCommentService; -import org.jeecg.common.api.vo.Result; -import org.jeecg.config.shiro.ShiroRealm; -import org.jeecg.modules.commonBookComment.entity.CommonBookComment; -import org.jeecg.modules.commonBookComment.service.ICommonBookCommentService; -import org.jeecg.modules.commonShop.entity.CommonShop; -import org.jeecg.modules.commonShop.service.ICommonShopService; -import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -@Service -public class AppletCommentServiceImpl implements AppletCommentService { - - //权限 - @Resource - private ShiroRealm shiroRealm; - @Resource - private IHanHaiMemberService hanHaiMemberService; - @Resource - private ICommonBookCommentService commonBookCommentService; - @Resource - private ICommonShopService commonShopService; - - //查询我未读的评论次数 - @Override - public Result getMyCommentNum(String token){ - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - List n = commonBookCommentService.lambdaQuery() - .eq(CommonBookComment::getToUserId, member.getId()) - .eq(CommonBookComment::getIsLook, "N") - .list(); - return Result.OK("未读评论数",n.size()); - } - - //查询我未读的评论列表 - @Override - public Result getMyCommentList(String token, PageBean pageBean){ - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize()); - IPage pageList = commonBookCommentService - .lambdaQuery() - .eq(CommonBookComment::getToUserId, member.getId()) - .eq(CommonBookComment::getIsLook, "N") - .page(page); - //创建一个新的集合 - List commonBookComments = new ArrayList<>(); - //循环写入数据 - for (CommonBookComment commonBookComment : pageList.getRecords()) { - commonBookComment.setChildren( - commonBookCommentService.lambdaQuery() - .eq(CommonBookComment::getPid, commonBookComment.getId()) - .orderByDesc(CommonBookComment::getCreateTime) - .list() - ); - commonBookComment.setCommonShop( - commonShopService.getById(commonBookComment.getBookId()) - ); - commonBookComment.setHanHaiMember( - hanHaiMemberService.getById(commonBookComment.getUserId()) - ); - commonBookComments.add(commonBookComment); - } - pageList.setRecords(commonBookComments); - return Result.OK("查询成功",pageList); - } - - //根据书籍标识查询评论信息列表带分页 - @Override - public Result getCommentList(String bookId, PageBean pageBean){ - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - IPage pageList = commonBookCommentService - .lambdaQuery() - .eq(CommonBookComment::getBookId, bookId) - .eq(CommonBookComment::getPid, "0") - .orderByDesc(CommonBookComment::getCreateTime) - .page(page); - //创建一个新的集合 - List commonBookComments = new ArrayList<>(); - //循环写入数据 - for (CommonBookComment commonBookComment : pageList.getRecords()) { - List list = commonBookCommentService.lambdaQuery() - .eq(CommonBookComment::getPid, commonBookComment.getId()) - .orderByDesc(CommonBookComment::getCreateTime) - .list(); - //循环写入用户信息 - for (CommonBookComment bookComment : list) { - bookComment.setHanHaiMember(hanHaiMemberService.getById(bookComment.getUserId())); - } - commonBookComment.setChildren( - list - ); - commonBookComment.setCommonShop( - commonShopService.getById(commonBookComment.getBookId()) - ); - commonBookComment.setHanHaiMember( - hanHaiMemberService.getById(commonBookComment.getUserId()) - ); - commonBookComments.add(commonBookComment); - } - pageList.setRecords(commonBookComments); - return Result.OK("查询成功",pageList); - } - - //保存评论信息 - @Override - public Result saveComment(String token, String bookId, String content){ - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //根据书籍标识查询书籍是否存在 - CommonShop commonShop = commonShopService.getById(bookId); - if(commonShop==null){ - return Result.error("书籍不存在"); - } - //增加评论信息 - CommonBookComment commonBookComment = new CommonBookComment(); - commonBookComment.setBookId(bookId); - commonBookComment.setUserId(member.getId()); - commonBookComment.setComment(content); - commonBookComment.setToUserId(commonShop.getUserId()); - commonBookComment.setPid(ICommonBookCommentService.ROOT_PID_VALUE); - commonBookCommentService.save(commonBookComment); - return Result.OK("评论成功"); - } - - //删除评论信息 - @Override - public Result deleteComment(String token, String commentId){ - //查询该评论是否是你的评论 - CommonBookComment commonBookComment = commonBookCommentService.getById(commentId); - if(commonBookComment.getUserId().equals(shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token).getId())){ - commonBookCommentService.deleteCommonBookComment(commentId); - return Result.OK("删除成功"); - } - return Result.error("删除失败"); - } - - //回复评论信息 - @Override - public Result replyComment(String token, String commentId, String content){ - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - CommonBookComment commonBookComment = commonBookCommentService.getById(commentId); - if (commonBookComment == null){ - //评论不存在 - return Result.error("评论不存在"); - } - //增加评论信息 - CommonBookComment comment = new CommonBookComment(); - comment.setBookId(commonBookComment.getBookId()); - comment.setUserId(member.getId()); - comment.setComment(content); - comment.setToUserId(commonBookComment.getUserId()); - comment.setPid(commentId); - commonBookCommentService.save(comment); - return Result.ok("评论成功"); - } - - - //修改评论为已读 - @Override - public Result updateCommentRead(String token, String commentId) { - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - CommonBookComment commonBookComment = commonBookCommentService.getById(commentId); - if (commonBookComment == null) { - return Result.error("评论不存在"); - } - commonBookComment.setIsLook("Y"); - commonBookCommentService.updateById(commonBookComment); - return Result.OK("更新成功"); - } - - - //查看评论详情 - @Override - public Result getCommentDetail(String token, String commentId) { - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - CommonBookComment commonBookComment = commonBookCommentService.getById(commentId); - if (commonBookComment == null) { - return Result.error("评论不存在"); - } - //设置用户信息 - HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonBookComment.getUserId()); - commonBookComment.setHanHaiMember(hanHaiMember); - commonBookComment.setCommonShop(commonShopService.getById(commonBookComment.getBookId())); - commonBookComment.setChildren(commonBookCommentService.lambdaQuery().eq(CommonBookComment::getPid,commentId).list()); - return Result.OK(commonBookComment); - } - -} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java index 2f1f46d..0ad6990 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java @@ -19,6 +19,11 @@ import org.jeecg.modules.commonBookComment.entity.CommonBookComment; import org.jeecg.modules.commonBookComment.service.ICommonBookCommentService; import org.jeecg.modules.commonBookNovel.entity.CommonBookNovel; import org.jeecg.modules.commonBookNovel.service.ICommonBookNovelService; +import org.jeecg.modules.commonCity.entity.CommonCity; +import org.jeecg.modules.commonCity.service.ICommonCityService; +import org.jeecg.modules.commonConfig.service.ICommonConfigService; +import org.jeecg.modules.commonGet.entity.CommonGet; +import org.jeecg.modules.commonGet.service.ICommonGetService; import org.jeecg.modules.commonGiftBack.service.ICommonGiftBackService; import org.jeecg.modules.commonIconImage.entity.CommonIconImage; import org.jeecg.modules.commonIconImage.service.ICommonIconImageService; @@ -27,6 +32,8 @@ import org.jeecg.modules.commonMyBook.service.ICommonMyBookService; import org.jeecg.modules.commonMyGift.service.ICommonMyGiftService; import org.jeecg.modules.commonNotice.entity.CommonNotice; import org.jeecg.modules.commonNotice.service.ICommonNoticeService; +import org.jeecg.modules.commonOrder.entity.CommonOrder; +import org.jeecg.modules.commonOrder.service.ICommonOrderService; import org.jeecg.modules.commonRanking.entity.CommonRanking; import org.jeecg.modules.commonRanking.service.ICommonRankingService; import org.jeecg.modules.commonShop.entity.CommonShop; @@ -49,41 +56,21 @@ import java.util.Map; @Service public class AppletIndexServiceImpl implements AppletIndexService { - + //权限 + @Resource + private ShiroRealm shiroRealm; @Autowired private ICommonBannerService commonBannerService; @Autowired - private ICommonBookService commonBookService; - @Autowired - private ICommonNoticeService commonNoticeService; - @Autowired - private ICommonShopService commonShopService; - @Autowired - private ICommonShopClassService commonShopClassService; - @Autowired private ICommonIconImageService commonIconImageService; @Autowired - private ICommonRankingService commonRankingService; - - @Autowired - private ICommonMyGiftService commonMyGiftService; - @Autowired - private ICommonMyBookService commonMyBookService; - @Autowired - private ICommonMoneyLogService commonMoneyLogService; - @Autowired - private ICommonGiftBackService commonGiftBackService; - @Autowired - private ICommonBookNovelService commonBookNovelService; + private ICommonShopClassService commonShopClassService; @Autowired - private ICommonBookCommentService commonBookCommentService; + private ICommonCityService commonCityService; @Autowired - private ICommonBookAchievementService commonBookAchievementService; + private ICommonGetService commonGetService; @Autowired - private ICommonBookAchievementLogService commonBookAchievementLogService; - //权限 - @Resource - private ShiroRealm shiroRealm; + private ICommonOrderService commonOrderService; // 获取首页banner @Override @@ -93,37 +80,56 @@ public class AppletIndexServiceImpl implements AppletIndexService { } - // 获取公告列表 @Override - public Result getNotice(){ - CommonNotice commonNotice = commonNoticeService.list().get(0); - return Result.OK("公告信息",commonNotice); + public Result getAreaList(){ + List list = commonIconImageService.list(); + return Result.OK("金刚区数据",list); } - // 获取公告列表 + @Override - public Result getNoticePage(PageBean pageBean){ - Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); - IPage pageList = commonNoticeService.page(page); - return Result.OK("公告列表",pageList); + public Result getClassList(){ + List list = commonShopClassService.list(); + return Result.OK("商品分类数据",list); } - // 获取公告详情 @Override - public Result getNoticeById(String id){ - CommonNotice byId = commonNoticeService.getById(id); - return Result.OK("公告详情",byId); + public Result getFreeCityList(){ + List list = commonCityService + .lambdaQuery() + .eq(CommonCity::getPid,"0") + .list(); + //循环数据得到子集 + for (CommonCity commonCity : list) { + List children = commonCityService + .lambdaQuery() + .eq(CommonCity::getPid,commonCity.getId()) + .list(); + commonCity.setChildren(children); + } + return Result.OK("已开通包邮城市",list); } @Override - public Result getAreaList(){ - List list = commonIconImageService.list(); - return Result.OK("金刚区数据",list); + public Result getRecentGoodsList(){ + List list = commonGetService.list(); + return Result.OK("最近回收商品",list); } + //根据最近回收商品标识查看相关质量检测报告 + @Override + public Result getQualityReport(String goodsId){ + CommonGet commonGet = commonGetService + .getById(goodsId); + //质量检测报告 + CommonOrder one = commonOrderService.lambdaQuery() + .eq(CommonOrder::getId, commonGet.getOrderId()) + .one(); + return Result.OK("质量检测报告",one); + } } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoTeamServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoTeamServiceImpl.java new file mode 100644 index 0000000..4f89616 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoTeamServiceImpl.java @@ -0,0 +1,133 @@ +package org.jeecg.api.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletInfoTeamService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.commonOrder.entity.CommonOrder; +import org.jeecg.modules.commonOrder.service.ICommonOrderService; +import org.jeecg.modules.commonShop.entity.CommonShop; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class AppletInfoTeamServiceImpl implements AppletInfoTeamService { + + //权限 + @Resource + private ShiroRealm shiroRealm; + @Resource + private IHanHaiMemberService hanHaiMemberService; + @Resource + private ICommonOrderService commonOrderService; + + //获取用户信息列表带分页搜索 + @Override + public Result getInfoTeamListPage(String token,String name,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); + IPage pageList = hanHaiMemberService + .lambdaQuery() + //姓名不为空则模糊搜索 + .like(name != null,HanHaiMember::getNickName,name) + .page(page); + return Result.OK("用户信息",pageList); + } + + @Override + public Result blackUser(String token,String userId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + hanHaiMember.setIsBlack("Y"); + hanHaiMemberService.updateById(hanHaiMember); + return Result.OK("拉黑成功"); + } + + @Override + public Result upgrade(String token){ +// HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); +// hanHaiMember.setRole(2); +// hanHaiMemberService.updateById(hanHaiMember); + return Result.OK("接口未处理"); + } + + @Override + public Result getOrderListPage(String token,String userId,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); + IPage pageList = commonOrderService + .lambdaQuery() + .eq(CommonOrder::getUserId,userId) + .eq(CommonOrder::getPid,"0") + .page(page); + //循环得到下级集合 + for (CommonOrder commonOrder : pageList.getRecords()) { + //查询下级 + List children = commonOrderService + .lambdaQuery() + .eq(CommonOrder::getPid,commonOrder.getId()) + .list(); + commonOrder.setCommonOrderList(children); + } + return Result.OK("历史订单列表",pageList); + } + + + @Override + public Result getOrderDetail(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + CommonOrder commonOrder = commonOrderService.getById(orderId); + List children = commonOrderService + .lambdaQuery() + .eq(CommonOrder::getPid,commonOrder.getId()) + .list(); + commonOrder.setCommonOrderList(children); + return Result.OK("订单详情",commonOrder); + } + + @Override + public Result clickQualityReport(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder commonOrder = commonOrderService.getById(orderId); + return Result.OK("质检详情",commonOrder); + } + + + //获取员工信息列表 + @Override + public Result getMyTeamList(String token,String name,PageBean pageBean) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize()); + IPage pageList = hanHaiMemberService + .lambdaQuery() + //姓名不为空则模糊搜索 + .like(name != null, HanHaiMember::getName, name) + .eq(HanHaiMember::getRole, 1) + .page(page); + return Result.OK("员工列表", pageList); + } + + + //查看员工详情信息 + @Override + public Result getMemberInfo(String token, String id) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember memberInfo = hanHaiMemberService.getById(id); + return Result.OK("员工详情", memberInfo); + } + + @Override + public Result removeMember(String token, String id) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember memberInfo = hanHaiMemberService.getById(id); + memberInfo.setRole(0); + hanHaiMemberService.updateById(memberInfo); + return Result.OK("拉黑成功"); + } +} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java index 91ec727..89ec690 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java @@ -23,11 +23,7 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService { @Resource private ICommonMoneyLogService commonMoneyLogService; - @Override - public Result getMyMoneyNum(String token) { - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - return Result.OK("我的书币",hanHaiMember.getIntegerPrice()); - } + @Override public Result getMyMoneyLogPage(String token,Integer status, PageBean pageBean) { diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java deleted file mode 100644 index 0af0f44..0000000 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java +++ /dev/null @@ -1,183 +0,0 @@ -package org.jeecg.api.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.commons.lang3.StringUtils; -import org.jeecg.api.bean.PageBean; -import org.jeecg.api.service.AppletMyBookService; -import org.jeecg.common.api.vo.Result; -import org.jeecg.config.shiro.ShiroRealm; -import org.jeecg.modules.commonBook.entity.CommonBook; -import org.jeecg.modules.commonBookNovel.entity.CommonBookNovel; -import org.jeecg.modules.commonBookNovel.service.ICommonBookNovelService; -import org.jeecg.modules.commonMyBook.entity.CommonMyBook; -import org.jeecg.modules.commonMyBook.service.ICommonMyBookService; -import org.jeecg.modules.commonShop.entity.CommonShop; -import org.jeecg.modules.commonShop.service.ICommonShopService; -import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Date; - -@Service -public class AppletMyBookServiceImpl implements AppletMyBookService { - - //权限 - @Resource - private ShiroRealm shiroRealm; - @Autowired - private ICommonShopService commonShopService; - @Autowired - private ICommonBookNovelService commonBookNovelService; - - //获取我的作品带分页 - @Override - public Result getMyShopPage(String token, PageBean pageBean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize()); - IPage pageList = commonShopService - .lambdaQuery() - .eq(CommonShop::getUserId,hanHaiMember.getId()) - .orderByDesc(CommonShop::getCreateTime) - .page(page); - return Result.OK("我的书架",pageList); - } - - - //添加作品或者修改作品 - @Override - public Result saveOrUpdateShop(String token, CommonShop commonShop) { - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询你是否是作者 - if(member.getIsUser().equals("N")){ - return Result.error("您不是作者，无法添加作品,请完善笔名简介"); - } - commonShop.setUserId(member.getId()); - if(StringUtils.isEmpty(commonShop.getId())){ - commonShop.setToolStatus(0); - commonShop.setStatus(0);//审核状态 - commonShop.setBookStatus(0); - commonShop.setQmNum(0); - commonShop.setTuiNum(0); - commonShop.setService("大家都在读"); - commonShop.setCreateTime(new Date()); - commonShopService.save(commonShop); - }else{ - commonShopService.updateById(commonShop); - } - return Result.ok("保存成功"); - } - - - //获取我的小说章节列表带分页 - @Override - public Result getMyShopNovelPage(String token, String bookId,Integer status,Integer reverse, PageBean pageBean){ - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); - IPage commonBookNovels = commonBookNovelService - .lambdaQuery() - .eq(CommonBookNovel::getBookId,bookId) - .eq(CommonBookNovel::getStatus,status) - .page(page); - if(reverse == 0){ - commonBookNovels = commonBookNovelService - .lambdaQuery() - .select( - CommonBookNovel::getId, - CommonBookNovel::getBookId, - CommonBookNovel::getTitle, - CommonBookNovel::getSort, - CommonBookNovel::getStatus, - CommonBookNovel::getCreateTime - - ) - .eq(CommonBookNovel::getBookId,bookId) - .eq(CommonBookNovel::getStatus,status) - .orderByAsc(CommonBookNovel::getCreateTime) - .page(page); - }else{ - commonBookNovels = commonBookNovelService - .lambdaQuery() - .eq(CommonBookNovel::getBookId,bookId) - .eq(CommonBookNovel::getStatus,status) - .orderByDesc(CommonBookNovel::getCreateTime) - .page(page); - } - return Result.OK("我的小说章节列表",commonBookNovels); - } - - - - - - - - - - - - - //增加或者修改作品章节 - @Override - public Result saveOrUpdateShopNovel(String token, CommonBookNovel commonBookNovel){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //书籍标识不能为空 - if(StringUtils.isEmpty(commonBookNovel.getBookId())){ - return Result.error("书籍标识不能为空"); - } - //查询书籍是否存在 - CommonShop commonShop = commonShopService.lambdaQuery() - .eq(CommonShop::getId,commonBookNovel.getBookId()) - .eq(CommonShop::getUserId,hanHaiMember.getId()) - .one(); - if(commonShop==null){ - return Result.error("书籍不存在或者该书籍不是您的作品无法更新"); - } - if(commonBookNovel.getStatus() == null){ - //章节状态不能为空 - return Result.error("章节状态不能为空"); - } - commonBookNovel.setBookId(commonShop.getId()); - commonBookNovel.setUserId(hanHaiMember.getId()); - if(StringUtils.isEmpty(commonBookNovel.getId())){ - commonBookNovelService.save(commonBookNovel); - }else{ - commonBookNovelService.updateById(commonBookNovel); - } - return Result.OK("编辑成功!"); - } - - - //删除我的作品 - @Override - public Result deleteMyShop(String token, String bookId) { - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - commonShopService.removeById(bookId); - return Result.OK("删除成功!"); - } - - - //多选删除我的作品 - @Override - public Result deleteMyShopList(String token, String bookIds) { - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - String[] bookIdArray = bookIds.split(","); - for (String bookId : bookIdArray) { - commonShopService.removeById(bookId); - } - return Result.OK("删除成功!"); - } - - //删除我的作品章节 - @Override - public Result deleteMyShopNovel(String token, String bookId, String novelId) { - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - commonBookNovelService.removeById(novelId); - return Result.OK("删除成功!"); - } - - - -} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index b812613..2f25ade 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java @@ -14,7 +14,11 @@ import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; import org.jeecg.modules.commonMyBook.service.ICommonMyBookService; import org.jeecg.modules.commonMyGift.entity.CommonMyGift; import org.jeecg.modules.commonMyGift.service.ICommonMyGiftService; +import org.jeecg.modules.commonOrder.entity.CommonOrder; +import org.jeecg.modules.commonOrder.service.ICommonOrderService; import org.jeecg.modules.commonShop.service.ICommonShopService; +import org.jeecg.modules.commonText.entity.CommonText; +import org.jeecg.modules.commonText.service.ICommonTextService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,68 +34,56 @@ public class AppletOrderServiceImpl implements AppletOrderService { @Autowired private ICommonShopService commonShopService; @Autowired - private ICommonBookNovelService commonBookNovelService; - @Autowired - private ICommonMyGiftService commonMyGiftService; + private ICommonOrderService commonOrderService; @Autowired private ICommonMoneyLogService commonMoneyLogService; @Autowired - private ICommonGiftBackService commonGiftBackService; - @Autowired - private ICommonGiftService commonGiftService; + private ICommonTextService commonTextService; - //查询互动打赏礼物信息列表 + // 联系客服问题相关列表数据带分页 @Override - public Result getInteractionGiftList(PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - IPage pageList = commonGiftService - .lambdaQuery() - .orderByDesc(CommonGift::getCreateTime) - .page(page); - return Result.OK("互动打赏礼物信息查询成功",pageList); + public Result getQuestionList(PageBean pageBean) { + IPage page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize()); + IPage pageList = commonTextService.page(page); + return Result.OK("联系客服问题相关列表",pageList); } - - //查询我的礼物盒中的礼物列表 + // 获取订单列表信息带分页 @Override - public Result getMyGiftList(String token,PageBean pageBean) { - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - IPage pageList = commonMyGiftService - .lambdaQuery() - .eq(CommonMyGift::getUserId,member.getId()) + public Result getOrderList(String token, Integer status, PageBean pageBean) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + IPage page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize()); + IPage pageList = commonOrderService.lambdaQuery() + .eq(CommonOrder::getUserId,hanHaiMember.getId()) + .eq(status != null,CommonOrder::getStatus,status) .page(page); - return Result.OK("我的礼物列表查询成功",pageList); + return Result.OK("订单列表",pageList); } - - //根据礼物标识查询礼物详情 + // 获取订单详情 @Override - public Result getGiftDetail(String giftId) { - CommonGift commonGift = commonGiftService.getById(giftId); - return Result.OK("礼物详情查询成功",commonGift); + public Result getOrderDetail(String token, String orderId) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder commonOrder = commonOrderService.lambdaQuery() + .eq(CommonOrder::getId,orderId) + .one(); + return Result.OK("订单详情",commonOrder); } - //传入礼物标识，数量创建打赏订单 - @Override - public Result createOrder(String token, String giftId, Integer num) { - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - return Result.OK("打赏订单创建成功"); - } - - //根据礼物订单进行打赏 - @Override - public Result payOrder(String token, String orderId) { - HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - return Result.OK("打赏成功"); - } - - //支付成功支付回调 + // 取消订单 @Override - public Result paySuccess(String orderId) { - return Result.OK("支付成功"); + public Result cancelOrder(String token, String orderId) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder commonOrder = commonOrderService.lambdaQuery() + .eq(CommonOrder::getId,orderId) + .one(); + if(commonOrder.getStatus() == 0){ + commonOrder.setStatus(2); + commonOrderService.updateById(commonOrder); + } + return Result.OK("取消订单成功"); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java new file mode 100644 index 0000000..19c3084 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java @@ -0,0 +1,72 @@ +package org.jeecg.api.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.AppletOrderTeamService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; +import org.jeecg.modules.commonOrder.entity.CommonOrder; +import org.jeecg.modules.commonOrder.service.ICommonOrderService; +import org.jeecg.modules.commonShop.service.ICommonShopService; +import org.jeecg.modules.commonText.service.ICommonTextService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class AppletOrderTeamServiceImpl implements AppletOrderTeamService { + //权限 + @Resource + private ShiroRealm shiroRealm; + @Autowired + private ICommonOrderService commonOrderService; + @Autowired + private ICommonTextService commonTextService; + + //管理员：订单列表带分页搜索 + @Override + public Result getOrderListPage(String token, Integer status, PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize()); + IPage pageList = commonOrderService + .lambdaQuery() + //订单状态不为空则搜索 + .eq(status != null,CommonOrder::getStatus,status) + .page(page); + return Result.OK("订单列表",pageList); + } + + @Override + public Result getOrderDetail(String token, String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder commonOrder = commonOrderService.getById(orderId); + return Result.OK("订单详情",commonOrder); + } + + @Override + public Result passOrder(String token, String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder commonOrder = commonOrderService.getById(orderId); + commonOrder.setStatus(1); + commonOrderService.updateById(commonOrder); + return Result.OK("订单审核通过"); + } + + @Override + public Result rejectOrder(String token, String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CommonOrder commonOrder = commonOrderService.getById(orderId); + commonOrder.setStatus(2); + commonOrderService.updateById(commonOrder); + return Result.OK("订单审核拒绝"); + } + + @Override + public Result submitQualityInfo(){ + return Result.OK("提交成功"); + } +} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletWriterServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletWriterServiceImpl.java index 3189ea7..92dcd90 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletWriterServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletWriterServiceImpl.java @@ -1,6 +1,5 @@ package org.jeecg.api.service.impl; -import org.jeecg.api.service.AppletMyBookService; import org.jeecg.api.service.AppletWriterService; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; diff --git a/module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java b/module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java index 92e6e27..63e08dd 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java +++ b/module-common/src/main/java/org/jeecg/modules/commonCity/entity/CommonCity.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import java.math.BigDecimal; 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 lombok.Data; @@ -14,6 +15,7 @@ import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.UnsupportedEncodingException; +import java.util.List; /** * @Description: 开通包邮城市 @@ -67,4 +69,8 @@ public class CommonCity implements Serializable { @Excel(name = "开通情况", width = 15) @ApiModelProperty(value = "开通情况") private java.lang.String open; + + + @TableField (exist = false) + private List children; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonGet/entity/CommonGet.java b/module-common/src/main/java/org/jeecg/modules/commonGet/entity/CommonGet.java index fe2ddfa..5c9d949 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonGet/entity/CommonGet.java +++ b/module-common/src/main/java/org/jeecg/modules/commonGet/entity/CommonGet.java @@ -67,4 +67,8 @@ public class CommonGet implements Serializable { @Excel(name = "价格", width = 15) @ApiModelProperty(value = "价格") private java.math.BigDecimal price; + /**相关订单*/ + @Excel(name = "相关订单", width = 15) + @ApiModelProperty(value = "相关订单") + private java.lang.String orderId; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java index 315b9e6..1d37bf3 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import java.math.BigDecimal; 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 lombok.Data; @@ -14,6 +15,7 @@ import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.UnsupportedEncodingException; +import java.util.List; /** * @Description: 订单信息表 @@ -169,4 +171,9 @@ public class CommonOrder implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "name", dicCode = "id") @ApiModelProperty(value = "质检员") private java.lang.String isUserId; + + + @TableField (exist=false) + private List commonOrderList; + } diff --git a/module-common/src/main/java/org/jeecg/modules/commonShopClass/entity/CommonShopClass.java b/module-common/src/main/java/org/jeecg/modules/commonShopClass/entity/CommonShopClass.java index 2415aef..4773302 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShopClass/entity/CommonShopClass.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShopClass/entity/CommonShopClass.java @@ -60,4 +60,8 @@ public class CommonShopClass implements Serializable { @Dict(dicCode = "yn") @ApiModelProperty(value = "是否有子节点") private java.lang.String hasChild; + /**分类图片*/ + @Excel(name = "分类图片", width = 15) + @ApiModelProperty(value = "分类图片") + private java.lang.String icon; }