mirror of
https://github.com/weizhiqiang1995/erp-pro.git
synced 2025-01-01 12:55:05 +08:00
feat: 提交失败,修复提交
This commit is contained in:
parent
6bb5caa381
commit
5252ef92d3
3 changed files with 2 additions and 26 deletions
|
@ -16,10 +16,4 @@ import com.skyeye.pay.entity.PayApp;
|
|||
* 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
|
||||
*/
|
||||
public interface PayAppService extends SkyeyeBusinessService<PayApp> {
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
void updateEnabled(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
>>>>>>> 6ea701f278e38aa5a863728a89295f400d79faff
|
||||
}
|
||||
|
|
|
@ -7,14 +7,11 @@ package com.skyeye.pay.service.impl;
|
|||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.skyeye.annotation.service.SkyeyeService;
|
||||
import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl;
|
||||
import com.skyeye.common.constans.CommonConstants;
|
||||
import com.skyeye.common.constans.CommonNumConstants;
|
||||
import com.skyeye.common.enumeration.WhetherEnum;
|
||||
import com.skyeye.common.object.InputObject;
|
||||
import com.skyeye.common.object.OutputObject;
|
||||
import com.skyeye.common.util.mybatisplus.MybatisPlusUtil;
|
||||
import com.skyeye.exception.CustomException;
|
||||
import com.skyeye.pay.dao.PayAppDao;
|
||||
|
@ -42,23 +39,7 @@ public class PayAppServiceImpl extends SkyeyeBusinessServiceImpl<PayAppDao, PayA
|
|||
verify(payApp.getId());
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
@Override
|
||||
public void updateEnabled(InputObject inputObject, OutputObject outputObject) {
|
||||
Map<String, Object> params = inputObject.getParams();
|
||||
String id = params.get("id").toString();
|
||||
String enabled = params.get("enabled").toString();
|
||||
verify(id);
|
||||
UpdateWrapper<PayApp> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.set(MybatisPlusUtil.toColumns(PayApp::getEnabled), enabled)
|
||||
.eq(CommonConstants.ID, id);
|
||||
update(updateWrapper);
|
||||
refreshCache(id);
|
||||
}
|
||||
|
||||
>>>>>>> 6ea701f278e38aa5a863728a89295f400d79faff
|
||||
private void verify(String id){
|
||||
private void verify(String id) {
|
||||
QueryWrapper<PayApp> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(CommonConstants.ID, id);
|
||||
PayApp one = getOne(queryWrapper);
|
||||
|
|
|
@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||
import com.skyeye.annotation.service.SkyeyeService;
|
||||
import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl;
|
||||
import com.skyeye.common.constans.CommonConstants;
|
||||
import com.skyeye.common.object.InputObject;
|
||||
import com.skyeye.exception.CustomException;
|
||||
import com.skyeye.pay.dao.PayChannelDao;
|
||||
import com.skyeye.pay.entity.PayChannel;
|
||||
|
|
Loading…
Reference in a new issue