diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/AmountController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/AmountController.java index 3179ddf..628c2ce 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/AmountController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/AmountController.java @@ -53,7 +53,7 @@ public class AmountController { return amountService.payNotify(requestBody); } - @ApiOperation(value="我的钱包-金额明细", notes="我的钱包-金额明细") + @ApiOperation(value="我的钱包-金额明细", notes="type 0-收入 1-支出") @RequestMapping(value = "/amountLog", method = {RequestMethod.GET}) public Result amountLog(@RequestHeader("X-Access-Token") String token, String type, PageBean pageBean){ return amountService.amountLog(token, type, pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/OrderController.java index aacf90b..eac7098 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/OrderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/OrderController.java @@ -33,6 +33,13 @@ public class OrderController { return orderService.queryOrderList(token, status, role, pageBean); } + //订单信息-查看订单详情 + @ApiOperation(value="订单信息-根据订单id查看订单详情", notes="订单信息-根据订单id查看订单详情") + @RequestMapping(value = "/queryOrderById", method = {RequestMethod.POST}) + public Result queryOrderById(@RequestHeader("X-Access-Token")String token, String orderId){ + return orderService.queryOrderById(token, orderId); + } + //订单信息-添加订单 @ApiOperation(value="订单信息-添加订单", notes="订单信息-添加订单") @RequestMapping(value = "/addOrder", method = {RequestMethod.POST}) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java index 8b9c2c2..114bf94 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java @@ -13,6 +13,9 @@ public interface OrderService { //订单信息-查看订单列表 public Result queryOrderList(@RequestHeader("X-Access-Token")String token, String status, String role, PageBean pageBean); + //订单信息-查看订单详情 + public Result queryOrderById(@RequestHeader("X-Access-Token")String token, String orderId); + //订单信息-添加订单 public Result addOrder(@RequestHeader("X-Access-Token")String token, EmployOrder employOrder); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java index d59458c..a48d25a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java @@ -9,12 +9,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.AmountService; -import org.jeecg.modules.apiService.OrderService; import org.jeecg.modules.employAmountLog.entity.EmployAmountLog; import org.jeecg.modules.employAmountLog.service.IEmployAmountLogService; -import org.jeecg.modules.employAuthenticationCompany.service.IEmployAuthenticationCompanyService; -import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; -import org.jeecg.modules.employNews.entity.EmployNews; import org.jeecg.modules.employTrade.entity.EmployTrade; import org.jeecg.modules.employTrade.service.IEmployTradeService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -92,7 +88,7 @@ public class AmountServiceImpl implements AmountService { //我的钱包-提现 @Override public Result CashOut(String token) { - return null; + return Result.OK("接口内容暂未完成"); } //我的钱包-充值 @@ -179,8 +175,7 @@ public class AmountServiceImpl implements AmountService { @Override public Result amountLog(String token, String type, PageBean pageBean) { //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - HanHaiMember hanHaiMember = hanHaiMemberService.getById("1889615338279010306"); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 String message = "获取金额明细列表失败!"; //金额明细列表 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index 6caf1c6..1a645b3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -12,11 +12,9 @@ import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationP import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; import org.jeecg.modules.employJob.entity.EmployJob; import org.jeecg.modules.employJob.service.IEmployJobService; -import org.jeecg.modules.employNews.entity.EmployNews; import org.jeecg.modules.employOrder.entity.EmployOrder; import org.jeecg.modules.employOrder.service.IEmployOrderService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -40,9 +38,6 @@ public class OrderServiceImpl implements OrderService { @Resource private IEmployAuthenticationPersonService employAuthenticationPersonService; - - @Resource - private IHanHaiMemberService hanHaiMemberService; /******************************************************************************************************************/ //订单信息-查看订单列表 @@ -131,6 +126,69 @@ public class OrderServiceImpl implements OrderService { } } + //订单信息-查看订单详情 + @Override + public Result queryOrderById(String token, String orderId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 + String message = "订单详情查询失败!"; + + try{ + EmployOrder employOrder = employOrderService.getById(orderId); + + if(null != employOrder){ + //招聘工作信息 + EmployJob employJob = employJobService.getById(employOrder.getJobId()); + if(null != employJob){ + employOrder.setEmployJob(employJob); + } + + //招聘方企业实名信息 + EmployAuthenticationCompany employAuthenticationCompany = employAuthenticationCompanyService + .lambdaQuery() + .eq(EmployAuthenticationCompany::getUserId, employOrder.getBossId()) + .one(); + if(null != employAuthenticationCompany){ + employOrder.setEmployAuthenticationCompany(employAuthenticationCompany); + } + + //招聘方个人实名信息 + EmployAuthenticationPerson boss = employAuthenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, employOrder.getBossId()) + .one(); + if(null != boss){ + employOrder.setEmployAuthenticationPersonBoss(boss); + } + + //求职方个人实名信息 + EmployAuthenticationPerson employee = employAuthenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, employOrder.getEmployeeId()) + .one(); + if(null != employee){ + employOrder.setEmployAuthenticationPersonEmployee(employee); + } + } + + //判断执行结果 + if(null != employOrder){ + message = "订单详情"; + }else { + message = "该订单不存在"; + } + + //返回执行结果 + return Result.OK(message, employOrder); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + } + //订单信息-添加订单 @Override public Result addOrder(String token, EmployOrder employOrder) {