modify

Helius

2020-12-23 a27143ea3ab9f215fcbddfd23eba530afbbc3c62

modify

 zq-erp/src/main/java/com/matrix/system/app/action/ApiShoppingCarAction.java

New file
@@ -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;
    };

}

 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]);

 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"/>