fix 会员系统审核会员缴费后同步会员状态到来款系统

jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java

@@ -26,6 +26,7 @@ import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.vo.PayCommonProjectOutput;
+import com.jero.standards.memberinfo.entity.MemberInfo;
 import io.lettuce.core.dynamic.annotation.Param;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -94,15 +95,11 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 	 */
 	@ApiOperation(value="标协会员添加来款", notes="标协会员添加来款")
 	@PostMapping(value = "/standardsAddAR")
-	public Result<?> standardsAddAR(@RequestParam(name="token")String token,
+	public Result<?> standardsAddAR(@RequestParam(name="amountReceived")String amountReceived,
-									@RequestParam(name="publicKey")String publicKey,
-									@RequestParam(name="amountReceived")String amountReceived,
 									@RequestParam(name="paymentDate")String paymentDate,
 									@RequestParam(name="tbPaymentId")String tbPaymentId,
+									@RequestBody MemberInfo memberInfo,
 									@RequestParam(name="remark",required = false)String remark) {
-		//身份校验
-		authenticationUtils.check(token, publicKey);
-
 		PayPaymentRecord payPaymentRecord=new PayPaymentRecord();
 		payPaymentRecord.setAmountReceived(new BigDecimal(amountReceived));
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -112,7 +109,7 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 			e.printStackTrace();
 		}
 		payPaymentRecord.setRemark(remark);
-		return payPaymentRecordService.standardsAddAR(tbPaymentId,payPaymentRecord);
+		return payPaymentRecordService.standardsAddAR(tbPaymentId,payPaymentRecord,memberInfo);
 	}
 
 	/**

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java

@@ -3,11 +3,11 @@ package com.jero.payment.service;
 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.home.vo.DataStatisticsVO;
 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 com.jero.standards.memberinfo.entity.MemberInfo;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -44,8 +44,9 @@ public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
     /**
      * 标协会员添加来款
      * @param payPaymentRecord
+     * @param memberInfo
      */
-    Result<?> standardsAddAR(String tbPaymentId,PayPaymentRecord payPaymentRecord);
+    Result<?> standardsAddAR(String tbPaymentId, PayPaymentRecord payPaymentRecord, MemberInfo memberInfo);
 
     /**
      * 编辑来款

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
-import com.jero.common.common.ProjectCommon;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.util.oConvertUtils;
@@ -27,6 +26,7 @@ import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.project.vo.PayCommonProjectOutput;
+import com.jero.standards.memberinfo.entity.MemberInfo;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import org.apache.commons.beanutils.PropertyUtils;
@@ -278,10 +278,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * 标协会员添加来款
      * @param tbPaymentId   标协缴费表id
      * @param payPaymentRecord
+     * @param memberInfo
      * @return
      */
     @Override
-    public Result<?> standardsAddAR(String tbPaymentId,PayPaymentRecord payPaymentRecord){
+    public Result<?> standardsAddAR(String tbPaymentId, PayPaymentRecord payPaymentRecord, MemberInfo memberInfo){
 
         BigDecimal receivableAmount;
         Boolean isAdd;
@@ -302,6 +303,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         //更新主列表
         tbMember.setPaidAmount(newPaidAmount);
         tbMember.setInAccount(inAccount);
+        tbMember.setMemberNo(memberInfo.getMemberNo());
+        tbMember.setMemberType(memberInfo.getMemberType());
+        tbMember.setMemberStatus(memberInfo.getMemberStatus());
         tbMemberProjectSubitemMapper.updateById(tbMember);
 
         //插入来款记录表