From 4a258aa45b26552e3ede1a3d1a2f6816ddea1868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 6 Jun 2023 16:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E7=9F=AD=E4=BF=A1=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/CustomSalaryAcctRecordWrapper.java | 58 -------------------
 .../salary/CustomSalarySendWrapper.java       | 47 ---------------
 .../salary/wrapper/SalarySendWrapper.java     |  2 +-
 3 files changed, 1 insertion(+), 106 deletions(-)
 delete mode 100644 src/com/customization/salary/CustomSalaryAcctRecordWrapper.java
 delete mode 100644 src/com/customization/salary/CustomSalarySendWrapper.java

diff --git a/src/com/customization/salary/CustomSalaryAcctRecordWrapper.java b/src/com/customization/salary/CustomSalaryAcctRecordWrapper.java
deleted file mode 100644
index 1def59641..000000000
--- a/src/com/customization/salary/CustomSalaryAcctRecordWrapper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.customization.salary;
-
-
-import com.engine.core.cfg.annotation.ServiceDynamicProxy;
-import com.engine.core.cfg.annotation.ServiceMethodDynamicProxy;
-import com.engine.core.impl.aop.AbstractServiceProxy;
-import com.engine.salary.entity.salaryacct.dto.SalaryAcctRecordListDTO;
-import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam;
-import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordSaveParam;
-import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.wrapper.SalaryAcctRecordWrapper;
-import com.engine.salary.wrapper.proxy.SalaryAcctRecordWrapperProxy;
-import weaver.general.BaseBean;
-
-import java.util.Collection;
-import java.util.Map;
-
-
-@ServiceDynamicProxy(target = SalaryAcctRecordWrapper.class, desc = "薪资核算")
-public class CustomSalaryAcctRecordWrapper extends AbstractServiceProxy implements SalaryAcctRecordWrapperProxy {
-
-    @Override
-    public PageInfo<SalaryAcctRecordListDTO> listPage(SalaryAcctRecordQueryParam queryParam) {
-        return null;
-    }
-
-    @Override
-    public Map<String, Object> getForm(Long id) {
-        return null;
-    }
-
-    @Override
-    public Long save(SalaryAcctRecordSaveParam saveParam) {
-        return null;
-    }
-
-    @Override
-    public void delete(Collection<Long> ids) {
-    }
-
-    @Override
-    public void file(Long id) {
-    }
-
-    @Override
-    @ServiceMethodDynamicProxy(desc = "重新核算前，验证....")
-    public void reCalculate(Long id) {
-
-        BaseBean baseBean = new BaseBean();
-        baseBean.writeLog("拦截薪酬重新核算方法...");
-
-        //todo do some thing
-
-        executeMethod(id);
-
-        //todo do some thing
-    }
-}
\ No newline at end of file
diff --git a/src/com/customization/salary/CustomSalarySendWrapper.java b/src/com/customization/salary/CustomSalarySendWrapper.java
deleted file mode 100644
index 815b9b611..000000000
--- a/src/com/customization/salary/CustomSalarySendWrapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.customization.salary;
-
-import com.engine.common.util.ServiceUtil;
-import com.engine.core.cfg.annotation.ServiceDynamicProxy;
-import com.engine.core.cfg.annotation.ServiceMethodDynamicProxy;
-import com.engine.core.impl.aop.AbstractServiceProxy;
-import com.engine.salary.entity.salaryBill.param.SalarySendGrantParam;
-import com.engine.salary.entity.salaryBill.param.SalarySendWithdrawParam;
-import com.engine.salary.service.SalaryBillService;
-import com.engine.salary.service.impl.SalaryBillServiceImpl;
-import com.engine.salary.wrapper.SalarySendWrapper;
-import com.engine.salary.wrapper.proxy.SalarySendWrapperProxy;
-import weaver.hrm.User;
-
-import java.util.List;
-import java.util.Map;
-
-@ServiceDynamicProxy(target = SalarySendWrapper.class, desc = "工资单发送")
-public class CustomSalarySendWrapper extends AbstractServiceProxy implements SalarySendWrapperProxy {
-
-    private SalaryBillService getSalaryBillService(User user) {
-        return ServiceUtil.getService(SalaryBillServiceImpl.class, user);
-    }
-
-    @Override
-    @ServiceMethodDynamicProxy(desc = "拦截工资单发送方法")
-    public Map<String, Object> grant(SalarySendGrantParam queryParam) {
-        Long salarySendId = queryParam.getSalarySendId();
-        List<Long> ids = queryParam.getIds();
-        List<Map<String, Object>> sendInfoList = getSalaryBillService(new User()).getSendInfoList(salarySendId, ids);
-        //解析sendInfoList，拼接短信内容
-        System.out.println("发送短信");
-
-        //todo do some thing
-
-        Map<String, Object> result = (Map<String, Object>) executeMethod(queryParam);
-
-        //todo do some thing
-
-        return result;
-    }
-
-    @Override
-    public Map<String, Object> withdraw(SalarySendWithdrawParam queryParam) {
-        return null;
-    }
-}
diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java
index e37266402..5697495f4 100644
--- a/src/com/engine/salary/wrapper/SalarySendWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java
@@ -356,7 +356,7 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy
      * @return
      */
     public Map<String, Object> grant(SalarySendGrantParam queryParam) {
-        return getSalarySendService(user).grant(queryParam);
+        return getSalaryBillService(user).grant(queryParam);
     }
 
     /**