Sfoglia il codice sorgente

fix:"优化汇聚入网接口"

soobin 4 mesi fa
parent
commit
6b4c4d2e11

+ 3 - 7
src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -105,17 +105,14 @@ public class TJoinpayMchController {
     @ApiOperation(value = "保存或提交审核")
     @PostMapping("/save")
     public ResponseModel<?> save(@RequestBody TJoinpayMch tJoinpayMch) {
-
         LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
         query.eq(TJoinpayMch::getAdminId, tJoinpayMch.getAdminId());
-        List<TJoinpayMch> list = tJoinpayMchService.list(query);
+        TJoinpayMch joinpayMch = tJoinpayMchService.getOne(query);
         tJoinpayMch.setCreateDate(new Date());
         tJoinpayMch.setModifyDate(new Date());
-        if (list.size() > 0 && StringUtils.isNotEmpty(list.get(0).getAltMchNo())) {
+        if (joinpayMch!= null) {
             //已有,属于第二次提交信息,
-            TJoinpayMch mch = list.get(0);
-            //取消审核步骤
-//            ResponseModel<?> checkMch = createCheckMch(mch, tJoinpayMch);
+            TJoinpayMch mch = joinpayMch;
             //提交并修改
             if (StringUtils.isNotEmpty(mch.getApproveStatus())) {
                 if (!mch.getApproveStatus().equals("审核通过")) {
@@ -189,7 +186,6 @@ public class TJoinpayMchController {
 
     @ApiOperation(value = "上传图片")
     @PostMapping("/sentImage")
-//    public ResponseModel<?> sentImage(String id,String cardPositive,String cardNegative,String tradeLicence,String openAccountLicence,String type,String status) {
     public ResponseModel<?> sentImage(@RequestBody mchParam tJoinpayMch) {
         TJoinpayMch mch = tJoinpayMchService.getById(tJoinpayMch.getId());
         if (tJoinpayMch.getType().equals("0")) {