|
@@ -105,17 +105,14 @@ public class TJoinpayMchController {
|
|
@ApiOperation(value = "保存或提交审核")
|
|
@ApiOperation(value = "保存或提交审核")
|
|
@PostMapping("/save")
|
|
@PostMapping("/save")
|
|
public ResponseModel<?> save(@RequestBody TJoinpayMch tJoinpayMch) {
|
|
public ResponseModel<?> save(@RequestBody TJoinpayMch tJoinpayMch) {
|
|
-
|
|
|
|
LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
|
|
query.eq(TJoinpayMch::getAdminId, tJoinpayMch.getAdminId());
|
|
query.eq(TJoinpayMch::getAdminId, tJoinpayMch.getAdminId());
|
|
- List<TJoinpayMch> list = tJoinpayMchService.list(query);
|
|
|
|
|
|
+ TJoinpayMch joinpayMch = tJoinpayMchService.getOne(query);
|
|
tJoinpayMch.setCreateDate(new Date());
|
|
tJoinpayMch.setCreateDate(new Date());
|
|
tJoinpayMch.setModifyDate(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 (StringUtils.isNotEmpty(mch.getApproveStatus())) {
|
|
if (!mch.getApproveStatus().equals("审核通过")) {
|
|
if (!mch.getApproveStatus().equals("审核通过")) {
|
|
@@ -189,7 +186,6 @@ public class TJoinpayMchController {
|
|
|
|
|
|
@ApiOperation(value = "上传图片")
|
|
@ApiOperation(value = "上传图片")
|
|
@PostMapping("/sentImage")
|
|
@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) {
|
|
public ResponseModel<?> sentImage(@RequestBody mchParam tJoinpayMch) {
|
|
TJoinpayMch mch = tJoinpayMchService.getById(tJoinpayMch.getId());
|
|
TJoinpayMch mch = tJoinpayMchService.getById(tJoinpayMch.getId());
|
|
if (tJoinpayMch.getType().equals("0")) {
|
|
if (tJoinpayMch.getType().equals("0")) {
|