From 81b2bbdbb92dd70ca28c9d556cd8dc4e9329584f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 09:15:55 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java |   74 +++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 55c23bb..da9086c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -75,39 +75,53 @@
                //鏌ヨ涓嬪彂鐘舵��
                BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
                if(response!=null
-                       && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
-                       && response.getData()!=null
-                       && response.getData().getList() != null
+                       && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
+                       ){
+                if(response.getData().getList() != null
                        && response.getData().getList().size()>0 ){
                    TaskPersonDetailResponse model = response.getData().getList().get(0);
                    if(model != null && StringUtils.equals(model.getPersondownloadResult(),"0")){
                        //鏇存柊宸插畬鎴愪笅杞戒换鍔�
-                       String remark = "";
-                       String cardInfo = "鍗$墖涓嬪彂澶辫触";
-                       TaskPersonDetailCardFaceResponse d = model.getPersonDownloadDetail();
-                        if(d.getCards() !=null && d.getCards().size()>0){
-                            cardInfo = "鍗$墖锛氥��" ;
-                            for(TaskPersonDetailCardInfoResponse card : d.getCards()){
-                                cardInfo +=card.getId()+" ";
+                           String remark = "";
+                           String cardInfo = "鍗$墖涓嬪彂澶辫触";
+                           TaskPersonDetailCardFaceResponse d = model.getPersonDownloadDetail();
+                            if(d.getCards() !=null && d.getCards().size()>0){
+                                cardInfo = "鍗$墖锛氥��" ;
+                                for(TaskPersonDetailCardInfoResponse card : d.getCards()){
+                                    cardInfo +=card.getId()+" ";
+                                }
+                                cardInfo += "銆戜笅鍙戞垚鍔�";
                             }
-                            cardInfo += "銆戜笅鍙戞垚鍔�";
-                        }
-                       if(d.getFaces() == null || d.getFaces().size() ==0){
-                           remark  = cardInfo+"锛� 涓嶆敮鎸佷汉鑴歌澶囷紒";
+                           if(d.getFaces() == null || d.getFaces().size() ==0){
+                               remark  = cardInfo+"锛� 涓嶆敮鎸佷汉鑴歌澶囷紒";
+                           }else{
+                               remark = ""+cardInfo+"锛屼汉鑴镐笅鍙戞垚鍔燂紒";
+                           }
+                           empowerMapper.update(null,new UpdateWrapper<Empower>()
+                                   .lambda()
+                                   .eq(Empower::getId,c.getId() )
+                                   .set(Empower::getRemark,remark )
+                                   .set(Empower::getSendInfo,remark )
+                                   .set(Empower::getSendStatus,Constants.EmpowerStatus.pass) );
                        }else{
-                           remark = ""+cardInfo+"锛屼汉鑴镐笅鍙戞垚鍔燂紒";
-                       }
-                       empowerMapper.update(null,new UpdateWrapper<Empower>()
+                           empowerMapper.update(null,new UpdateWrapper<Empower>()
                                .lambda()
                                .eq(Empower::getId,c.getId() )
-                               .set(Empower::getRemark,remark )
-                               .set(Empower::getSendInfo,remark )
-                               .set(Empower::getSendStatus,Constants.EmpowerStatus.pass) );
-                   }
-
+                               .set(Empower::getRemark,"涓嬪彂澶辫触" )
+                               .set(Empower::getSendInfo,"涓嬪彂澶辫触" )
+                               .set(Empower::getSendStatus,Constants.EmpowerStatus.fail) );
+                       }
+                   }else{
+                    empowerMapper.update(null,new UpdateWrapper<Empower>()
+                            .lambda()
+                            .eq(Empower::getId,c.getId() )
+                            .set(Empower::getRemark,"涓嬪彂澶辫触" )
+                            .set(Empower::getSendInfo,"涓嬪彂澶辫触" )
+                            .set(Empower::getSendStatus,Constants.EmpowerStatus.fail) );
+                    }
+                   checkDelMemberTask(c.getMemberId());
                }
            }
-           checkDelMemberTask();
         }catch (Exception e){
             e.printStackTrace();
         }finally {
@@ -134,12 +148,14 @@
                 log.info("娴峰悍鍒犻櫎鐢ㄦ埛澶辫触锛�==============="+result.getData().get(0).getPersonId());
                 memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                         .set(Member::getHkStatus,Constants.TWO)//鍚屾澶辫触
+                        .set(Member::getRemark,"鍚屾娴峰悍鍒犻櫎澶辫触")//鍚屾澶辫触
                         .set(Member::getHkDate,date)
                         .in(Member::getId, id));
             }else{
                 //鏍囪鍒犻櫎鎴愬姛鐨勬暟鎹紙娴峰悍瀵规帴鐘舵�佷负宸插悓姝ワ紝锛屽悓姝ュけ璐ョ殑浠嶄负寰呭悓姝ワ紝绛変笅涓�娆$户缁鐞嗭紝鐭ラ亾鍏ㄩ儴鍒犻櫎瀹屾瘯锛�
                 memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                         .set(Member::getHkStatus,Constants.ONE)//鍚屾鎴愬姛
+                        .set(Member::getRemark,"鍚屾娴峰悍鍒犻櫎澶辫触")//鍚屾澶辫触
                         .set(Member::getHkDate,date)
                         .in(Member::getId, id));
                 //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗$墖淇℃伅
@@ -153,20 +169,16 @@
     /**
      * 妫�鏌ュ垹闄や汉鍛樼殑鏉冮檺鏄惁閮藉垹闄ゅ畬鎴愶紝濡傛灉鏉冮檺鍒犻櫎瀹屾垚锛� 杩涜娴峰悍浜哄憳鐨勫垹闄ゆ搷浣�
      */
-    private void checkDelMemberTask() {
-        List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
-                .eq(Member::getIsdeleted,Constants.ONE)
-                .eq(Member::getHkStatus,Constants.FOUR));
-        if(memberList!=null &&memberList.size()>0 ){
+    private void checkDelMemberTask(Integer memberId) {
             Date date = new Date();
-            for(Member member : memberList){
+            Member member = memberMapper.selectById(memberId);
+            if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
                 if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
                         .eq(Empower::getMemberId,member.getId())
                         .eq(Empower::getIsdeleted,Constants.ONE)
                         .ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0){
                     //濡傛灉鏉冮檺閮藉凡缁忓垹闄ゆ垚鍔燂紝鍒欏垹闄ゆ捣搴蜂汉鍛樺拰鍗$墖鏁版嵁
                      doHkDeleteUser(member.getId(),member.getHkId(),date);
-                }
             }
         }
     }
@@ -249,8 +261,8 @@
                    empowerMapper.update(null,new UpdateWrapper<Empower>()
                            .lambda()
                            .eq(Empower::getHkId,c.getHkId() )
+                           .set(Empower::getSendInfo,"浠诲姟宸蹭笅杞藉畬鎴�" )
                            .set(Empower::getSendStatus,Constants.EmpowerStatus.downloaded) );
-
                }
            }
         }catch (Exception e){

--
Gitblit v1.9.3