From a27143ea3ab9f215fcbddfd23eba530afbbc3c62 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 23 Dec 2020 15:42:17 +0800 Subject: [PATCH] modify --- zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 1 + zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 14 ++++++++------ zq-erp/src/main/java/com/matrix/system/app/action/ApiShoppingCarAction.java | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiShoppingCarAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiShoppingCarAction.java new file mode 100644 index 0000000..7d04557 --- /dev/null +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiShoppingCarAction.java @@ -0,0 +1,22 @@ +package com.matrix.system.app.action; + +import com.matrix.core.pojo.AjaxResult; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wzy + * @date 2020-12-23 + **/ +@Api(value = "ApiShoppingCarAction", tags = "订单-购物车接口类") +@RestController +@RequestMapping(value = "/api/shoppingCar") +public class ApiShoppingCarAction { + + public AjaxResult addItemToCar() { + return null; + }; + +} diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java index 63e7d10..1c3ac32 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java @@ -458,7 +458,7 @@ vipInfo.setRecommendId(addVipDto.getRecommendId()); if (StringUtils.isNotBlank(addVipDto.getAreas())) { - String[] areas = addVipDto.getAreas().split(","); + String[] areas = addVipDto.getAreas().split("-"); vipInfo.setProvince(areas[0]); vipInfo.setCity(areas[1]); vipInfo.setArea(areas[2]); @@ -491,16 +491,18 @@ public int apiModifyVip(ModifyVipDto modifyVipDto) { SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); - if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", modifyVipDto.getPhone(), - "company_id",user.getCompanyId() )) { - throw new GlobleException("手机已被注册!"); - } - SysVipInfo vipInfo = sysVipInfoDao.selectById(modifyVipDto.getVipId()); if (vipInfo == null) { throw new GlobleException("用户不存在"); } + if (!vipInfo.getPhone().equals(modifyVipDto.getPhone())) { + if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", modifyVipDto.getPhone(), + "company_id", user.getCompanyId())) { + throw new GlobleException("手机已被注册!"); + } + } + if (StringUtils.isNotBlank(modifyVipDto.getAreas())) { String[] areas = modifyVipDto.getAreas().split(","); vipInfo.setProvince(areas[0]); diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml index ac7c6cf..4e58387 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml @@ -38,6 +38,7 @@ <result property="province" column="province"/> <result property="city" column="city"/> <result property="area" column="area"/> + <result property="recommendId" column="recommend_id"/> <result property="statu" column="statu"/> <result property="birthdayType" column="birthdayType"/> -- Gitblit v1.9.1