1

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java

@@ -508,7 +508,11 @@ public class OrderServiceImpl implements OrderService {
         if(order==null){
             return Result.error("订单不存在", null);
         }
-        order.setStatus(2);
+        if ("0".equals(order.getPayType())){
+            order.setStatus(3);
+        }else {
+            order.setStatus(2);
+        }
         employOrderService.updateById(order);
         return Result.OK("订单确认成功", order);
 
@@ -523,7 +527,12 @@ public class OrderServiceImpl implements OrderService {
         if(order==null){
             return Result.error("订单不存在", null);
         }
-        order.setStatus(3);
+        if("0".equals(order.getPayType())){
+            order.setStatus(5);
+            addMemberAmount(member, order.getPayMoney(), "试工费用到账：" + order.getTitle());
+        }else {
+            order.setStatus(3);
+        }
         employOrderService.updateById(order);
         return Result.OK("操作成功");
     }
@@ -561,19 +570,24 @@ public class OrderServiceImpl implements OrderService {
 
             subtractMemberAmount(hanHaiMember, payPrice, "企业支付：" + order.getTitle());
 
-            //给求职者钱包加钱
-            try {
-                EmployResume resume = employResumeService.getById(order.getResumeId());
+            if ("0".equals(order.getPayType())){//先付后试用
+                order.setStatus(2);
+            }else {//先试用后付
+                //给求职者钱包加钱
+                try {
+                    EmployResume resume = employResumeService.getById(order.getResumeId());
 
-                HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
+                    HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
 
-                addMemberAmount(member, order.getPayMoney(), "试工费用到账：" + order.getTitle());
-            }catch (Exception e){
-                log.error("求职者数据丢失，金额：{}无法到账，订单号：{}", order.getPayMoney(), order.getId());
+                    addMemberAmount(member, order.getPayMoney(), "试工费用到账：" + order.getTitle());
+                }catch (Exception e){
+                    log.error("求职者数据丢失，金额：{}无法到账，订单号：{}", order.getPayMoney(), order.getId());
+                }
+
+                //修改订单状态
+                order.setStatus(4);
             }
 
-            //修改订单状态
-            order.setStatus(4);
             employOrderService.updateById(order);
 
             return Result.OK("余额支付成功",order);
@@ -622,7 +636,23 @@ public class OrderServiceImpl implements OrderService {
 
 
 
+    //试工费用
     public void addMemberAmount(HanHaiMember hanHaiMember, BigDecimal payPrice, String title){
+
+        List<EmployConfig> commission = employConfigService.lambdaQuery()
+                .eq(EmployConfig::getParamCode, "commission")
+                .list();
+
+        if (commission.size() > 0){
+            EmployConfig employConfig = commission.get(0);
+            try {
+                String val = employConfig.getParamValueText();
+                payPrice = payPrice.divide(new BigDecimal(val));
+            }catch (Exception e){
+                log.error(e.getMessage());
+            }
+        }
+
         hanHaiMember.setPrice(hanHaiMember.getPrice().add(payPrice));
         hanHaiMemberService.updateById(hanHaiMember);
         //增加金额明细
@@ -686,20 +716,24 @@ public class OrderServiceImpl implements OrderService {
         }
 
 
-        //给求职者钱包加钱
-        try {
-            EmployResume resume = employResumeService.getById(order.getResumeId());
+        if("0".equals(order.getPayType())){//先付后试用
+            order.setStatus(2);
+        }else {//先试用后付
+            //给求职者钱包加钱
+            try {
+                EmployResume resume = employResumeService.getById(order.getResumeId());
 
-            HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
+                HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
 
-            addMemberAmount(member, order.getPayMoney(), "企业支付到账：" + order.getTitle());
-        }catch (Exception e){
-            log.error("求职者数据丢失，金额：{}无法到账，订单号：{}", order.getPayMoney(), order.getId());
-        }
+                addMemberAmount(member, order.getPayMoney(), "企业支付到账：" + order.getTitle());
+            }catch (Exception e){
+                log.error("求职者数据丢失，金额：{}无法到账，订单号：{}", order.getPayMoney(), order.getId());
+            }
 
 
-        //修改订单状态
-        order.setStatus(4);
+            //修改订单状态
+            order.setStatus(4);
+        }
 
         order.setOrderStatus("Y");
         employOrderService.updateById(order);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java

@@ -79,6 +79,7 @@ public class SeekServiceImpl implements SeekService {
 
         List<EmployOrder> list = employOrderService.lambdaQuery()
                 .orderByDesc(EmployOrder::getStatus, EmployOrder::getCreateTime)
+                .ne(EmployOrder::getStatus, 6)
                 .eq(EmployOrder::getSeekId, one.getId()).list();
 
         for (EmployOrder employOrder : list) {