From eb706a988e747b624fda0d44e0aaf6a4ee5e20eb Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 26 May 2022 11:27:03 +0800 Subject: [PATCH] fix saveOrder zkPrice is null --- zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java index d71a0a0..b80eb06 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java @@ -7,13 +7,13 @@ import com.matrix.core.pojo.PaginationVO; import com.matrix.core.tools.DateUtil; import com.matrix.core.tools.LogUtil; +import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.WebUtil; import com.matrix.core.tools.excl.ExcelSheetPO; import com.matrix.core.tools.excl.ExcelUtil; import com.matrix.core.tools.excl.ExcelVersion; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.bean.SystemDictionary; -import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.CustomerDataDictionaryDao; import com.matrix.system.common.service.SysUsersService; import com.matrix.system.common.service.SystemDictionaryService; @@ -301,6 +301,9 @@ if(vipInfo.getShopId()==null){ vipInfo.setShopId(users.getShopId()); } + if(vipInfo.getCompanyId()==null){ + vipInfo.setCompanyId(users.getCompanyId()); + } return add(vipInfoService, vipInfo, "会员信息"); } } @@ -334,8 +337,14 @@ @RequestMapping(value = "/del") public @ResponseBody AjaxResult del(String keys) { - - return remove(vipInfoService, keys); + List<Long> ids = StringUtils.strToCollToLong(keys, ","); + int i = vipInfoService.removeLogic(ids); + if (i > 0) { + return new AjaxResult(AjaxResult.STATUS_SUCCESS, "成功删除" + i + "条数据"); + } else { + return new AjaxResult(AjaxResult.STATUS_FAIL, "删除失败"); + } +// return remove(vipInfoService, keys); } /** -- Gitblit v1.9.1