批量来款

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<String, Object> paramMap) {
+        Map<String, String> 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);
+    }
 }

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<PayPaymentRecord> {
      * 添加一个来款
      * @param payPaymentRecord
      */
-    void addOneAmountReceived(PayPaymentRecord payPaymentRecord);
+    void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List<TbCheckVo> typr5List);
 
     /**
      * 标协会员添加来款

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<PayPaymentRecordMapper, PayPaymentRecord> implements IPayPaymentRecordService {
     @Resource
@@ -84,11 +86,19 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     /**
      * 添加来款记录
      */
-    @Transactional
+//    @Transactional
     @Override
     public void addAmountReceived(List<PayPaymentRecord> list){
+        List<TbCheckVo> typr5List = new ArrayList<>();
         for(PayPaymentRecord payPaymentRecord : list){
-            addOneAmountReceived(payPaymentRecord);
+            addOneAmountReceived(payPaymentRecord,typr5List);
+
+        }
+
+        if(typr5List !=null && typr5List.size()>0){
+//            HashMap<String, Object> paramMap = new HashMap<>();
+//            paramMap.put("voList",typr5List);
+            AuthenticationUtils.post("/paymentInfo/incomingPaymentCheck",null,typr5List);
         }
     }
 
@@ -97,7 +107,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * @param payPaymentRecord
      */
     @Override
-    public void addOneAmountReceived(PayPaymentRecord payPaymentRecord){
+    public void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List<TbCheckVo> typr5List){
 
         BigDecimal receivableAmount;
         Boolean isAdd;
@@ -211,7 +221,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                     tbMember.setInAccount(inAccount);
                     tbMemberProjectSubitemMapper.updateById(tbMember);
 
-                    sendToStandards(tbMember,payPaymentRecord);
+                    //拼装推到标协缴费的参数
+                    TbCheckVo tbCheckVo = new TbCheckVo();
+                    tbCheckVo.setId(tbMember.getTbPaymentId());
+                    tbCheckVo.setCheckMark(payPaymentRecord.getRemark());
+                    typr5List.add(tbCheckVo);
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
@@ -368,23 +382,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
     }
 
-    /**
-     * 标协会员来款推送到标协项目
-     */
-    private void sendToStandards(TbMemberProjectSubitem tbMember,PayPaymentRecord payPaymentRecord){
-        //获取公钥并使用公钥加密token
-        Map<String, String> map = AuthenticationUtils.encryptByRsaPriKey();
-
-        HashMap<String, Object> 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

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;
+}