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 8871ea4..28be455 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 @@ -276,7 +276,7 @@ public class OrderServiceImpl implements OrderService { if ("false".equals(buyInsurance)){ - order.setOrderNoSeek("N"); + order.setOrderStatusSeek("N"); employOrderService.updateById(order); return Result.OK("拒绝支付"); } @@ -287,7 +287,7 @@ public class OrderServiceImpl implements OrderService { return Result.error("余额不足"); } subtractMemberAmount(hanHaiMember, payPrice, "支付保险费:" + order.getTitle()); - order.setOrderNoSeek("Y"); + order.setOrderStatusSeek("Y"); return Result.OK("余额支付成功",order); }else{ @@ -295,14 +295,18 @@ public class OrderServiceImpl implements OrderService { String idStr = IdWorker.getIdStr(); order.setOrderNoSeek(idStr); - order.setOrderNoSeek("Y"); + order.setOrderStatusSeek("Y"); + int price = payPrice.multiply(new BigDecimal(100)).intValue(); + if (mpWxPayService.dev){ + price = 1; + } //吊起微信支付 Object appOrder = mpWxPayService.createOrder( "购买"+order.getTitle(), "127.0.0.1", idStr, - payPrice.multiply(new BigDecimal(100)).intValue(), + price, idStr, hanHaiMember.getAppletOpenid(), order.toString(), @@ -540,6 +544,15 @@ public class OrderServiceImpl implements OrderService { EmployResume resume = employResumeService.getById(order.getResumeId()); HanHaiMember jobSeeker = hanHaiMemberService.getById(resume.getUserId()); addMemberAmount(jobSeeker, order.getPayMoney(), "试工费用到账:" + order.getTitle()); + + // 如果有求职信息,将求职信息状态设置为已完成 + if(order.getSeekId() != null && StringUtils.isNotBlank(order.getSeekId())){ + EmploySeek seek = employSeekService.getById(order.getSeekId()); + if(seek != null){ + seek.setSeekStatus(2); // 设置为已完成状态 + employSeekService.updateById(seek); + } + } } catch (Exception e) { log.error("求职者数据丢失,金额:{}无法到账,订单号:{}", order.getPayMoney(), order.getId()); return Result.error("求职者信息异常,无法结算试工费用"); @@ -571,7 +584,7 @@ public class OrderServiceImpl implements OrderService { order.setOrderNoMoney(order.getPayMoney().add(fare)); if (order.getType() == 1 && "true".equals(buyInsurance)){//企业招聘求职者,需要企业支付保险费用 - order.setOrderNoMoney(order.getOrderNoMoney().add(order.getPremium())); +// order.setOrderNoMoney(order.getOrderNoMoney().add(order.getPremium())); } BigDecimal payPrice = order.getOrderNoMoney(); @@ -595,12 +608,12 @@ public class OrderServiceImpl implements OrderService { addMemberAmount(member, order.getPayMoney(), "试工费用到账:" + order.getTitle()); - order.setOrderStatus("Y"); - if ("true".equals(buyInsurance)){ - order.setOrderStatusSeek("Y"); - }else { - order.setOrderStatusSeek("N"); - } +// order.setOrderStatus("Y"); +// if ("true".equals(buyInsurance)){ +// order.setOrderStatusSeek("Y"); +// }else { +// order.setOrderStatusSeek("N"); +// } }catch (Exception e){ log.error("求职者数据丢失,金额:{}无法到账,订单号:{}", order.getPayMoney(), order.getId()); } @@ -619,13 +632,16 @@ public class OrderServiceImpl implements OrderService { order.setOrderNo(idStr); employOrderService.updateById(order); - + int price = payPrice.multiply(new BigDecimal(100)).intValue(); + if (mpWxPayService.dev){ + price = 1; + } //吊起微信支付 Object appOrder = mpWxPayService.createOrder( "支付"+order.getTitle(), "127.0.0.1", idStr, - payPrice.multiply(new BigDecimal(100)).intValue(), + price, idStr, hanHaiMember.getAppletOpenid(), order.toString(), 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 fa85f8b..a9f05b3 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: 8003 + port: 8002 tomcat: max-swallow-size: -1 error: