fix：“修复汇付商户入驻部分问题”

src/main/java/com/szwl/constant/HuifuConstant.java

@@ -327,20 +327,25 @@ public class HuifuConstant {
         F13,
         F14,
         F22,
-        F24;
+        F24,
+        F40,
+        F41;
+
 
         private static Map<String, fileType> map = new HashMap<>();
 
         static {
             map.put("法人身份证正反面", F01);
-            map.put("法人身份证国徽面", F02);
-            map.put("法人身份证人像面", F03);
+            map.put("法人身份证国徽面（人像面）", F02);
+            map.put("法人身份证人像面（国徽面）", F03);
             map.put("营业执照", F07);
             map.put("开户许可证", F08);
             map.put("银行卡正面", F13);
             map.put("银行卡反面", F14);
             map.put("（线下场景）门头照", F22);
             map.put("（线下场景）内景照", F24);
+            map.put("法人身份证人像面", F40);
+            map.put("法人身份证国徽面", F41);
         }
 
         public static fileType forValue(String value) {

src/main/java/com/szwl/controller/THuifuMchController.java

@@ -68,9 +68,14 @@ public class THuifuMchController {
         LambdaQueryWrapper<THuifuMchCheck> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(THuifuMchCheck::getAdminId,tHuifuMchCheck.getAdminId());
         THuifuMchCheck newHuifuMchCheck = tHuifuMchCheckService.getOne(queryWrapper);
-        BeanUtil.copyProperties(tHuifuMchCheck,newHuifuMchCheck,ignoreProperties);
         newHuifuMchCheck.setModifyDate(new Date());
-        newHuifuMchCheck.setStatus("4");
+        if(newHuifuMchCheck.getStatus().equals("3")) {
+            BeanUtil.copyProperties(tHuifuMchCheck,newHuifuMchCheck,ignoreProperties);
+            newHuifuMchCheck.setStatus("1");
+        } else {
+            BeanUtil.copyProperties(tHuifuMchCheck,newHuifuMchCheck,ignoreProperties);
+            newHuifuMchCheck.setStatus("4");
+        }
         tHuifuMchCheckService.updateById(newHuifuMchCheck);
         return R.ok();
     }
@@ -129,7 +134,6 @@ public class THuifuMchController {
             }
         } else {
             // 拒绝
-            // 拒绝
             huifuMchCheck.setModifyDate(new Date());
             huifuMchCheck.setStatus("3");
             tHuifuMchCheckService.updateById(huifuMchCheck);
@@ -155,12 +159,12 @@ public class THuifuMchController {
         String result = "";
         if(file != null) {
             try{
-                if(fileType.equals(HuifuConstant.fileType.F03.toString())) {
+                if(fileType.equals(HuifuConstant.fileType.F02.toString())) {
+                    result = tHuifuMchService.uploadPic(file, HuifuConstant.fileType.F02);
+                    tHuifuMchCheck.setCardFrontPic(result);
+                } else if (fileType.equals(HuifuConstant.fileType.F03.toString())){
                     result = tHuifuMchService.uploadPic(file, HuifuConstant.fileType.F03);
                     tHuifuMchCheck.setCertBackPic(result);
-                } else if (fileType.equals(HuifuConstant.fileType.F02.toString())){
-                    result = tHuifuMchService.uploadPic(file, HuifuConstant.fileType.F02);
-                    tHuifuMchCheck.setCertFrontPic(result);
                 } else if (fileType.equals(HuifuConstant.fileType.F13.toString())) {
                     result = tHuifuMchService.uploadPic(file, HuifuConstant.fileType.F13);
                     tHuifuMchCheck.setCardFrontPic(result);
@@ -170,6 +174,12 @@ public class THuifuMchController {
                 } else if (fileType.equals(HuifuConstant.fileType.F08.toString())) {
                     result = tHuifuMchService.uploadPic(file, HuifuConstant.fileType.F08);
                     tHuifuMchCheck.setRegAcctPic(result);
+                } else if (fileType.equals(HuifuConstant.fileType.F40.toString())) {
+                    result = tHuifuMchService.uploadPic(file, HuifuConstant.fileType.F40);
+                    tHuifuMchCheck.setLegalCertFrontPic(result);
+                } else if (fileType.equals(HuifuConstant.fileType.F41.toString())) {
+                    result = tHuifuMchService.uploadPic(file, HuifuConstant.fileType.F41);
+                    tHuifuMchCheck.setLegalCertBackPic(result);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -245,7 +255,7 @@ public class THuifuMchController {
         queryWrapper.eq(THuifuMch::getAdminId,adminId);
         THuifuMch tHuifuMch = tHuifuMchService.getOne(queryWrapper);
         String result = tHuifuMchService.sendSms(tHuifuMch);
-        if(result.equals("000000")) {
+        if(result.equals("00000000")) {
             return R.ok(tHuifuMch);
         } else {
             return R.fail(ResponseCodesEnum.A0001,"验证码发送失败");

src/main/java/com/szwl/controller/TJoinpayMchCheckController.java

@@ -128,7 +128,7 @@ public class TJoinpayMchCheckController {
                 query.in(THuifuMchCheck::getAdminId,adminIds);
             }
             query.orderByDesc(THuifuMchCheck::getCreateDate);
-            query.eq(THuifuMchCheck::getStatus,"1").or().eq(THuifuMchCheck::getStatus,"4");
+//            query.eq(THuifuMchCheck::getStatus,"1").or().eq(THuifuMchCheck::getStatus,"4");
             Page<THuifuMchCheck> page = new Page<>(current, size, true);
             IPage<THuifuMchCheck> iPage = tHuifuMchCheckService.page(page, query);
             return R.ok(iPage);

src/main/java/com/szwl/model/entity/THuifuMchCheck.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.Email;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-13
+ * @since 2023-09-07
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -166,4 +166,11 @@ public class THuifuMchCheck implements Serializable {
     @ApiModelProperty(value = "修改验证码")
     private String sms;
 
+    @ApiModelProperty(value = "法人身份证国徽面")
+    private String legalCertBackPic;
+
+    @ApiModelProperty(value = "法人身份证人像面")
+    private String legalCertFrontPic;
+
+
 }

src/main/java/com/szwl/service/THuifuMchCheckService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-13
+ * @since 2023-09-07
  */
 public interface THuifuMchCheckService extends IService<THuifuMchCheck> {
 

src/main/java/com/szwl/service/impl/THuifuMchCheckServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-13
+ * @since 2023-09-07
  */
 @Service
 public class THuifuMchCheckServiceImpl extends ServiceImpl<THuifuMchCheckMapper, THuifuMchCheck> implements THuifuMchCheckService {

src/main/java/com/szwl/service/impl/THuifuMchServiceImpl.java

@@ -105,12 +105,14 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
         request.put("sms_send_flag", "M");
         // 异步通知地址：审核结果消息接收地址
 //        request.put("async_return_url", "异步通知地址");
+        // 法人证件号码
+        request.put("legal_cert_no", tHuifuMchCheck.getCertNo());
         // 结算卡正面
         request.put("settle_card_front_pic", tHuifuMchCheck.getCardFrontPic());
         // 法人身份证人像面
-        request.put("legal_cert_back_pic", tHuifuMchCheck.getCertBackPic());
+        request.put("legal_cert_back_pic", tHuifuMchCheck.getLegalCertBackPic());
         // 法人身份证国徽面
-        request.put("legal_cert_front_pic", tHuifuMchCheck.getCertFrontPic());
+        request.put("legal_cert_front_pic", tHuifuMchCheck.getLegalCertFrontPic());
         // 结算卡信息配置
         JSONObject cardInfo = new JSONObject();
         // 卡户名
@@ -287,9 +289,9 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             request.put("settle_cert_front_pic", tHuifuMchCheck.getCertFrontPic());
         } else {
             // 法人身份证人像面
-            request.put("legal_cert_back_pic", tHuifuMchCheck.getCertBackPic());
+            request.put("legal_cert_back_pic", tHuifuMchCheck.getLegalCertBackPic());
             // 法人身份证国徽面
-            request.put("legal_cert_front_pic", tHuifuMchCheck.getCertFrontPic());
+            request.put("legal_cert_front_pic", tHuifuMchCheck.getLegalCertFrontPic());
         }
         // 营业执照图片
         request.put("license_pic", tHuifuMchCheck.getLicensePic());