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

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

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

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreLicenseInfoVo.java

@@ -47,6 +47,10 @@ public class StoreLicenseInfoVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date submitDate;
 
+    @ApiModelProperty("审核时间（门店 store_info.review_date）")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date reviewDate;
+
     @ApiModelProperty("证照到期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date expirationTime;

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

@@ -33,6 +33,7 @@
             s.business_types_name,
             slh.license_execute_status AS states,
             slh.created_time AS submit_date,
+            s.review_date AS review_date,
             CASE
                 WHEN slh.license_status = 1 THEN s.business_license_expiration_time
                 ELSE NULL

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

@@ -0,0 +1,32 @@
+package shop.alien.lawyer.controller;
+
+import io.swagger.annotations.*;
+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("根据商户名称查询是否存在进件记录（alipay_zft_create_record）")
+    @ApiOperationSupport(order = 1)
+    @ApiImplicitParam(name = "merchantName", value = "商户名称", required = true, paramType = "query", dataType = "String")
+    @GetMapping("/existsSuccessful")
+    public R<Boolean> existsByMerchantName(@RequestParam("merchantName") String merchantName) {
+        log.info("AlipayZftCreateRecordController.existsByMerchantName?merchantName={}", merchantName);
+        return alipayZftCreateRecordService.existsByMerchantName(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 {
+
+    /**
+     * 按商户名称查询 {@code alipay_zft_create_record} 是否存在记录
+     *
+     * @param merchantName 商户名称
+     * @return true 存在，false 不存在
+     */
+    R<Boolean> existsByMerchantName(String merchantName);
+}

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

@@ -0,0 +1,33 @@
+package shop.alien.lawyer.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.entity.store.AlipayZftCreateRecord;
+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> 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);
+        return R.data(n > 0);
+    }
+}

alien-store/docs/short-link.md

@@ -49,10 +49,10 @@ short-link:
 
 ```yaml
 short-link:
-  public-base-url: https://test-api.example.com
+  public-base-url: https://test.ailien.shop
   https-only: true
   allow-local-network-target: false
-  allowed-hosts: m.test.example.com,www.test.example.com
+  allowed-hosts: test.ailien.shop,www.test.ailien.shop,m.test.ailien.shop
   ttl-days: 30
 ```
 
@@ -64,10 +64,10 @@ short-link:
 
 ```yaml
 short-link:
-  public-base-url: https://uat-api.example.com
+  public-base-url: https://uat.ailien.shop
   https-only: true
   allow-local-network-target: false
-  allowed-hosts: m.uat.example.com,www.uat.example.com
+  allowed-hosts: uat.ailien.shop,www.uat.ailien.shop,m.uat.ailien.shop
   ttl-days: 30
 ```
 
@@ -75,10 +75,10 @@ short-link:
 
 ```yaml
 short-link:
-  public-base-url: https://api.example.com
+  public-base-url: https://prod.ailien.shop
   https-only: true
   allow-local-network-target: false
-  allowed-hosts: m.example.com,www.example.com
+  allowed-hosts: prod.ailien.shop,www.prod.ailien.shop,m.prod.ailien.shop
   ttl-days: 30
 ```