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 6a875662..e7ef8bbd 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 @@ -121,4 +121,19 @@ public class AuthenticationUtils { String post = HttpUtil.post(urlBuilder.toString(), jsonString); checkResult(post); } + + /** + * 调用会员系统post接口 + * @param methodName + */ + public static void post(String methodName, HashMap paramMap) { + Map stringStringMap = encryptByRsaPriKey(); + paramMap.put("token", stringStringMap.get("token")); + paramMap.put("publicKey", stringStringMap.get("publicKey")); + //拼接url路径 + StringBuilder urlBuilder = new StringBuilder(AuthenticationUtils.URL); + urlBuilder.append(methodName); + String post = HttpUtil.post(urlBuilder.toString(), paramMap); + checkResult(post); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index f5a6a7cb..731a39e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.vo.TbCheckVo; import com.jero.project.entity.PayCommonProject; import com.jero.project.vo.PayCommonProjectOutput; import org.springframework.web.servlet.ModelAndView; @@ -37,7 +38,7 @@ public interface IPayPaymentRecordService extends IService { * 添加一个来款 * @param payPaymentRecord */ - void addOneAmountReceived(PayPaymentRecord payPaymentRecord); + void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List typr5List); /** * 标协会员添加来款 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 45322dbb..4e6e2441 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -18,6 +18,7 @@ import com.jero.member.mapper.TbMemberProjectSubitemMapper; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.mapper.PayPaymentRecordMapper; import com.jero.payment.service.IPayPaymentRecordService; +import com.jero.payment.vo.TbCheckVo; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayCommonProjectMapper; @@ -32,11 +33,11 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.transaction.Transactional; import java.beans.Transient; import java.math.BigDecimal; import java.util.*; @@ -48,6 +49,7 @@ import java.util.stream.Collectors; * @Date: 2021-08-31 * @Version: V1.0 */ +@Transactional(rollbackFor = Exception.class) @Service public class PayPaymentRecordServiceImpl extends ServiceImpl implements IPayPaymentRecordService { @Resource @@ -84,11 +86,19 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl list){ + List typr5List = new ArrayList<>(); for(PayPaymentRecord payPaymentRecord : list){ - addOneAmountReceived(payPaymentRecord); + addOneAmountReceived(payPaymentRecord,typr5List); + + } + + if(typr5List !=null && typr5List.size()>0){ +// HashMap paramMap = new HashMap<>(); +// paramMap.put("voList",typr5List); + AuthenticationUtils.post("/paymentInfo/incomingPaymentCheck",null,typr5List); } } @@ -97,7 +107,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl typr5List){ BigDecimal receivableAmount; Boolean isAdd; @@ -211,7 +221,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl map = AuthenticationUtils.encryptByRsaPriKey(); - - HashMap paramMap = new HashMap<>(); - - paramMap.put("token", map.get("token")); - paramMap.put("publicKey", map.get("publicKey")); - paramMap.put("id",tbMember.getTbPaymentId()); - paramMap.put("checkMark",payPaymentRecord.getRemark()); - - String result3= HttpUtil.get(url+"/paymentInfo/incomingPaymentCheck", paramMap); - } - /** * 导出 * @param request diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java new file mode 100644 index 00000000..bce4f126 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java @@ -0,0 +1,15 @@ +package com.jero.payment.vo; + +import lombok.Data; + +/** + * 标协会员审核缴费vo + */ +@Data +public class TbCheckVo { + + //缴费id + private String id; + //备注 + private String checkMark; +}