Merge remote-tracking branch 'origin/branch20220421' into 22年七月工作

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java

@@ -133,6 +133,20 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		return Result.OK(pageList);
 	}
 
+	@ApiOperation(value="企业管理-通过公司名称查公司", notes="企业管理-通过公司名称查公司")
+	@GetMapping(value = "/queryCompanyByName")
+	public Result<?> queryCompanyByName(String companyName) {
+		if(!StringUtils.isBlank(companyName) && companyName.length() > 50){
+			return Result.error("企业名称长度不能大于50个字符！");
+		}
+
+		LambdaQueryWrapper<PayCompanyManagement> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PayCompanyManagement::getCompanyName, companyName);
+		PayCompanyManagement payCompanyManagement = payCompanyManagementService.getOne(wrapper);
+
+		return Result.OK(payCompanyManagement);
+	}
+
 	/**
 	 * 其他功能调用企业管理-分页列表查询
 	 * (管理端查询dataSource = 1的数据；报名查询全部的数据)

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
@@ -40,7 +41,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class TbCertificatePaymentController extends JeroController<TbCertificatePayment, ITbCertificatePaymentService> {
 	@Autowired
 	private ITbCertificatePaymentService tbCertificatePaymentService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -133,6 +134,16 @@ public class TbCertificatePaymentController extends JeroController<TbCertificate
 		return Result.OK("批量删除成功!");
 	}
 
+	 @AutoLog(value = "证书缴费表-通过会员缴费id删除")
+	 @ApiOperation(value="证书缴费表-通过会员缴费id删除", notes="证书缴费表-通过会员缴费id删除")
+	 @PostMapping(value = "/deleteByTbPaymentId")
+	 public Result<?> deleteByTbPaymentId(@RequestBody TbCertificatePayment tbCertificatePayment) {
+		 LambdaQueryWrapper<TbCertificatePayment> wrapper = new LambdaQueryWrapper<>();
+		 wrapper.eq(TbCertificatePayment::getTbPaymentId, tbCertificatePayment.getTbPaymentId());
+		 tbCertificatePaymentService.remove(wrapper);
+		 return Result.OK("删除成功!");
+	 }
+
 	/**
 	 * 通过id查询
 	 *