|
|
|
@@ -95,16 +95,16 @@ public class WxSettleMerchantController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation("详细") |
|
|
|
@PostMapping("/delete") |
|
|
|
public ResultData delete(Long id) { |
|
|
|
if (null == id) { |
|
|
|
public ResultData delete(@RequestBody WxSettleMerchant wxSettleMerchant) { |
|
|
|
if (null == wxSettleMerchant.getId()) { |
|
|
|
return new ResultData(Result.ERROR,"参数错误"); |
|
|
|
} |
|
|
|
WxSettleMerchant wxSettleMerchant = wxSettleMerchantService.getById(getTenantInfo(), id); |
|
|
|
if (null == wxSettleMerchant) { |
|
|
|
WxSettleMerchant wxSetm = wxSettleMerchantService.getById(getTenantInfo(), wxSettleMerchant.getId()); |
|
|
|
if (null == wxSetm) { |
|
|
|
return new ResultData(Result.ERROR,"参数错误"); |
|
|
|
} |
|
|
|
wxSettleMerchant.setIsDel(EnumYesOrNo.YES.getCode()); |
|
|
|
wxSettleMerchantService.saveOrUpdate(wxSettleMerchant, getUser()); |
|
|
|
wxSetm.setIsDel(EnumYesOrNo.YES.getCode()); |
|
|
|
wxSettleMerchantService.saveOrUpdate(wxSetm, getUser()); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
|