feat(会员登记薄):重置授权二维码

src/main/java/com/sunxung/factoring/entity/bocom/vipaccount/BocomVipAccountNoticeInfo.java

@@ -46,7 +46,7 @@ public class BocomVipAccountNoticeInfo extends BaseEntity {
      * 通知推送对象  1-法人 2-授权代理人 3-个人
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("qr_code_effect_time")
+    @TableField("notice_object")
     private String noticeObject;
 
     /**

src/main/java/com/sunxung/factoring/service/bocom/vipaccount/impl/BocomVipAccountBasicInfoServiceImpl.java

@@ -652,17 +652,10 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
     public BocomVipAccountBasicInfo resetUrl(Long id) {
         BocomVipAccountBasicInfo basicInfo = getById(id);
         if (basicInfo != null) {
-            BocomVipAccountBasicInfo vipAccountBasicInfo = resetUrlAuthorized(basicInfo);
-            //全删全进
-            bocomVipAccountNoticeInfoService.remove(new QueryWrapper<BocomVipAccountNoticeInfo>()
-                    .eq("bocom_vip_account_basic_info_id", vipAccountBasicInfo.getId()));
-            if (CollectionUtil.isNotEmpty(vipAccountBasicInfo.getNoticeInfoList())) {
-                vipAccountBasicInfo.getNoticeInfoList().forEach(n -> {
-                    bocomVipAccountNoticeInfoService.save(n);
-                });
-            }
+            resetUrlAuthorized(basicInfo);
         }
         BocomVipAccountBasicInfo newVipBasic = getById(id);
+        autoAuthenticator(newVipBasic);
         return newVipBasic;
     }
 
@@ -1315,6 +1308,9 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
     @Override
     public BocomVipAccountBasicInfo resetUrlAuthorized(BocomVipAccountBasicInfo vipAccountBasicInfo) {
 
+        //刷新会员登记簿
+        refreshBocomVipAccount(vipAccountBasicInfo.getId());
+
         if (vipAccountBasicInfo != null) {
             BocomBasicInfo basicInfo = bocomBasicInfoService.get(vipAccountBasicInfo.getBocomBasicInfoId());
             if (basicInfo == null) {
@@ -1343,12 +1339,36 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
 
             List<BocomVipAccountNoticeInfo> noticeInfoList = new ArrayList<>();
             pptmBodyResponse.getNotyQue().forEach(notyQue -> {
-                BocomVipAccountNoticeInfo noticeInfo = new BocomVipAccountNoticeInfo();
-                noticeInfo.setBocomVipAccountBasicInfoId(vipAccountBasicInfo.getId());
-                noticeInfo.setQrCode(notyQue.getMerchNotyBase64Stream());
-                noticeInfo.setQrCodeEffectTime(new Date());
-                noticeInfo.setNoticeObject(notyQue.getNotyPushObj());
-                noticeInfoList.add(noticeInfo);
+
+                if (notyQue.getNotyPushObj().equals("1")){
+                    if (4 != vipAccountBasicInfo.getLegalAuthorizationStatus()){
+                        //未授权成功时，更新授权码
+                        //全删全进
+                        bocomVipAccountNoticeInfoService.remove(new QueryWrapper<BocomVipAccountNoticeInfo>()
+                                .eq("bocom_vip_account_basic_info_id", vipAccountBasicInfo.getId())
+                                .eq("notice_object", "1"));
+                        if (CollectionUtil.isNotEmpty(vipAccountBasicInfo.getNoticeInfoList())) {
+                            vipAccountBasicInfo.getNoticeInfoList().forEach(n -> {
+                                bocomVipAccountNoticeInfoService.save(n);
+                            });
+                        }
+
+                    }
+                }else if (notyQue.getNotyPushObj().equals("2")){
+                    if (4 != vipAccountBasicInfo.getAuthorizationStatus()){
+                        //未授权成功时，更新授权码
+                        //全删全进
+                        bocomVipAccountNoticeInfoService.remove(new QueryWrapper<BocomVipAccountNoticeInfo>()
+                                .eq("bocom_vip_account_basic_info_id", vipAccountBasicInfo.getId())
+                                .eq("notice_object", "2"));
+                        if (CollectionUtil.isNotEmpty(vipAccountBasicInfo.getNoticeInfoList())) {
+                            vipAccountBasicInfo.getNoticeInfoList().forEach(n -> {
+                                bocomVipAccountNoticeInfoService.save(n);
+                            });
+                        }
+
+                    }
+                }
             });
         }
 
@@ -2502,19 +2522,31 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
                     .eq(BocomShareholderActualController::getBocomBasicInfoId, basicInfo.getId())
                     .eq(BocomShareholderActualController::getPersonType, 2)
                     .one();
-            bocomVipAccountBasicInfo.getNoticeInfoList().forEach(n -> {
-                if (n.getNoticeObject().equals("1")) {
-                    if (basicInfo.getCustomerType() == 0) {
-                        n.setAuthenticator(legalPersonInfo.getName());
-                    } else if (basicInfo.getCustomerType() == 1) {
-                        n.setAuthenticator(actualController.getName());
+            List<BocomVipAccountNoticeInfo> noticeInfos = new ArrayList<>();
+            if (!"4".equals(bocomVipAccountBasicInfo.getLegalAuthorizationStatus())){
+                noticeInfoList.forEach(n->{
+                    if ("1".equals(n.getNoticeObject())){
+                        if (n.getNoticeObject().equals("1")) {
+                            if (basicInfo.getCustomerType() == 0) {
+                                n.setAuthenticator(legalPersonInfo.getName());
+                            } else if (basicInfo.getCustomerType() == 1) {
+                                n.setAuthenticator(actualController.getName());
+                            }
+
+                        }
+                        noticeInfos.add(n);
+                    }
+                });
+            }
+            if (!"4".equals(bocomVipAccountBasicInfo.getAuthorizationStatus())){
+                noticeInfoList.forEach(n->{
+                    if ("2".equals(n.getNoticeObject())){
+                        n.setAuthenticator(authorizedAgent.getName());
+                        noticeInfos.add(n);
                     }
+                });
+            }
 
-                }
-                if (n.getNoticeObject().equals("2")) {
-                    n.setAuthenticator(authorizedAgent.getName());
-                }
-            });
 
         }
         bocomVipAccountBasicInfo.setNoticeInfoList(noticeInfoList);