From d285ba48d5d320ce3f6d15198f4f7a09957fbf05 Mon Sep 17 00:00:00 2001 From: hly <2783385703@qq.com> Date: Fri, 29 Aug 2025 15:28:23 +0800 Subject: [PATCH] 1 --- .../modules/employOrder/entity/EmployOrder.java | 4 +-- .../api/employController/OrderController.java | 8 +++--- .../org/jeecg/modules/apiService/OrderService.java | 4 +-- .../modules/apiService/impl/OrderServiceImpl.java | 32 ++++++++++++++++++---- .../src/main/resources/application-dev.yml | 2 +- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employOrder/entity/EmployOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employOrder/entity/EmployOrder.java index d60788f..ed20f98 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employOrder/entity/EmployOrder.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employOrder/entity/EmployOrder.java @@ -186,8 +186,8 @@ public class EmployOrder implements Serializable { @Excel(name = "求职者支付微信订单号", width = 15) @ApiModelProperty(value = "求职者支付微信订单号") private java.lang.String orderNoSeek; - @Excel(name = "求职者支付状态", width = 15) - @ApiModelProperty(value = "求职者支付状态") + @Excel(name = "保险费支付状态", width = 15) + @ApiModelProperty(value = "保险费支付状态") private java.lang.String orderStatusSeek; @Excel(name = "交通费", width = 15) 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 7b8f19f..a9faf14 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 @@ -64,8 +64,8 @@ public class OrderController { //订单信息-立即支付 @ApiOperation(value="订单信息-立即支付", notes="订单信息-立即支付") @RequestMapping(value = "/payOrder", method = {RequestMethod.POST}) - public Result payOrder(@RequestHeader("X-Access-Token")String token, String orderId,Integer payType){ - return orderService.payOrder(token, orderId,payType); + public Result payOrder(@RequestHeader("X-Access-Token")String token, String orderId,Integer payType, String buyInsurance){ + return orderService.payOrder(token, orderId,payType, buyInsurance); } //订单信息-取消订单 @@ -99,8 +99,8 @@ public class OrderController { //企业支付 @ApiOperation(value="订单信息-企业支付", notes="订单信息-企业支付") @RequestMapping(value = "/payOrderCompany", method = {RequestMethod.POST}) - public Result payOrderCompany(@RequestHeader("X-Access-Token")String token, String orderId,Integer payType, BigDecimal fare){ - return orderService.payOrderCompany(token, orderId,payType, fare); + public Result payOrderCompany(@RequestHeader("X-Access-Token")String token, String orderId,Integer payType, BigDecimal fare, String buyInsurance){ + return orderService.payOrderCompany(token, orderId,payType, fare, buyInsurance); } //求职者确认企业已结款 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 aea6a62..2f66928 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 @@ -26,7 +26,7 @@ public interface OrderService { //订单信息-立即支付 - public Result payOrder(String token, String orderId,Integer payType); + public Result payOrder(String token, String orderId,Integer payType, String buyInsurance); @@ -51,7 +51,7 @@ public interface OrderService { //企业支付 - public Result payOrderCompany(String token, String orderId,Integer payType, BigDecimal fare); + public Result payOrderCompany(String token, String orderId,Integer payType, BigDecimal fare, String buyInsurance); //确认企业已结款 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 d03b2cd..991e046 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 @@ -263,7 +263,7 @@ public class OrderServiceImpl implements OrderService { //订单信息-求职者支付保险 @Override - public Result payOrder(String token, String orderId,Integer payType){ + public Result payOrder(String token, String orderId,Integer payType, String buyInsurance){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //根据订单标识查询订单信息 EmployOrder order = employOrderService.getById(orderId); @@ -275,13 +275,19 @@ public class OrderServiceImpl implements OrderService { BigDecimal payPrice = order.getPremium(); + if ("false".equals(buyInsurance)){ + order.setOrderNoSeek("N"); + employOrderService.updateById(order); + return Result.OK("拒绝支付"); + } + if(payType == 1){ //余额支付 if(hanHaiMember.getPrice().compareTo(payPrice)==-1){ return Result.error("余额不足"); } subtractMemberAmount(hanHaiMember, payPrice, "支付保险费：" + order.getTitle()); - + order.setOrderNoSeek("Y"); return Result.OK("余额支付成功",order); }else{ @@ -289,8 +295,7 @@ public class OrderServiceImpl implements OrderService { String idStr = IdWorker.getIdStr(); order.setOrderNoSeek(idStr); - - employOrderService.updateById(order); + order.setOrderNoSeek("Y"); //吊起微信支付 Object appOrder = mpWxPayService.createOrder( @@ -303,6 +308,7 @@ public class OrderServiceImpl implements OrderService { order.toString(), "/employ/order/payNotify" ); + employOrderService.updateById(order); return Result.OK("微信支付成功",appOrder); } @@ -540,7 +546,7 @@ public class OrderServiceImpl implements OrderService { //企业支付 @Override - public Result payOrderCompany(String token, String orderId, Integer payType, BigDecimal fare){//fare交通费 + public Result payOrderCompany(String token, String orderId, Integer payType, BigDecimal fare, String buyInsurance){//fare交通费 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //根据订单标识查询订单信息 EmployOrder order = employOrderService.getById(orderId); @@ -556,7 +562,7 @@ public class OrderServiceImpl implements OrderService { order.setOrderNoMoney(order.getPayMoney().add(fare)); - if (order.getType() == 1){//企业招聘求职者，需要企业支付保险费用 + if (order.getType() == 1 && "true".equals(buyInsurance)){//企业招聘求职者，需要企业支付保险费用 order.setOrderNoMoney(order.getOrderNoMoney().add(order.getPremium())); } @@ -580,6 +586,13 @@ public class OrderServiceImpl implements OrderService { HanHaiMember member = hanHaiMemberService.getById(resume.getUserId()); addMemberAmount(member, order.getPayMoney(), "试工费用到账：" + order.getTitle()); + + order.setOrderStatus("Y"); + if ("true".equals(buyInsurance)){ + order.setOrderStatusSeek("Y"); + }else { + order.setOrderStatusSeek("N"); + } }catch (Exception e){ log.error("求职者数据丢失，金额：{}无法到账，订单号：{}", order.getPayMoney(), order.getId()); } @@ -736,6 +749,13 @@ public class OrderServiceImpl implements OrderService { } order.setOrderStatus("Y"); + + if (order.getOrderNoMoney().compareTo(order.getPayMoney()) > 0){ + order.setOrderStatusSeek("Y"); + }else { + order.setOrderStatusSeek("N"); + } + employOrderService.updateById(order); return "" + diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index a9f05b3..fa85f8b 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8002 + port: 8003 tomcat: max-swallow-size: -1 error: