2 Commity 25aba3a150 ... 92e47a0c11

Autor SHA1 Wiadomość Data
  qinxuyang 92e47a0c11 Merge remote-tracking branch 'origin/sit' into sit 6 dni temu
  qinxuyang e413c43127 律师 支付宝绑定前置功能优化 6 dni temu

+ 1 - 1
alien-lawyer/src/main/java/shop/alien/lawyer/controller/AlipayZftCreateRecordController.java

@@ -21,7 +21,7 @@ public class AlipayZftCreateRecordController {
 
     private final AlipayZftCreateRecordService alipayZftCreateRecordService;
 
-    @ApiOperation("根据商户名称查询是否存在进件记录(alipay_zft_create_record)")
+    @ApiOperation("根据商户名称(law_firm)查询是否存在已填写支付宝二级商户账号的律师用户")
     @ApiOperationSupport(order = 1)
     @ApiImplicitParam(name = "merchantName", value = "商户名称", required = true, paramType = "query", dataType = "String")
     @GetMapping("/existsSuccessful")

+ 3 - 3
alien-lawyer/src/main/java/shop/alien/lawyer/service/AlipayZftCreateRecordService.java

@@ -8,10 +8,10 @@ import shop.alien.entity.result.R;
 public interface AlipayZftCreateRecordService {
 
     /**
-     * 按商户名称查询 {@code alipay_zft_create_record} 是否存在记录
+     * 按商户名称(对应 {@code lawyer_user.law_firm})查询是否存在已绑定支付宝二级商户账号的律师
      *
-     * @param merchantName 商户名称
-     * @return true 存在,false 不存在
+     * @param merchantName 商户名称(律所名称)
+     * @return true 存在且 {@code zfb_secondary_merchant_account} 有有效值否则 false
      */
     R<Boolean> existsByMerchantName(String merchantName);
 }

+ 10 - 7
alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/AlipayZftCreateRecordServiceImpl.java

@@ -6,28 +6,31 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.AlipayZftCreateRecord;
+import shop.alien.entity.store.LawyerUser;
 import shop.alien.lawyer.service.AlipayZftCreateRecordService;
-import shop.alien.mapper.AlipayZftCreateRecordMapper;
+import shop.alien.mapper.LawyerUserMapper;
 
 /**
- * 支付宝直付通进件创建记录
+ * 支付宝直付通进件创建记录(按律所名称关联律师用户二级商户账号)
  */
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class AlipayZftCreateRecordServiceImpl implements AlipayZftCreateRecordService {
 
-    private final AlipayZftCreateRecordMapper alipayZftCreateRecordMapper;
+    private final LawyerUserMapper lawyerUserMapper;
 
     @Override
     public R<Boolean> existsByMerchantName(String merchantName) {
         if (!StringUtils.hasText(merchantName)) {
             return R.data(false);
         }
-        LambdaQueryWrapper<AlipayZftCreateRecord> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AlipayZftCreateRecord::getMerchantName, merchantName.trim());
-        long n = alipayZftCreateRecordMapper.selectCount(wrapper);
+        LambdaQueryWrapper<LawyerUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(LawyerUser::getLawFirm, merchantName.trim())
+                .eq(LawyerUser::getDeleteFlag, 0)
+                .isNotNull(LawyerUser::getZfbSecondaryMerchantAccount)
+                .ne(LawyerUser::getZfbSecondaryMerchantAccount, "");
+        long n = lawyerUserMapper.selectCount(wrapper);
         return R.data(n > 0);
     }
 }