Merge remote-tracking branch 'origin/sit-new-checkstand' into sit-new-checkstand

alien-entity/src/main/java/shop/alien/entity/store/AlipayZftCreateRecord.java

@@ -0,0 +1,34 @@
+package shop.alien.entity.store;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 支付宝直付通进件创建记录
+ */
+@Data
+@TableName("alipay_zft_create_record")
+@ApiModel(description = "支付宝直付通进件创建记录")
+public class AlipayZftCreateRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @TableField("merchant_name")
+    @ApiModelProperty("商户名称")
+    private String merchantName;
+
+    @TableField("invoke_success")
+    @ApiModelProperty("调用是否成功：1成功")
+    private Integer invokeSuccess;
+}

alien-entity/src/main/java/shop/alien/entity/store/LawyerUser.java

@@ -381,5 +381,13 @@ public class LawyerUser extends Model<LawyerUser> {
     @TableField("time_num")
     private Integer timeNum;
 
+    @ApiModelProperty(value = "支付宝二级商户是否绑定 0未绑定 1已绑定")
+    @TableField("zfb_binding_status")
+    private Integer zfbBindingStatus;
+
+    @ApiModelProperty(value = "支付宝二级商户是否绑定 0未绑定 1已绑定")
+    @TableField("zfb_secondary_merchant_account")
+    private String zfbSecondaryMerchantAccount;
+
 }
 

alien-entity/src/main/java/shop/alien/mapper/AlipayZftCreateRecordMapper.java

@@ -0,0 +1,18 @@
+package shop.alien.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import shop.alien.entity.store.AlipayZftCreateRecord;
+
+/**
+ * 支付宝直付通进件创建记录 Mapper
+ */
+@Mapper
+public interface AlipayZftCreateRecordMapper extends BaseMapper<AlipayZftCreateRecord> {
+
+    /**
+     * invoke_success = 1 且商户名称匹配时的记录数
+     */
+    int countSuccessByMerchantName(@Param("merchantName") String merchantName);
+}

alien-entity/src/main/resources/mapper/AlipayZftCreateRecordMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="shop.alien.mapper.AlipayZftCreateRecordMapper">
+
+    <select id="countSuccessByMerchantName" resultType="int">
+        SELECT COUNT(1)
+        FROM alipay_zft_create_record
+        WHERE invoke_success = 1
+          AND merchant_name = #{merchantName}
+    </select>
+</mapper>

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

@@ -0,0 +1,36 @@
+package shop.alien.lawyer.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiSort;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import shop.alien.entity.result.R;
+import shop.alien.lawyer.service.AlipayZftCreateRecordService;
+
+/**
+ * 支付宝直付通进件创建记录
+ */
+@Slf4j
+@Api(tags = {"律师平台-支付宝直付通进件"})
+@ApiSort(25)
+@CrossOrigin
+@RestController
+@RequestMapping("/lawyer/alipayZftCreateRecord")
+@RequiredArgsConstructor
+public class AlipayZftCreateRecordController {
+
+    private final AlipayZftCreateRecordService alipayZftCreateRecordService;
+
+    @ApiOperation("根据商户名称查询是否存在进件成功记录（invoke_success=1）")
+    @ApiOperationSupport(order = 1)
+    @ApiImplicitParam(name = "merchantName", value = "商户名称", required = true, paramType = "query", dataType = "String")
+    @GetMapping("/existsSuccessful")
+    public R<Boolean> existsSuccessful(@RequestParam("merchantName") String merchantName) {
+        log.info("AlipayZftCreateRecordController.existsSuccessful?merchantName={}", merchantName);
+        return alipayZftCreateRecordService.existsSuccessfulByMerchantName(merchantName);
+    }
+}

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

@@ -0,0 +1,17 @@
+package shop.alien.lawyer.service;
+
+import shop.alien.entity.result.R;
+
+/**
+ * 支付宝直付通进件创建记录
+ */
+public interface AlipayZftCreateRecordService {
+
+    /**
+     * 是否存在 invoke_success=1 且 merchant_name 匹配的记录
+     *
+     * @param merchantName 商户名称
+     * @return true 存在，false 不存在
+     */
+    R<Boolean> existsSuccessfulByMerchantName(String merchantName);
+}

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

@@ -0,0 +1,29 @@
+package shop.alien.lawyer.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import shop.alien.entity.result.R;
+import shop.alien.lawyer.service.AlipayZftCreateRecordService;
+import shop.alien.mapper.AlipayZftCreateRecordMapper;
+
+/**
+ * 支付宝直付通进件创建记录
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AlipayZftCreateRecordServiceImpl implements AlipayZftCreateRecordService {
+
+    private final AlipayZftCreateRecordMapper alipayZftCreateRecordMapper;
+
+    @Override
+    public R<Boolean> existsSuccessfulByMerchantName(String merchantName) {
+        if (!StringUtils.hasText(merchantName)) {
+            return R.data(false);
+        }
+        int n = alipayZftCreateRecordMapper.countSuccessByMerchantName(merchantName.trim());
+        return R.data(n > 0);
+    }
+}