diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java index 149605de..fac56c2f 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java @@ -100,4 +100,25 @@ public class AuthenticationUtils { throw new JeroBootException("数据同步失败!"); } } + + /** + * 调用会员系统post接口 + * @param methodName + * @param requestParam + * @param requestBody + */ + public static void postStandards(String methodName,String requestParam,Object requestBody) { + Map stringStringMap = encryptByRsaPriKey(); + String publicKey = stringStringMap.get("publicKey"); + String token = stringStringMap.get("token"); + String jsonString = JSONObject.toJSONString(requestBody); + //拼接url路径 + StringBuilder urlBuilder = new StringBuilder(AuthenticationUtils.URL); + urlBuilder.append(methodName).append("?publicKey=").append(publicKey).append("&pushToken=").append(token); + if (StrUtil.isNotBlank(requestParam)){ + urlBuilder.append(requestParam); + } + String post = HttpUtil.post(urlBuilder.toString(), jsonString); + checkResult(post); + } } diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java deleted file mode 100644 index cb176626..00000000 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jero.common.util; - -import org.jetbrains.annotations.NotNull; -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; - -/** - * Spring 上下文工具类 - * @author liJiaRao - * @date 2021-09-16 15:05 - */ -@Component -public class SpringContextUtil implements ApplicationContextAware { - private static ApplicationContext applicationContext; - - @Override - public void setApplicationContext(@NotNull ApplicationContext applicationContext) throws BeansException { - SpringContextUtil.applicationContext = applicationContext; - } - - /** - * 获取上下文 - */ - public static ApplicationContext getApplicationContext() { - return applicationContext; - } - - /** - * 通过 bena 名称获取上下文中的 bean - */ - public static Object getBean(String name) { - return applicationContext.getBean(name); - } - - /** - * 通过类型获取上下文中的bean - */ - public static Object getBean(Class requiredType) { - return applicationContext.getBean(requiredType); - } -} diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java index 0b2fdcfb..1eee1e4a 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java @@ -1,9 +1,8 @@ package com.jero.config.shiro.filters; import cn.hutool.core.util.StrUtil; -import com.jero.common.system.util.JwtUtil; import com.jero.common.util.AuthenticationUtils; -import com.jero.common.util.SpringContextUtil; +import com.jero.common.util.SpringContextUtils; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter; @@ -69,7 +68,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { if (StrUtil.isNotBlank(pushToken)){ String publicKey = httpServletRequest.getParameter("publicKey"); if (authenticationUtils ==null ){ - authenticationUtils = (AuthenticationUtils) SpringContextUtil.getBean("authenticationUtils"); + authenticationUtils = (AuthenticationUtils) SpringContextUtils.getBean("authenticationUtils"); } authenticationUtils.check(pushToken,publicKey); }else { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 60e77d36..f606fe96 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -265,6 +265,7 @@ public class PayMailBillController extends JeroController { Result addPayBill(PayMailBillVO payMailBill); - + void pushSendToStandards(PayMailBill payMailBill, String id); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 45566552..5b852de7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -15,6 +15,7 @@ import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.oConvertUtils; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.mail.PayMailBillVO; +import com.jero.mail.entity.BillingInfo; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.entity.PayMailBillSearch; @@ -116,22 +117,19 @@ public class PayMailBillServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMailBillProject::getProjectId, bmpList.get(i).getId()); + wrapper.eq(PayMailBillProject::getProjectId, id); wrapper.eq(PayMailBillProject::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5); List type5List = payMailBillProjectService.list(wrapper); if (type5List != null && type5List.size() > 0) { throw new JeroBootException("标协会员项目,只能开票一次。"); } - Map stringStringMap = AuthenticationUtils.encryptByRsaPriKey(); - String publicKey = stringStringMap.get("publicKey"); - String token = stringStringMap.get("token"); - String jsonString1 = JSONObject.toJSONString(payMailBill); - String post = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/addStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString1); - AuthenticationUtils.checkResult(post); + //推送开票数据到会员系统 + pushBillToStandards(payMailBill, id); } } @@ -163,6 +161,44 @@ public class PayMailBillServiceImpl extends ServiceImpl stringStringMap = AuthenticationUtils.encryptByRsaPriKey(); + String publicKey = stringStringMap.get("publicKey"); + String token = stringStringMap.get("token"); + String jsonString1 = JSONObject.toJSONString(billingInfo); + String post = HttpUtil.post(AuthenticationUtils.URL + "/billingInfo/billingInfo/postFromPayment?publicKey=" + publicKey + "&pushToken=" + token, jsonString1); + AuthenticationUtils.checkResult(post); + } + //校验不同项目是否属于同一个公司 private String checkCompanyProject(List bmpList) { @@ -171,7 +207,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 @@ -330,7 +366,7 @@ public class PayMailBillServiceImpl extends ServiceImpl