modify

jiangqs

2023-04-26 d423be0136f514954914529298e7001ad963b00c

modify

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/constant/AppErrorConstant.java

@@ -57,4 +57,6 @@
    String MOBILE_FAILED = "验证手机非绑定手机";

    String AGREEMENT_FAILED = "获取协议失败";

    String GOODS_DOWN = "商品已下架";
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtGoodsController.java

New file
@@ -0,0 +1,11 @@
package com.ruoyi.system.controller.management;

/**
 * @author jqs34
 * @ClassName MgtGoodsController
 * @description: TODO
 * @date 2023年04月26日
 * @version: 1.0
 */
public class MgtGoodsController {
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppGoodsController.java

@@ -2,11 +2,15 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.dto.AppBaseBathDto;
import com.ruoyi.system.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.system.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.system.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.system.domain.pojo.member.Member;
import com.ruoyi.system.domain.vo.AppGoodsInfoVo;
import com.ruoyi.system.service.goods.GoodsService;
import com.ruoyi.system.service.member.MemberService;
import com.ruoyi.system.service.order.ShoppingCartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +37,9 @@
    @Autowired
    private MemberService memberService;

    @Autowired
    private ShoppingCartService shoppingCartService;

    @RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取商品详情")
    public R<AppGoodsInfoVo> getGoodsInfo(@RequestBody AppGoodsInfoGetDto appGoodsInfoGetDto) {
@@ -47,6 +54,45 @@
        return R.ok(appGoodsInfoVo);
    }

    @RequestMapping(value = "/addShoppingCart", method = RequestMethod.POST)
    @ApiOperation(value = "添加购物车")
    public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            appShoppingCartAddDto.setUserId(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShoppingCartAddDto.setShopId(member.getRealtionShopId());
            }
        }
        shoppingCartService.addShoppingCart(appShoppingCartAddDto);
        return R.ok();
    }

    @RequestMapping(value = "/changeShoppingCart", method = RequestMethod.POST)
    @ApiOperation(value = "修改购物车")
    public R changeShoppingCart(@RequestBody AppShoppingCartChangeDto appShoppingCartChangeDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            appShoppingCartChangeDto.setUserId(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
            }
        }
        shoppingCartService.changeShoppingCart(appShoppingCartChangeDto);
        return R.ok();
    }

    @RequestMapping(value = "/deleteShoppingCart", method = RequestMethod.POST)
    @ApiOperation(value = "删除购物车")
    public R changeShoppingCart(@RequestBody AppBaseBathDto appBaseBathDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            appBaseBathDto.setUserId(userId);
        }
        shoppingCartService.deleteShoppingCart(appBaseBathDto);
        return R.ok();
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppBaseBathDto.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.domain.dto;

/**
 * @author jqs34
 * @ClassName AppBaseBathDto
 * @description: TODO
 * @date 2023年04月26日
 * @version: 1.0
 */

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class AppBaseBathDto extends AppBaseDto{

    @ApiModelProperty(value = "请求对象id集合 多个用,隔开")
    private String ids;

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppGoodsInfoGetDto.java

@@ -11,7 +11,7 @@
 * @version: 1.0
 */
@Data
public class AppGoodsInfoGetDto extends com.ruoyi.system.domain.dto.AppBaseGetDto {
public class AppGoodsInfoGetDto extends AppBaseGetDto {

    @ApiModelProperty(value = "是否活动跳转0否1是")
    private Integer activityFlag;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartAddDto.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.system.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShoppingCartAddDto
 * @description: TODO
 * @date 2023年04月26日
 * @version: 1.0
 */
@Data
public class AppShoppingCartAddDto extends AppBaseDto{

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "商品id")
    private Long goodsId;

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartChangeDto.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.system.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShoppingCartAddDto
 * @description: TODO
 * @date 2023年04月26日
 * @version: 1.0
 */
@Data
public class AppShoppingCartChangeDto extends AppBaseDto{

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "商品id")
    private Long goodsId;

    @ApiModelProperty(value = "变化后数量")
    private Integer buyNum;
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/order/ShoppingCartMapper.java

@@ -13,4 +13,9 @@
 */
public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> {

    /**
     * 批量删除
     * @param ids
     */
    void deleteShoppingCartByIds(String ids);
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/order/ShoppingCartServiceImpl.java

@@ -1,10 +1,23 @@
package com.ruoyi.system.service.impl.order;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.constant.AppErrorConstant;
import com.ruoyi.system.domain.dto.AppBaseBathDto;
import com.ruoyi.system.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.system.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.system.domain.pojo.activity.ActivityGoods;
import com.ruoyi.system.domain.pojo.goods.Goods;
import com.ruoyi.system.domain.pojo.order.ShoppingCart;
import com.ruoyi.system.mapper.order.ShoppingCartMapper;
import com.ruoyi.system.service.goods.GoodsService;
import com.ruoyi.system.service.order.ShoppingCartService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * <p>
@@ -17,4 +30,67 @@
@Service
public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, ShoppingCart> implements ShoppingCartService {

    @Resource
    private GoodsService goodsService;

    @Resource
    private ShoppingCartMapper shoppingCartMapper;

    /**
     * 添加购物车
     * @param appShoppingCartAddDto
     */
    @Override
    public void addShoppingCart(AppShoppingCartAddDto appShoppingCartAddDto){
        Long goodsId = appShoppingCartAddDto.getGoodsId();
        Goods goods = goodsService.getById(goodsId);
        if(goods.getGoodsStatus()!=1){
            throw new ServiceException(AppErrorConstant.GOODS_DOWN);
        }
        LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
        ShoppingCart shoppingCart = this.getOne(queryWrapper);
        if(shoppingCart==null){
            shoppingCart = new ShoppingCart();
            shoppingCart.setUserId(appShoppingCartAddDto.getUserId());
            shoppingCart.setShopId(appShoppingCartAddDto.getShopId());
            shoppingCart.setBuyNum(appShoppingCartAddDto.getBuyNum());
            shoppingCart.setDelFlag(0);
            shoppingCart.setCreateTime(new Date());
            this.save(shoppingCart);
        }else{
            shoppingCart.setBuyNum(shoppingCart.getBuyNum()+appShoppingCartAddDto.getBuyNum());
            shoppingCart.setUpdateTime(new Date());
            this.saveOrUpdate(shoppingCart);
        }
    }

    /**
     * 修改购物车数量
     * @param appShoppingCartChangeDto
     */
    @Override
    public void changeShoppingCart(AppShoppingCartChangeDto appShoppingCartChangeDto){
        Long goodsId = appShoppingCartChangeDto.getGoodsId();
        Goods goods = goodsService.getById(goodsId);
        if(goods.getGoodsStatus()!=1){
            throw new ServiceException(AppErrorConstant.GOODS_DOWN);
        }
        LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
        ShoppingCart shoppingCart = this.getOne(queryWrapper);
        shoppingCart.setBuyNum(appShoppingCartChangeDto.getBuyNum());
        shoppingCart.setUpdateTime(new Date());
        this.saveOrUpdate(shoppingCart);
    }

    /**
     * 删除购物车
     * @param appBaseBathDto
     */
    @Override
    public void deleteShoppingCart(AppBaseBathDto appBaseBathDto){
        String ids = appBaseBathDto.getIds();
        shoppingCartMapper.deleteShoppingCartByIds(ids);
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/order/ShoppingCartService.java

@@ -1,5 +1,8 @@
package com.ruoyi.system.service.order;

import com.ruoyi.system.domain.dto.AppBaseBathDto;
import com.ruoyi.system.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.system.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.system.domain.pojo.order.ShoppingCart;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -13,4 +16,21 @@
 */
public interface ShoppingCartService extends IService<ShoppingCart> {

    /**
     * 添加购物车
     * @param appShoppingCartAddDto
     */
    void addShoppingCart(AppShoppingCartAddDto appShoppingCartAddDto);

    /**
     * 修改购物车数量
     * @param appShoppingCartChangeDto
     */
    void changeShoppingCart(AppShoppingCartChangeDto appShoppingCartChangeDto);

    /**
     * 删除购物车
     * @param appBaseBathDto
     */
    void deleteShoppingCart(AppBaseBathDto appBaseBathDto);
}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/activity/ActivityGoodsMapper.xml

@@ -13,12 +13,12 @@
        <result property="activityDeadline"    column="activity_deadline"    />
    </resultMap>

    <sql id="selectTActivityGoodsVo">
    <sql id="selectActivityGoodsVo">
        select ag_id, del_flag, goods_id, activity_id, activity_price, activity_number, sales_number, activity_deadline from t_activity_goods
    </sql>

    <select id="selectTActivityGoodsList" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" resultMap="ActivityGoodsResult">
        <include refid="selectTActivityGoodsVo"/>
    <select id="selectActivityGoodsList" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" resultMap="ActivityGoodsResult">
        <include refid="selectActivityGoodsVo"/>
        <where>
            <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
            <if test="activityId != null  and activityId != ''"> and activity_id = #{activityId}</if>
@@ -29,12 +29,12 @@
        </where>
    </select>

    <select id="selectTActivityGoodsByAgId" parameterType="Long" resultMap="ActivityGoodsResult">
        <include refid="selectTActivityGoodsVo"/>
    <select id="selectActivityGoodsByAgId" parameterType="Long" resultMap="ActivityGoodsResult">
        <include refid="selectActivityGoodsVo"/>
        where ag_id = #{agId}
    </select>

    <insert id="insertTActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" useGeneratedKeys="true" keyProperty="agId">
    <insert id="insertActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" useGeneratedKeys="true" keyProperty="agId">
        insert into t_activity_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -56,7 +56,7 @@
        </trim>
    </insert>

    <update id="updateTActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods">
    <update id="updateActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods">
        update t_activity_goods
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -70,11 +70,11 @@
        where ag_id = #{agId}
    </update>

    <delete id="deleteTActivityGoodsByAgId" parameterType="Long">
    <delete id="deleteActivityGoodsByAgId" parameterType="Long">
        delete from t_activity_goods where ag_id = #{agId}
    </delete>

    <delete id="deleteTActivityGoodsByAgIds" parameterType="String">
    <delete id="deleteActivityGoodsByAgIds" parameterType="String">
        delete from t_activity_goods where ag_id in
        <foreach item="agId" collection="array" open="(" separator="," close=")">
            #{agId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/config/AdvertMapper.xml

@@ -15,12 +15,12 @@
        <result property="createUserId"    column="create_user_id"    />
    </resultMap>

    <sql id="selectTAdvertVo">
    <sql id="selectAdvertVo">
        select ad_id, del_flag, ad_url, ad_content, target_type, link_url, jump_id, logo_url, create_time, create_user_id from t_advert
    </sql>

    <select id="selectTAdvertList" parameterType="Advert" resultMap="AdvertResult">
        <include refid="selectTAdvertVo"/>
    <select id="selectAdvertList" parameterType="Advert" resultMap="AdvertResult">
        <include refid="selectAdvertVo"/>
        <where>
            <if test="adUrl != null  and adUrl != ''"> and ad_url = #{adUrl}</if>
            <if test="adContent != null  and adContent != ''"> and ad_content = #{adContent}</if>
@@ -32,12 +32,12 @@
        </where>
    </select>

    <select id="selectTAdvertByAdId" parameterType="Long" resultMap="AdvertResult">
        <include refid="selectTAdvertVo"/>
    <select id="selectAdvertByAdId" parameterType="Long" resultMap="AdvertResult">
        <include refid="selectAdvertVo"/>
        where ad_id = #{adId}
    </select>

    <insert id="insertTAdvert" parameterType="Advert" useGeneratedKeys="true" keyProperty="adId">
    <insert id="insertAdvert" parameterType="Advert" useGeneratedKeys="true" keyProperty="adId">
        insert into t_advert
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -63,7 +63,7 @@
        </trim>
    </insert>

    <update id="updateTAdvert" parameterType="Advert">
    <update id="updateAdvert" parameterType="Advert">
        update t_advert
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -79,11 +79,11 @@
        where ad_id = #{adId}
    </update>

    <delete id="deleteTAdvertByAdId" parameterType="Long">
    <delete id="deleteAdvertByAdId" parameterType="Long">
        delete from t_advert where ad_id = #{adId}
    </delete>

    <delete id="deleteTAdvertByAdIds" parameterType="String">
    <delete id="deleteAdvertByAdIds" parameterType="String">
        delete from t_advert where ad_id in
        <foreach item="adId" collection="array" open="(" separator="," close=")">
            #{adId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/config/AgreementMapper.xml

@@ -11,12 +11,12 @@
        <result property="createUserId"    column="create_user_id"    />
    </resultMap>

    <sql id="selectTAgreementVo">
    <sql id="selectAgreementVo">
        select agreement_id, del_flag, agreement_type, agreement_content, create_time, create_user_id from t_agreement
    </sql>

    <select id="selectTAgreementList" parameterType="Agreement" resultMap="AgreementResult">
        <include refid="selectTAgreementVo"/>
    <select id="selectAgreementList" parameterType="Agreement" resultMap="AgreementResult">
        <include refid="selectAgreementVo"/>
        <where>
            <if test="agreementType != null "> and agreement_type = #{agreementType}</if>
            <if test="agreementContent != null  and agreementContent != ''"> and agreement_content = #{agreementContent}</if>
@@ -24,12 +24,12 @@
        </where>
    </select>

    <select id="selectTAgreementByAgreementId" parameterType="Long" resultMap="AgreementResult">
        <include refid="selectTAgreementVo"/>
    <select id="selectAgreementByAgreementId" parameterType="Long" resultMap="AgreementResult">
        <include refid="selectAgreementVo"/>
        where agreement_id = #{agreementId}
    </select>

    <insert id="insertTAgreement" parameterType="Agreement" useGeneratedKeys="true" keyProperty="agreementId">
    <insert id="insertAgreement" parameterType="Agreement" useGeneratedKeys="true" keyProperty="agreementId">
        insert into t_agreement
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -47,7 +47,7 @@
        </trim>
    </insert>

    <update id="updateTAgreement" parameterType="Agreement">
    <update id="updateAgreement" parameterType="Agreement">
        update t_agreement
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -59,11 +59,11 @@
        where agreement_id = #{agreementId}
    </update>

    <delete id="deleteTAgreementByAgreementId" parameterType="Long">
    <delete id="deleteAgreementByAgreementId" parameterType="Long">
        delete from t_agreement where agreement_id = #{agreementId}
    </delete>

    <delete id="deleteTAgreementByAgreementIds" parameterType="String">
    <delete id="deleteAgreementByAgreementIds" parameterType="String">
        delete from t_agreement where agreement_id in
        <foreach item="agreementId" collection="array" open="(" separator="," close=")">
            #{agreementId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/config/BannerMapper.xml

@@ -16,12 +16,12 @@
        <result property="createUserId"    column="create_user_id"    />
    </resultMap>

    <sql id="selectTBannerVo">
    <sql id="selectBannerVo">
        select banner_id, del_flag, banner_position, banner_url, target_type, link_type, link_url, jump_type, jump_id, create_time, create_user_id from t_banner
    </sql>

    <select id="selectTBannerList" parameterType="Banner" resultMap="BannerResult">
        <include refid="selectTBannerVo"/>
    <select id="selectBannerList" parameterType="Banner" resultMap="BannerResult">
        <include refid="selectBannerVo"/>
        <where>
            <if test="bannerPosition != null "> and banner_position = #{bannerPosition}</if>
            <if test="bannerUrl != null  and bannerUrl != ''"> and banner_url = #{bannerUrl}</if>
@@ -34,12 +34,12 @@
        </where>
    </select>

    <select id="selectTBannerByBannerId" parameterType="Long" resultMap="BannerResult">
        <include refid="selectTBannerVo"/>
    <select id="selectBannerByBannerId" parameterType="Long" resultMap="BannerResult">
        <include refid="selectBannerVo"/>
        where banner_id = #{bannerId}
    </select>

    <insert id="insertTBanner" parameterType="Banner" useGeneratedKeys="true" keyProperty="bannerId">
    <insert id="insertBanner" parameterType="Banner" useGeneratedKeys="true" keyProperty="bannerId">
        insert into t_banner
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -67,7 +67,7 @@
        </trim>
    </insert>

    <update id="updateTBanner" parameterType="Banner">
    <update id="updateBanner" parameterType="Banner">
        update t_banner
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -84,11 +84,11 @@
        where banner_id = #{bannerId}
    </update>

    <delete id="deleteTBannerByBannerId" parameterType="Long">
    <delete id="deleteBannerByBannerId" parameterType="Long">
        delete from t_banner where banner_id = #{bannerId}
    </delete>

    <delete id="deleteTBannerByBannerIds" parameterType="String">
    <delete id="deleteBannerByBannerIds" parameterType="String">
        delete from t_banner where banner_id in
        <foreach item="bannerId" collection="array" open="(" separator="," close=")">
            #{bannerId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/config/CustomeConfigMapper.xml

@@ -10,15 +10,15 @@
        <result property="name"    column="name"    />
        <result property="value"    column="value"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
    </resultMap>

    <sql id="selectTCustomeConfigVo">
    <sql id="selectCustomeConfigVo">
        select id, del_flag, type, key, name, value, create_time, update_time from t_custome_config
    </sql>

    <select id="selectTCustomeConfigList" parameterType="CustomeConfig" resultMap="CustomeConfigResult">
        <include refid="selectTCustomeConfigVo"/>
    <select id="selectCustomeConfigList" parameterType="CustomeConfig" resultMap="CustomeConfigResult">
        <include refid="selectCustomeConfigVo"/>
        <where>
            <if test="type != null "> and type = #{type}</if>
            <if test="key != null  and key != ''"> and key = #{key}</if>
@@ -27,12 +27,12 @@
        </where>
    </select>

    <select id="selectTCustomeConfigById" parameterType="Long" resultMap="CustomeConfigResult">
        <include refid="selectTCustomeConfigVo"/>
    <select id="selectCustomeConfigById" parameterType="Long" resultMap="CustomeConfigResult">
        <include refid="selectCustomeConfigVo"/>
        where id = #{id}
    </select>

    <insert id="insertTCustomeConfig" parameterType="CustomeConfig" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertCustomeConfig" parameterType="CustomeConfig" useGeneratedKeys="true" keyProperty="id">
        insert into t_custome_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -41,7 +41,7 @@
            <if test="name != null">name,</if>
            <if test="value != null">value,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateime != null">update_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">#{delFlag},</if>
@@ -50,11 +50,11 @@
            <if test="name != null">#{name},</if>
            <if test="value != null">#{value},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateime != null">#{updateime},</if>
        </trim>
    </insert>

    <update id="updateTCustomeConfig" parameterType="CustomeConfig">
    <update id="updateCustomeConfig" parameterType="CustomeConfig">
        update t_custome_config
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -63,16 +63,16 @@
            <if test="name != null">name = #{name},</if>
            <if test="value != null">value = #{value},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateime != null">update_time = #{updateime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTCustomeConfigById" parameterType="Long">
    <delete id="deleteCustomeConfigById" parameterType="Long">
        delete from t_custome_config where id = #{id}
    </delete>

    <delete id="deleteTCustomeConfigByIds" parameterType="String">
    <delete id="deleteCustomeConfigByIds" parameterType="String">
        delete from t_custome_config where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/config/PopMapper.xml

@@ -16,12 +16,12 @@
        <result property="createUserId"    column="create_user_id"    />
    </resultMap>

    <sql id="selectTPopVo">
    <sql id="selectPopVo">
        select pop_id, del_flag, pop_sort, pop_url, show_start_time, show_end_time, target_type, link_url, jump_id, create_time, create_user_id from t_pop
    </sql>

    <select id="selectTPopList" parameterType="Pop" resultMap="PopResult">
        <include refid="selectTPopVo"/>
    <select id="selectPopList" parameterType="Pop" resultMap="PopResult">
        <include refid="selectPopVo"/>
        <where>
            <if test="popSort != null "> and pop_sort = #{popSort}</if>
            <if test="popUrl != null  and popUrl != ''"> and pop_url = #{popUrl}</if>
@@ -34,12 +34,12 @@
        </where>
    </select>

    <select id="selectTPopByPopId" parameterType="Long" resultMap="PopResult">
        <include refid="selectTPopVo"/>
    <select id="selectPopByPopId" parameterType="Long" resultMap="PopResult">
        <include refid="selectPopVo"/>
        where pop_id = #{popId}
    </select>

    <insert id="insertTPop" parameterType="Pop" useGeneratedKeys="true" keyProperty="popId">
    <insert id="insertPop" parameterType="Pop" useGeneratedKeys="true" keyProperty="popId">
        insert into t_pop
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -67,7 +67,7 @@
        </trim>
    </insert>

    <update id="updateTPop" parameterType="Pop">
    <update id="updatePop" parameterType="Pop">
        update t_pop
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -84,11 +84,11 @@
        where pop_id = #{popId}
    </update>

    <delete id="deleteTPopByPopId" parameterType="Long">
    <delete id="deletePopByPopId" parameterType="Long">
        delete from t_pop where pop_id = #{popId}
    </delete>

    <delete id="deleteTPopByPopIds" parameterType="String">
    <delete id="deletePopByPopIds" parameterType="String">
        delete from t_pop where pop_id in
        <foreach item="popId" collection="array" open="(" separator="," close=")">
            #{popId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/config/QuickEntryMapper.xml

@@ -15,12 +15,12 @@
        <result property="createUserId"    column="create_user_id"    />
    </resultMap>

    <sql id="selectTQuickEntryVo">
    <sql id="selectQuickEntryVo">
        select entry_id, del_flag, entry_sort, entry_url, entry_name, target_type, link_url, jump_id, create_time, create_user_id from t_quick_entry
    </sql>

    <select id="selectTQuickEntryList" parameterType="QuickEntry" resultMap="QuickEntryResult">
        <include refid="selectTQuickEntryVo"/>
    <select id="selectQuickEntryList" parameterType="QuickEntry" resultMap="QuickEntryResult">
        <include refid="selectQuickEntryVo"/>
        <where>
            <if test="entrySort != null "> and entry_sort = #{entrySort}</if>
            <if test="entryUrl != null  and entryUrl != ''"> and entry_url = #{entryUrl}</if>
@@ -32,12 +32,12 @@
        </where>
    </select>

    <select id="selectTQuickEntryByEntryId" parameterType="Long" resultMap="QuickEntryResult">
        <include refid="selectTQuickEntryVo"/>
    <select id="selectQuickEntryByEntryId" parameterType="Long" resultMap="QuickEntryResult">
        <include refid="selectQuickEntryVo"/>
        where entry_id = #{entryId}
    </select>

    <insert id="insertTQuickEntry" parameterType="QuickEntry" useGeneratedKeys="true" keyProperty="entryId">
    <insert id="insertQuickEntry" parameterType="QuickEntry" useGeneratedKeys="true" keyProperty="entryId">
        insert into t_quick_entry
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -63,7 +63,7 @@
        </trim>
    </insert>

    <update id="updateTQuickEntry" parameterType="QuickEntry">
    <update id="updateQuickEntry" parameterType="QuickEntry">
        update t_quick_entry
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -79,11 +79,11 @@
        where entry_id = #{entryId}
    </update>

    <delete id="deleteTQuickEntryByEntryId" parameterType="Long">
    <delete id="deleteQuickEntryByEntryId" parameterType="Long">
        delete from t_quick_entry where entry_id = #{entryId}
    </delete>

    <delete id="deleteTQuickEntryByEntryIds" parameterType="String">
    <delete id="deleteQuickEntryByEntryIds" parameterType="String">
        delete from t_quick_entry where entry_id in
        <foreach item="entryId" collection="array" open="(" separator="," close=")">
            #{entryId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/coupon/CouponMapper.xml

@@ -21,16 +21,16 @@
        <result property="validDay"    column="valid_day"    />
        <result property="createTime"    column="create_time"    />
        <result property="createUserId"    column="create_user_id"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
        <result property="updateUserId"    column="update_user_id"    />
    </resultMap>

    <sql id="selectTCouponVo">
    <sql id="selectCouponVo">
        select coupon_id, del_flag, coupon_type, coupon_status, coupon_name, send_type, send_time_type, send_time, money_threshold, dicount_money, discout_percent, use_scope, valid_time_type, valid_start_time, valid_end_time, valid_day, create_time, create_user_id, update_time, update_user_id from t_coupon
    </sql>

    <select id="selectTCouponList" parameterType="Coupon" resultMap="CouponResult">
        <include refid="selectTCouponVo"/>
    <select id="selectCouponList" parameterType="Coupon" resultMap="CouponResult">
        <include refid="selectCouponVo"/>
        <where>
            <if test="couponType != null "> and coupon_type = #{couponType}</if>
            <if test="couponStatus != null "> and coupon_status = #{couponStatus}</if>
@@ -51,12 +51,12 @@
        </where>
    </select>

    <select id="selectTCouponByCouponId" parameterType="String" resultMap="CouponResult">
        <include refid="selectTCouponVo"/>
    <select id="selectCouponByCouponId" parameterType="String" resultMap="CouponResult">
        <include refid="selectCouponVo"/>
        where coupon_id = #{couponId}
    </select>

    <insert id="insertTCoupon" parameterType="Coupon">
    <insert id="insertCoupon" parameterType="Coupon">
        insert into t_coupon
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="couponId != null">coupon_id,</if>
@@ -77,7 +77,7 @@
            <if test="validDay != null">valid_day,</if>
            <if test="createTime != null">create_time,</if>
            <if test="createUserId != null">create_user_id,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateime != null">update_time,</if>
            <if test="updateUserId != null">update_user_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -99,12 +99,12 @@
            <if test="validDay != null">#{validDay},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="createUserId != null">#{createUserId},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateime != null">#{updateime},</if>
            <if test="updateUserId != null">#{updateUserId},</if>
        </trim>
    </insert>

    <update id="updateTCoupon" parameterType="Coupon">
    <update id="updateCoupon" parameterType="Coupon">
        update t_coupon
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -124,17 +124,17 @@
            <if test="validDay != null">valid_day = #{validDay},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="createUserId != null">create_user_id = #{createUserId},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateime != null">update_time = #{updateime},</if>
            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
        </trim>
        where coupon_id = #{couponId}
    </update>

    <delete id="deleteTCouponByCouponId" parameterType="String">
    <delete id="deleteCouponByCouponId" parameterType="String">
        delete from t_coupon where coupon_id = #{couponId}
    </delete>

    <delete id="deleteTCouponByCouponIds" parameterType="String">
    <delete id="deleteCouponByCouponIds" parameterType="String">
        delete from t_coupon where coupon_id in
        <foreach item="couponId" collection="array" open="(" separator="," close=")">
            #{couponId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/coupon/CouponRelGoodsMapper.xml

@@ -9,24 +9,24 @@
        <result property="goodsId"    column="goods_id"    />
    </resultMap>

    <sql id="selectTCouponRelGoodsVo">
    <sql id="selectCouponRelGoodsVo">
        select id, del_flag, coupon_id, goods_id from t_coupon_rel_goods
    </sql>

    <select id="selectTCouponRelGoodsList" parameterType="CouponRelGoods" resultMap="CouponRelGoodsResult">
        <include refid="selectTCouponRelGoodsVo"/>
    <select id="selectCouponRelGoodsList" parameterType="CouponRelGoods" resultMap="CouponRelGoodsResult">
        <include refid="selectCouponRelGoodsVo"/>
        <where>
            <if test="couponId != null  and couponId != ''"> and coupon_id = #{couponId}</if>
            <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
        </where>
    </select>

    <select id="selectTCouponRelGoodsById" parameterType="Long" resultMap="CouponRelGoodsResult">
        <include refid="selectTCouponRelGoodsVo"/>
    <select id="selectCouponRelGoodsById" parameterType="Long" resultMap="CouponRelGoodsResult">
        <include refid="selectCouponRelGoodsVo"/>
        where id = #{id}
    </select>

    <insert id="insertTCouponRelGoods" parameterType="CouponRelGoods" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertCouponRelGoods" parameterType="CouponRelGoods" useGeneratedKeys="true" keyProperty="id">
        insert into t_coupon_rel_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -40,7 +40,7 @@
        </trim>
    </insert>

    <update id="updateTCouponRelGoods" parameterType="CouponRelGoods">
    <update id="updateCouponRelGoods" parameterType="CouponRelGoods">
        update t_coupon_rel_goods
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -50,11 +50,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTCouponRelGoodsById" parameterType="Long">
    <delete id="deleteCouponRelGoodsById" parameterType="Long">
        delete from t_coupon_rel_goods where id = #{id}
    </delete>

    <delete id="deleteTCouponRelGoodsByIds" parameterType="String">
    <delete id="deleteCouponRelGoodsByIds" parameterType="String">
        delete from t_coupon_rel_goods where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/coupon/CouponRelUserMapper.xml

@@ -9,24 +9,24 @@
        <result property="userId"    column="user_id"    />
    </resultMap>

    <sql id="selectTCouponRelUserVo">
    <sql id="selectCouponRelUserVo">
        select id, del_flag, coupon_id, user_id from t_coupon_rel_user
    </sql>

    <select id="selectTCouponRelUserList" parameterType="CouponRelUser" resultMap="CouponRelUserResult">
        <include refid="selectTCouponRelUserVo"/>
    <select id="selectCouponRelUserList" parameterType="CouponRelUser" resultMap="CouponRelUserResult">
        <include refid="selectCouponRelUserVo"/>
        <where>
            <if test="couponId != null  and couponId != ''"> and coupon_id = #{couponId}</if>
            <if test="userId != null "> and user_id = #{userId}</if>
        </where>
    </select>

    <select id="selectTCouponRelUserById" parameterType="Long" resultMap="CouponRelUserResult">
        <include refid="selectTCouponRelUserVo"/>
    <select id="selectCouponRelUserById" parameterType="Long" resultMap="CouponRelUserResult">
        <include refid="selectCouponRelUserVo"/>
        where id = #{id}
    </select>

    <insert id="insertTCouponRelUser" parameterType="CouponRelUser" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertCouponRelUser" parameterType="CouponRelUser" useGeneratedKeys="true" keyProperty="id">
        insert into t_coupon_rel_user
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -40,7 +40,7 @@
        </trim>
    </insert>

    <update id="updateTCouponRelUser" parameterType="CouponRelUser">
    <update id="updateCouponRelUser" parameterType="CouponRelUser">
        update t_coupon_rel_user
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -50,11 +50,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTCouponRelUserById" parameterType="Long">
    <delete id="deleteCouponRelUserById" parameterType="Long">
        delete from t_coupon_rel_user where id = #{id}
    </delete>

    <delete id="deleteTCouponRelUserByIds" parameterType="String">
    <delete id="deleteCouponRelUserByIds" parameterType="String">
        delete from t_coupon_rel_user where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/coupon/CouponTotalMapper.xml

@@ -8,24 +8,24 @@
        <result property="sendUserCount"    column="send_user_count"    />
    </resultMap>

    <sql id="selectTCouponTotalVo">
    <sql id="selectCouponTotalVo">
        select coupon_id, send_count, send_user_count from t_coupon_total
    </sql>

    <select id="selectTCouponTotalList" parameterType="CouponTotal" resultMap="CouponTotalResult">
        <include refid="selectTCouponTotalVo"/>
    <select id="selectCouponTotalList" parameterType="CouponTotal" resultMap="CouponTotalResult">
        <include refid="selectCouponTotalVo"/>
        <where>
            <if test="sendCount != null "> and send_count = #{sendCount}</if>
            <if test="sendUserCount != null "> and send_user_count = #{sendUserCount}</if>
        </where>
    </select>

    <select id="selectTCouponTotalByCouponId" parameterType="String" resultMap="CouponTotalResult">
        <include refid="selectTCouponTotalVo"/>
    <select id="selectCouponTotalByCouponId" parameterType="String" resultMap="CouponTotalResult">
        <include refid="selectCouponTotalVo"/>
        where coupon_id = #{couponId}
    </select>

    <insert id="insertTCouponTotal" parameterType="CouponTotal">
    <insert id="insertCouponTotal" parameterType="CouponTotal">
        insert into t_coupon_total
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="couponId != null">coupon_id,</if>
@@ -39,7 +39,7 @@
        </trim>
    </insert>

    <update id="updateTCouponTotal" parameterType="CouponTotal">
    <update id="updateCouponTotal" parameterType="CouponTotal">
        update t_coupon_total
        <trim prefix="SET" suffixOverrides=",">
            <if test="sendCount != null">send_count = #{sendCount},</if>
@@ -48,11 +48,11 @@
        where coupon_id = #{couponId}
    </update>

    <delete id="deleteTCouponTotalByCouponId" parameterType="String">
    <delete id="deleteCouponTotalByCouponId" parameterType="String">
        delete from t_coupon_total where coupon_id = #{couponId}
    </delete>

    <delete id="deleteTCouponTotalByCouponIds" parameterType="String">
    <delete id="deleteCouponTotalByCouponIds" parameterType="String">
        delete from t_coupon_total where coupon_id in
        <foreach item="couponId" collection="array" open="(" separator="," close=")">
            #{couponId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/goods/GoodsFileMapper.xml

@@ -10,12 +10,12 @@
        <result property="fileUrl"    column="file_url"    />
    </resultMap>

    <sql id="selectTGoodsFileVo">
    <sql id="selectGoodsFileVo">
        select id, del_flag, goods_id, file_type, file_url from t_goods_file
    </sql>

    <select id="selectTGoodsFileList" parameterType="GoodsFile" resultMap="GoodsFileResult">
        <include refid="selectTGoodsFileVo"/>
    <select id="selectGoodsFileList" parameterType="GoodsFile" resultMap="GoodsFileResult">
        <include refid="selectGoodsFileVo"/>
        <where>
            <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
            <if test="fileType != null "> and file_type = #{fileType}</if>
@@ -23,12 +23,12 @@
        </where>
    </select>

    <select id="selectTGoodsFileById" parameterType="Long" resultMap="GoodsFileResult">
        <include refid="selectTGoodsFileVo"/>
    <select id="selectGoodsFileById" parameterType="Long" resultMap="GoodsFileResult">
        <include refid="selectGoodsFileVo"/>
        where id = #{id}
    </select>

    <insert id="insertTGoodsFile" parameterType="GoodsFile" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertGoodsFile" parameterType="GoodsFile" useGeneratedKeys="true" keyProperty="id">
        insert into t_goods_file
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -44,7 +44,7 @@
        </trim>
    </insert>

    <update id="updateTGoodsFile" parameterType="GoodsFile">
    <update id="updateGoodsFile" parameterType="GoodsFile">
        update t_goods_file
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -55,11 +55,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTGoodsFileById" parameterType="Long">
    <delete id="deleteGoodsFileById" parameterType="Long">
        delete from t_goods_file where id = #{id}
    </delete>

    <delete id="deleteTGoodsFileByIds" parameterType="String">
    <delete id="deleteGoodsFileByIds" parameterType="String">
        delete from t_goods_file where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/goods/GoodsMapper.xml

@@ -9,7 +9,7 @@
        <result property="goodsType"    column="goods_type"    />
        <result property="createTime"    column="create_time"    />
        <result property="createUserId"    column="create_user_id"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
        <result property="updateUserId"    column="update_user_id"    />
        <result property="goodsClassId"    column="goods_class_id"    />
        <result property="goodsName"    column="goods_name"    />
@@ -26,12 +26,12 @@
        <result property="goodsTags"    column="goods_tags"    />
    </resultMap>

    <sql id="selectTGoodsVo">
    <sql id="selectGoodsVo">
        select goods_id, del_flag, goods_status, goods_type, create_time, create_user_id, update_time, update_user_id, goods_class_id, goods_name, cycle_num_flag, service_num, goods_introduction, sales_price, mininum_price, subscription_flag, subscription, goods_detail, recommend_flag, goods_nurses, goods_tags from t_goods
    </sql>

    <select id="selectTGoodsList" parameterType="Goods" resultMap="GoodsResult">
        <include refid="selectTGoodsVo"/>
    <select id="selectGoodsList" parameterType="Goods" resultMap="GoodsResult">
        <include refid="selectGoodsVo"/>
        <where>
            <if test="goodsStatus != null "> and goods_status = #{goodsStatus}</if>
            <if test="goodsType != null "> and goods_type = #{goodsType}</if>
@@ -53,12 +53,12 @@
        </where>
    </select>

    <select id="selectTGoodsByGoodsId" parameterType="String" resultMap="GoodsResult">
        <include refid="selectTGoodsVo"/>
    <select id="selectGoodsByGoodsId" parameterType="String" resultMap="GoodsResult">
        <include refid="selectGoodsVo"/>
        where goods_id = #{goodsId}
    </select>

    <insert id="insertTGoods" parameterType="Goods">
    <insert id="insertGoods" parameterType="Goods">
        insert into t_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="goodsId != null">goods_id,</if>
@@ -67,7 +67,7 @@
            <if test="goodsType != null">goods_type,</if>
            <if test="createTime != null">create_time,</if>
            <if test="createUserId != null">create_user_id,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateime != null">update_time,</if>
            <if test="updateUserId != null">update_user_id,</if>
            <if test="goodsClassId != null">goods_class_id,</if>
            <if test="goodsName != null">goods_name,</if>
@@ -90,7 +90,7 @@
            <if test="goodsType != null">#{goodsType},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="createUserId != null">#{createUserId},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateime != null">#{updateime},</if>
            <if test="updateUserId != null">#{updateUserId},</if>
            <if test="goodsClassId != null">#{goodsClassId},</if>
            <if test="goodsName != null">#{goodsName},</if>
@@ -108,7 +108,7 @@
        </trim>
    </insert>

    <update id="updateTGoods" parameterType="Goods">
    <update id="updateGoods" parameterType="Goods">
        update t_goods
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -116,7 +116,7 @@
            <if test="goodsType != null">goods_type = #{goodsType},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="createUserId != null">create_user_id = #{createUserId},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateime != null">update_time = #{updateime},</if>
            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
            <if test="goodsClassId != null">goods_class_id = #{goodsClassId},</if>
            <if test="goodsName != null">goods_name = #{goodsName},</if>
@@ -135,11 +135,11 @@
        where goods_id = #{goodsId}
    </update>

    <delete id="deleteTGoodsByGoodsId" parameterType="String">
    <delete id="deleteGoodsByGoodsId" parameterType="String">
        delete from t_goods where goods_id = #{goodsId}
    </delete>

    <delete id="deleteTGoodsByGoodsIds" parameterType="String">
    <delete id="deleteGoodsByGoodsIds" parameterType="String">
        delete from t_goods where goods_id in
        <foreach item="goodsId" collection="array" open="(" separator="," close=")">
            #{goodsId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/goods/GoodsRelNurseMapper.xml

@@ -9,24 +9,24 @@
        <result property="nurse"    column="nurse"    />
    </resultMap>

    <sql id="selectTGoodsRelNurseVo">
    <sql id="selectGoodsRelNurseVo">
        select id, del_flag, goods_id, nurse from t_goods_rel_nurse
    </sql>

    <select id="selectTGoodsRelNurseList" parameterType="GoodsRelNurse" resultMap="GoodsRelNurseResult">
        <include refid="selectTGoodsRelNurseVo"/>
    <select id="selectGoodsRelNurseList" parameterType="GoodsRelNurse" resultMap="GoodsRelNurseResult">
        <include refid="selectGoodsRelNurseVo"/>
        <where>
            <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
            <if test="nurse != null  and nurse != ''"> and nurse = #{nurse}</if>
        </where>
    </select>

    <select id="selectTGoodsRelNurseById" parameterType="Long" resultMap="GoodsRelNurseResult">
        <include refid="selectTGoodsRelNurseVo"/>
    <select id="selectGoodsRelNurseById" parameterType="Long" resultMap="GoodsRelNurseResult">
        <include refid="selectGoodsRelNurseVo"/>
        where id = #{id}
    </select>

    <insert id="insertTGoodsRelNurse" parameterType="GoodsRelNurse" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertGoodsRelNurse" parameterType="GoodsRelNurse" useGeneratedKeys="true" keyProperty="id">
        insert into t_goods_rel_nurse
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -40,7 +40,7 @@
        </trim>
    </insert>

    <update id="updateTGoodsRelNurse" parameterType="GoodsRelNurse">
    <update id="updateGoodsRelNurse" parameterType="GoodsRelNurse">
        update t_goods_rel_nurse
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -50,11 +50,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTGoodsRelNurseById" parameterType="Long">
    <delete id="deleteGoodsRelNurseById" parameterType="Long">
        delete from t_goods_rel_nurse where id = #{id}
    </delete>

    <delete id="deleteTGoodsRelNurseByIds" parameterType="String">
    <delete id="deleteGoodsRelNurseByIds" parameterType="String">
        delete from t_goods_rel_nurse where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/goods/GoodsRelTagMapper.xml

@@ -9,24 +9,24 @@
        <result property="tagId"    column="tag_id"    />
    </resultMap>

    <sql id="selectTGoodsRelTagVo">
    <sql id="selectGoodsRelTagVo">
        select id, del_flag, goods_id, tag_id from t_goods_rel_tag
    </sql>

    <select id="selectTGoodsRelTagList" parameterType="GoodsRelTag" resultMap="GoodsRelTagResult">
        <include refid="selectTGoodsRelTagVo"/>
    <select id="selectGoodsRelTagList" parameterType="GoodsRelTag" resultMap="GoodsRelTagResult">
        <include refid="selectGoodsRelTagVo"/>
        <where>
            <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
            <if test="tagId != null "> and tag_id = #{tagId}</if>
        </where>
    </select>

    <select id="selectTGoodsRelTagById" parameterType="Long" resultMap="GoodsRelTagResult">
        <include refid="selectTGoodsRelTagVo"/>
    <select id="selectGoodsRelTagById" parameterType="Long" resultMap="GoodsRelTagResult">
        <include refid="selectGoodsRelTagVo"/>
        where id = #{id}
    </select>

    <insert id="insertTGoodsRelTag" parameterType="GoodsRelTag" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertGoodsRelTag" parameterType="GoodsRelTag" useGeneratedKeys="true" keyProperty="id">
        insert into t_goods_rel_tag
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -40,7 +40,7 @@
        </trim>
    </insert>

    <update id="updateTGoodsRelTag" parameterType="GoodsRelTag">
    <update id="updateGoodsRelTag" parameterType="GoodsRelTag">
        update t_goods_rel_tag
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -50,11 +50,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTGoodsRelTagById" parameterType="Long">
    <delete id="deleteGoodsRelTagById" parameterType="Long">
        delete from t_goods_rel_tag where id = #{id}
    </delete>

    <delete id="deleteTGoodsRelTagByIds" parameterType="String">
    <delete id="deleteGoodsRelTagByIds" parameterType="String">
        delete from t_goods_rel_tag where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/goods/GoodsTotalMapper.xml

@@ -9,12 +9,12 @@
        <result property="buyUserCount"    column="buy_user_count"    />
    </resultMap>

    <sql id="selectTGoodsTotalVo">
    <sql id="selectGoodsTotalVo">
        select goods_id, buy_count, buy_num_count, buy_user_count from t_goods_total
    </sql>

    <select id="selectTGoodsTotalList" parameterType="GoodsTotal" resultMap="GoodsTotalResult">
        <include refid="selectTGoodsTotalVo"/>
    <select id="selectGoodsTotalList" parameterType="GoodsTotal" resultMap="GoodsTotalResult">
        <include refid="selectGoodsTotalVo"/>
        <where>
            <if test="buyCount != null "> and buy_count = #{buyCount}</if>
            <if test="buyNumCount != null "> and buy_num_count = #{buyNumCount}</if>
@@ -22,12 +22,12 @@
        </where>
    </select>

    <select id="selectTGoodsTotalByGoodsId" parameterType="String" resultMap="GoodsTotalResult">
        <include refid="selectTGoodsTotalVo"/>
    <select id="selectGoodsTotalByGoodsId" parameterType="String" resultMap="GoodsTotalResult">
        <include refid="selectGoodsTotalVo"/>
        where goods_id = #{goodsId}
    </select>

    <insert id="insertTGoodsTotal" parameterType="GoodsTotal">
    <insert id="insertGoodsTotal" parameterType="GoodsTotal">
        insert into t_goods_total
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="goodsId != null">goods_id,</if>
@@ -43,7 +43,7 @@
        </trim>
    </insert>

    <update id="updateTGoodsTotal" parameterType="GoodsTotal">
    <update id="updateGoodsTotal" parameterType="GoodsTotal">
        update t_goods_total
        <trim prefix="SET" suffixOverrides=",">
            <if test="buyCount != null">buy_count = #{buyCount},</if>
@@ -53,11 +53,11 @@
        where goods_id = #{goodsId}
    </update>

    <delete id="deleteTGoodsTotalByGoodsId" parameterType="String">
    <delete id="deleteGoodsTotalByGoodsId" parameterType="String">
        delete from t_goods_total where goods_id = #{goodsId}
    </delete>

    <delete id="deleteTGoodsTotalByGoodsIds" parameterType="String">
    <delete id="deleteGoodsTotalByGoodsIds" parameterType="String">
        delete from t_goods_total where goods_id in
        <foreach item="goodsId" collection="array" open="(" separator="," close=")">
            #{goodsId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/member/MemberArchiveFieldsMapper.xml

@@ -13,12 +13,12 @@
        <result property="optionValues"    column="option_values"    />
    </resultMap>

    <sql id="selectTMemberArchiveFieldsVo">
    <sql id="selectMemberArchiveFieldsVo">
        select id, del_flag, field_name, field_type, required_flag, field_sort, input_tip, option_values from t_member_archive_fields
    </sql>

    <select id="selectTMemberArchiveFieldsList" parameterType="MemberArchiveFields" resultMap="MemberArchiveFieldsResult">
        <include refid="selectTMemberArchiveFieldsVo"/>
    <select id="selectMemberArchiveFieldsList" parameterType="MemberArchiveFields" resultMap="MemberArchiveFieldsResult">
        <include refid="selectMemberArchiveFieldsVo"/>
        <where>
            <if test="fieldName != null  and fieldName != ''"> and field_name like concat('%', #{fieldName}, '%')</if>
            <if test="fieldType != null "> and field_type = #{fieldType}</if>
@@ -29,12 +29,12 @@
        </where>
    </select>

    <select id="selectTMemberArchiveFieldsById" parameterType="Long" resultMap="MemberArchiveFieldsResult">
        <include refid="selectTMemberArchiveFieldsVo"/>
    <select id="selectMemberArchiveFieldsById" parameterType="Long" resultMap="MemberArchiveFieldsResult">
        <include refid="selectMemberArchiveFieldsVo"/>
        where id = #{id}
    </select>

    <insert id="insertTMemberArchiveFields" parameterType="MemberArchiveFields" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertMemberArchiveFields" parameterType="MemberArchiveFields" useGeneratedKeys="true" keyProperty="id">
        insert into t_member_archive_fields
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -56,7 +56,7 @@
        </trim>
    </insert>

    <update id="updateTMemberArchiveFields" parameterType="MemberArchiveFields">
    <update id="updateMemberArchiveFields" parameterType="MemberArchiveFields">
        update t_member_archive_fields
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -70,11 +70,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTMemberArchiveFieldsById" parameterType="Long">
    <delete id="deleteMemberArchiveFieldsById" parameterType="Long">
        delete from t_member_archive_fields where id = #{id}
    </delete>

    <delete id="deleteTMemberArchiveFieldsByIds" parameterType="String">
    <delete id="deleteMemberArchiveFieldsByIds" parameterType="String">
        delete from t_member_archive_fields where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/member/MemberArchiveMapper.xml

@@ -10,12 +10,12 @@
        <result property="fieldValue"    column="field_value"    />
    </resultMap>

    <sql id="selectTMemberArchiveVo">
    <sql id="selectMemberArchiveVo">
        select id, del_flag, user_id, field_id, field_value from t_member_archive
    </sql>

    <select id="selectTMemberArchiveList" parameterType="MemberArchive" resultMap="MemberArchiveResult">
        <include refid="selectTMemberArchiveVo"/>
    <select id="selectMemberArchiveList" parameterType="MemberArchive" resultMap="MemberArchiveResult">
        <include refid="selectMemberArchiveVo"/>
        <where>
            <if test="userId != null "> and user_id = #{userId}</if>
            <if test="fieldId != null "> and field_id = #{fieldId}</if>
@@ -23,12 +23,12 @@
        </where>
    </select>

    <select id="selectTMemberArchiveById" parameterType="Long" resultMap="MemberArchiveResult">
        <include refid="selectTMemberArchiveVo"/>
    <select id="selectMemberArchiveById" parameterType="Long" resultMap="MemberArchiveResult">
        <include refid="selectMemberArchiveVo"/>
        where id = #{id}
    </select>

    <insert id="insertTMemberArchive" parameterType="MemberArchive" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertMemberArchive" parameterType="MemberArchive" useGeneratedKeys="true" keyProperty="id">
        insert into t_member_archive
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -44,7 +44,7 @@
        </trim>
    </insert>

    <update id="updateTMemberArchive" parameterType="MemberArchive">
    <update id="updateMemberArchive" parameterType="MemberArchive">
        update t_member_archive
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -55,11 +55,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTMemberArchiveById" parameterType="Long">
    <delete id="deleteMemberArchiveById" parameterType="Long">
        delete from t_member_archive where id = #{id}
    </delete>

    <delete id="deleteTMemberArchiveByIds" parameterType="String">
    <delete id="deleteMemberArchiveByIds" parameterType="String">
        delete from t_member_archive where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/member/MemberMapper.xml

@@ -19,16 +19,16 @@
        <result property="level"    column="level"    />
        <result property="birthday"    column="birthday"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
        <result property="updateUserId"    column="update_user_id"    />
    </resultMap>

    <sql id="selectTMemberVo">
    <sql id="selectMemberVo">
        select user_id, del_flag, member_id, member_no, wx_openid, mini_openid, wx_unionid, realtion_shop_id, real_name, mobile, gender, referrer, customer_source, level, birthday, create_time, update_time, update_user_id from t_member
    </sql>

    <select id="selectTMemberList" parameterType="Member" resultMap="MemberResult">
        <include refid="selectTMemberVo"/>
    <select id="selectMemberList" parameterType="Member" resultMap="MemberResult">
        <include refid="selectMemberVo"/>
        <where>
            <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
            <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
@@ -47,12 +47,12 @@
        </where>
    </select>

    <select id="selectTMemberByUserId" parameterType="Long" resultMap="MemberResult">
        <include refid="selectTMemberVo"/>
    <select id="selectMemberByUserId" parameterType="Long" resultMap="MemberResult">
        <include refid="selectMemberVo"/>
        where user_id = #{userId}
    </select>

    <insert id="insertTMember" parameterType="Member">
    <insert id="insertMember" parameterType="Member">
        insert into t_member
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="userId != null">user_id,</if>
@@ -71,7 +71,7 @@
            <if test="level != null">level,</if>
            <if test="birthday != null">birthday,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateime != null">update_time,</if>
            <if test="updateUserId != null">update_user_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -91,12 +91,12 @@
            <if test="level != null">#{level},</if>
            <if test="birthday != null">#{birthday},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateime != null">#{updateime},</if>
            <if test="updateUserId != null">#{updateUserId},</if>
        </trim>
    </insert>

    <update id="updateTMember" parameterType="Member">
    <update id="updateMember" parameterType="Member">
        update t_member
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -114,17 +114,17 @@
            <if test="level != null">level = #{level},</if>
            <if test="birthday != null">birthday = #{birthday},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateime != null">update_time = #{updateime},</if>
            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
        </trim>
        where user_id = #{userId}
    </update>

    <delete id="deleteTMemberByUserId" parameterType="Long">
    <delete id="deleteMemberByUserId" parameterType="Long">
        delete from t_member where user_id = #{userId}
    </delete>

    <delete id="deleteTMemberByUserIds" parameterType="String">
    <delete id="deleteMemberByUserIds" parameterType="String">
        delete from t_member where user_id in
        <foreach item="userId" collection="array" open="(" separator="," close=")">
            #{userId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/member/MemberNurseMapper.xml

@@ -9,24 +9,24 @@
        <result property="nurse"    column="nurse"    />
    </resultMap>

    <sql id="selectTMemberNurseVo">
    <sql id="selectMemberNurseVo">
        select id, del_flag, user_id, nurse from t_member_nurse
    </sql>

    <select id="selectTMemberNurseList" parameterType="MemberNurse" resultMap="MemberNurseResult">
        <include refid="selectTMemberNurseVo"/>
    <select id="selectMemberNurseList" parameterType="MemberNurse" resultMap="MemberNurseResult">
        <include refid="selectMemberNurseVo"/>
        <where>
            <if test="userId != null "> and user_id = #{userId}</if>
            <if test="nurse != null  and nurse != ''"> and nurse = #{nurse}</if>
        </where>
    </select>

    <select id="selectTMemberNurseById" parameterType="Long" resultMap="MemberNurseResult">
        <include refid="selectTMemberNurseVo"/>
    <select id="selectMemberNurseById" parameterType="Long" resultMap="MemberNurseResult">
        <include refid="selectMemberNurseVo"/>
        where id = #{id}
    </select>

    <insert id="insertTMemberNurse" parameterType="MemberNurse" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertMemberNurse" parameterType="MemberNurse" useGeneratedKeys="true" keyProperty="id">
        insert into t_member_nurse
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -40,7 +40,7 @@
        </trim>
    </insert>

    <update id="updateTMemberNurse" parameterType="MemberNurse">
    <update id="updateMemberNurse" parameterType="MemberNurse">
        update t_member_nurse
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -50,11 +50,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTMemberNurseById" parameterType="Long">
    <delete id="deleteMemberNurseById" parameterType="Long">
        delete from t_member_nurse where id = #{id}
    </delete>

    <delete id="deleteTMemberNurseByIds" parameterType="String">
    <delete id="deleteMemberNurseByIds" parameterType="String">
        delete from t_member_nurse where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/member/UserCouponMapper.xml

@@ -26,12 +26,12 @@
        <result property="deadlineTime"    column="deadline_time"    />
    </resultMap>

    <sql id="selectTUserCouponVo">
    <sql id="selectUserCouponVo">
        select id, del_flag, coupon_id, user_id, coupon_type, coupon_status, coupon_name, send_type, send_time_type, send_time, money_threshold, dicount_money, discout_percent, use_scope, valid_time_type, valid_start_time, valid_end_time, valid_day, receive_time, user_time, deadline_time from t_user_coupon
    </sql>

    <select id="selectTUserCouponList" parameterType="UserCoupon" resultMap="UserCouponResult">
        <include refid="selectTUserCouponVo"/>
    <select id="selectUserCouponList" parameterType="UserCoupon" resultMap="UserCouponResult">
        <include refid="selectUserCouponVo"/>
        <where>
            <if test="couponId != null  and couponId != ''"> and coupon_id = #{couponId}</if>
            <if test="userId != null "> and user_id = #{userId}</if>
@@ -55,12 +55,12 @@
        </where>
    </select>

    <select id="selectTUserCouponById" parameterType="Long" resultMap="UserCouponResult">
        <include refid="selectTUserCouponVo"/>
    <select id="selectUserCouponById" parameterType="Long" resultMap="UserCouponResult">
        <include refid="selectUserCouponVo"/>
        where id = #{id}
    </select>

    <insert id="insertTUserCoupon" parameterType="UserCoupon" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertUserCoupon" parameterType="UserCoupon" useGeneratedKeys="true" keyProperty="id">
        insert into t_user_coupon
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -108,7 +108,7 @@
        </trim>
    </insert>

    <update id="updateTUserCoupon" parameterType="UserCoupon">
    <update id="updateUserCoupon" parameterType="UserCoupon">
        update t_user_coupon
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -135,11 +135,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTUserCouponById" parameterType="Long">
    <delete id="deleteUserCouponById" parameterType="Long">
        delete from t_user_coupon where id = #{id}
    </delete>

    <delete id="deleteTUserCouponByIds" parameterType="String">
    <delete id="deleteUserCouponByIds" parameterType="String">
        delete from t_user_coupon where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/order/ConsumerGoodsMapper.xml

@@ -20,12 +20,12 @@
        <result property="useTime"    column="use_time"    />
    </resultMap>

    <sql id="selectTConsumerGoodsVo">
    <sql id="selectConsumerGoodsVo">
        select consumer_goods_id, del_flag, service_status, shop_id, user_id, order_id, order_goods_id, goods_id, goods_name, cycle_num_flag, service_num, used_num, complete_time, create_time, use_time from t_consumer_goods
    </sql>

    <select id="selectTConsumerGoodsList" parameterType="ConsumerGoods" resultMap="ConsumerGoodsResult">
        <include refid="selectTConsumerGoodsVo"/>
    <select id="selectConsumerGoodsList" parameterType="ConsumerGoods" resultMap="ConsumerGoodsResult">
        <include refid="selectConsumerGoodsVo"/>
        <where>
            <if test="serviceStatus != null "> and service_status = #{serviceStatus}</if>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
@@ -42,12 +42,12 @@
        </where>
    </select>

    <select id="selectTConsumerGoodsByConsumerGoodsId" parameterType="String" resultMap="ConsumerGoodsResult">
        <include refid="selectTConsumerGoodsVo"/>
    <select id="selectConsumerGoodsByConsumerGoodsId" parameterType="String" resultMap="ConsumerGoodsResult">
        <include refid="selectConsumerGoodsVo"/>
        where consumer_goods_id = #{consumerGoodsId}
    </select>

    <insert id="insertTConsumerGoods" parameterType="ConsumerGoods">
    <insert id="insertConsumerGoods" parameterType="ConsumerGoods">
        insert into t_consumer_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="consumerGoodsId != null">consumer_goods_id,</if>
@@ -85,7 +85,7 @@
        </trim>
    </insert>

    <update id="updateTConsumerGoods" parameterType="ConsumerGoods">
    <update id="updateConsumerGoods" parameterType="ConsumerGoods">
        update t_consumer_goods
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -106,11 +106,11 @@
        where consumer_goods_id = #{consumerGoodsId}
    </update>

    <delete id="deleteTConsumerGoodsByConsumerGoodsId" parameterType="String">
    <delete id="deleteConsumerGoodsByConsumerGoodsId" parameterType="String">
        delete from t_consumer_goods where consumer_goods_id = #{consumerGoodsId}
    </delete>

    <delete id="deleteTConsumerGoodsByConsumerGoodsIds" parameterType="String">
    <delete id="deleteConsumerGoodsByConsumerGoodsIds" parameterType="String">
        delete from t_consumer_goods where consumer_goods_id in
        <foreach item="consumerGoodsId" collection="array" open="(" separator="," close=")">
            #{consumerGoodsId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/order/OrderGoodsMapper.xml

@@ -17,12 +17,12 @@
        <result property="goodsType"    column="goods_type"    />
    </resultMap>

    <sql id="selectTOrderGoodsVo">
    <sql id="selectOrderGoodsVo">
        select order_goods_id, del_flag, order_id, goods_id, buy_num, coupon_id, goods_price, goods_total_money, goods_receivable_money, cycle_num_flag, service_num, goods_type from t_order_goods
    </sql>

    <select id="selectTOrderGoodsList" parameterType="OrderGoods" resultMap="OrderGoodsResult">
        <include refid="selectTOrderGoodsVo"/>
    <select id="selectOrderGoodsList" parameterType="OrderGoods" resultMap="OrderGoodsResult">
        <include refid="selectOrderGoodsVo"/>
        <where>
            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
            <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
@@ -37,12 +37,12 @@
        </where>
    </select>

    <select id="selectTOrderGoodsByOrderGoodsId" parameterType="String" resultMap="OrderGoodsResult">
        <include refid="selectTOrderGoodsVo"/>
    <select id="selectOrderGoodsByOrderGoodsId" parameterType="String" resultMap="OrderGoodsResult">
        <include refid="selectOrderGoodsVo"/>
        where order_goods_id = #{orderGoodsId}
    </select>

    <insert id="insertTOrderGoods" parameterType="OrderGoods">
    <insert id="insertOrderGoods" parameterType="OrderGoods">
        insert into t_order_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="orderGoodsId != null">order_goods_id,</if>
@@ -74,7 +74,7 @@
        </trim>
    </insert>

    <update id="updateTOrderGoods" parameterType="OrderGoods">
    <update id="updateOrderGoods" parameterType="OrderGoods">
        update t_order_goods
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -92,11 +92,11 @@
        where order_goods_id = #{orderGoodsId}
    </update>

    <delete id="deleteTOrderGoodsByOrderGoodsId" parameterType="String">
    <delete id="deleteOrderGoodsByOrderGoodsId" parameterType="String">
        delete from t_order_goods where order_goods_id = #{orderGoodsId}
    </delete>

    <delete id="deleteTOrderGoodsByOrderGoodsIds" parameterType="String">
    <delete id="deleteOrderGoodsByOrderGoodsIds" parameterType="String">
        delete from t_order_goods where order_goods_id in
        <foreach item="orderGoodsId" collection="array" open="(" separator="," close=")">
            #{orderGoodsId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/order/OrderMapper.xml

@@ -27,12 +27,12 @@
        <result property="useUserId"    column="use_user_id"    />
    </resultMap>

    <sql id="selectTOrderVo">
    <sql id="selectOrderVo">
        select order_id, del_flag, order_status, order_no, order_from, shop_id, user_id, order_money, coupon_money, discount_money, receivable_money, pay_type, pay_money, online_pay_money, offline_pay_money, order_remark, goods_info, create_time, pay_time, use_time, cancel_time, use_user_id from t_order
    </sql>

    <select id="selectTOrderList" parameterType="Order" resultMap="OrderResult">
        <include refid="selectTOrderVo"/>
    <select id="selectOrderList" parameterType="Order" resultMap="OrderResult">
        <include refid="selectOrderVo"/>
        <where>
            <if test="orderStatus != null "> and order_status = #{orderStatus}</if>
            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
@@ -56,12 +56,12 @@
        </where>
    </select>

    <select id="selectTOrderByOrderId" parameterType="String" resultMap="OrderResult">
        <include refid="selectTOrderVo"/>
    <select id="selectOrderByOrderId" parameterType="String" resultMap="OrderResult">
        <include refid="selectOrderVo"/>
        where order_id = #{orderId}
    </select>

    <insert id="insertTOrder" parameterType="Order">
    <insert id="insertOrder" parameterType="Order">
        insert into t_order
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="orderId != null">order_id,</if>
@@ -113,7 +113,7 @@
        </trim>
    </insert>

    <update id="updateTOrder" parameterType="Order">
    <update id="updateOrder" parameterType="Order">
        update t_order
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -141,11 +141,11 @@
        where order_id = #{orderId}
    </update>

    <delete id="deleteTOrderByOrderId" parameterType="String">
    <delete id="deleteOrderByOrderId" parameterType="String">
        delete from t_order where order_id = #{orderId}
    </delete>

    <delete id="deleteTOrderByOrderIds" parameterType="String">
    <delete id="deleteOrderByOrderIds" parameterType="String">
        delete from t_order where order_id in
        <foreach item="orderId" collection="array" open="(" separator="," close=")">
            #{orderId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/order/ShoppingCartMapper.xml

@@ -10,15 +10,15 @@
        <result property="goodsId"    column="goods_id"    />
        <result property="buyNum"    column="buy_num"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
    </resultMap>

    <sql id="selectTShoppingCartVo">
    <sql id="selectShoppingCartVo">
        select id, del_flag, user_id, shop_id, goods_id, buy_num, create_time, update_time from t_shopping_cart
    </sql>

    <select id="selectTShoppingCartList" parameterType="ShoppingCart" resultMap="ShoppingCartResult">
        <include refid="selectTShoppingCartVo"/>
    <select id="selectShoppingCartList" parameterType="ShoppingCart" resultMap="ShoppingCartResult">
        <include refid="selectShoppingCartVo"/>
        <where>
            <if test="userId != null "> and user_id = #{userId}</if>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
@@ -27,12 +27,12 @@
        </where>
    </select>

    <select id="selectTShoppingCartById" parameterType="Long" resultMap="ShoppingCartResult">
        <include refid="selectTShoppingCartVo"/>
    <select id="selectShoppingCartById" parameterType="Long" resultMap="ShoppingCartResult">
        <include refid="selectShoppingCartVo"/>
        where id = #{id}
    </select>

    <insert id="insertTShoppingCart" parameterType="ShoppingCart" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertShoppingCart" parameterType="ShoppingCart" useGeneratedKeys="true" keyProperty="id">
        insert into t_shopping_cart
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -41,7 +41,7 @@
            <if test="goodsId != null">goods_id,</if>
            <if test="buyNum != null">buy_num,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateime != null">update_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">#{delFlag},</if>
@@ -50,11 +50,11 @@
            <if test="goodsId != null">#{goodsId},</if>
            <if test="buyNum != null">#{buyNum},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateime != null">#{updateime},</if>
        </trim>
    </insert>

    <update id="updateTShoppingCart" parameterType="ShoppingCart">
    <update id="updateShoppingCart" parameterType="ShoppingCart">
        update t_shopping_cart
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -63,18 +63,18 @@
            <if test="goodsId != null">goods_id = #{goodsId},</if>
            <if test="buyNum != null">buy_num = #{buyNum},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateime != null">update_time = #{updateime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTShoppingCartById" parameterType="Long">
        delete from t_shopping_cart where id = #{id}
    <delete id="deleteShoppingCartById" parameterType="Long">
        update t_shopping_cart set del_flag = 1 where id = #{id}
    </delete>

    <delete id="deleteTShoppingCartByIds" parameterType="String">
        delete from t_shopping_cart where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
    <delete id="deleteShoppingCartByIds" parameterType="String">
        update t_shopping_cart set del_flag = 1 where id in
        <foreach item="ids" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/order/UserServiceRecordMapper.xml

@@ -12,12 +12,12 @@
        <result property="serviceType"    column="service_type"    />
    </resultMap>

    <sql id="selectTUserServiceRecordVo">
    <sql id="selectUserServiceRecordVo">
        select id, del_flag, user_id, consumer_goods_ids, consumer_goods_names, create_time, service_type from t_user_service_record
    </sql>

    <select id="selectTUserServiceRecordList" parameterType="UserServiceRecord" resultMap="UserServiceRecordResult">
        <include refid="selectTUserServiceRecordVo"/>
    <select id="selectUserServiceRecordList" parameterType="UserServiceRecord" resultMap="UserServiceRecordResult">
        <include refid="selectUserServiceRecordVo"/>
        <where>
            <if test="userId != null "> and user_id = #{userId}</if>
            <if test="consumerGoodsIds != null  and consumerGoodsIds != ''"> and consumer_goods_ids = #{consumerGoodsIds}</if>
@@ -26,12 +26,12 @@
        </where>
    </select>

    <select id="selectTUserServiceRecordById" parameterType="Long" resultMap="UserServiceRecordResult">
        <include refid="selectTUserServiceRecordVo"/>
    <select id="selectUserServiceRecordById" parameterType="Long" resultMap="UserServiceRecordResult">
        <include refid="selectUserServiceRecordVo"/>
        where id = #{id}
    </select>

    <insert id="insertTUserServiceRecord" parameterType="UserServiceRecord" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertUserServiceRecord" parameterType="UserServiceRecord" useGeneratedKeys="true" keyProperty="id">
        insert into t_user_service_record
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -51,7 +51,7 @@
        </trim>
    </insert>

    <update id="updateTUserServiceRecord" parameterType="UserServiceRecord">
    <update id="updateUserServiceRecord" parameterType="UserServiceRecord">
        update t_user_service_record
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -64,11 +64,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTUserServiceRecordById" parameterType="Long">
    <delete id="deleteUserServiceRecordById" parameterType="Long">
        delete from t_user_service_record where id = #{id}
    </delete>

    <delete id="deleteTUserServiceRecordByIds" parameterType="String">
    <delete id="deleteUserServiceRecordByIds" parameterType="String">
        delete from t_user_service_record where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/MemberTaskMapper.xml

@@ -12,12 +12,12 @@
        <result property="createTime"    column="create_time"    />
    </resultMap>

    <sql id="selectTMemberTaskVo">
    <sql id="selectMemberTaskVo">
        select task_id, del_flag, shop_id, user_id, task_date, task_content, create_time from t_member_task
    </sql>

    <select id="selectTMemberTaskList" parameterType="MemberTask" resultMap="MemberTaskResult">
        <include refid="selectTMemberTaskVo"/>
    <select id="selectMemberTaskList" parameterType="MemberTask" resultMap="MemberTaskResult">
        <include refid="selectMemberTaskVo"/>
        <where>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
            <if test="userId != null "> and user_id = #{userId}</if>
@@ -26,12 +26,12 @@
        </where>
    </select>

    <select id="selectTMemberTaskByTaskId" parameterType="String" resultMap="MemberTaskResult">
        <include refid="selectTMemberTaskVo"/>
    <select id="selectMemberTaskByTaskId" parameterType="String" resultMap="MemberTaskResult">
        <include refid="selectMemberTaskVo"/>
        where task_id = #{taskId}
    </select>

    <insert id="insertTMemberTask" parameterType="MemberTask">
    <insert id="insertMemberTask" parameterType="MemberTask">
        insert into t_member_task
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="taskId != null">task_id,</if>
@@ -53,7 +53,7 @@
        </trim>
    </insert>

    <update id="updateTMemberTask" parameterType="MemberTask">
    <update id="updateMemberTask" parameterType="MemberTask">
        update t_member_task
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -66,11 +66,11 @@
        where task_id = #{taskId}
    </update>

    <delete id="deleteTMemberTaskByTaskId" parameterType="String">
    <delete id="deleteMemberTaskByTaskId" parameterType="String">
        delete from t_member_task where task_id = #{taskId}
    </delete>

    <delete id="deleteTMemberTaskByTaskIds" parameterType="String">
    <delete id="deleteMemberTaskByTaskIds" parameterType="String">
        delete from t_member_task where task_id in
        <foreach item="taskId" collection="array" open="(" separator="," close=")">
            #{taskId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/MemberTaskRecordMapper.xml

@@ -12,12 +12,12 @@
        <result property="followContent"    column="follow_content"    />
    </resultMap>

    <sql id="selectTMemberTaskRecordVo">
    <sql id="selectMemberTaskRecordVo">
        select id, del_flag, task_id, user_id, follow_type, call_time, follow_content from t_member_task_record
    </sql>

    <select id="selectTMemberTaskRecordList" parameterType="MemberTaskRecord" resultMap="MemberTaskRecordResult">
        <include refid="selectTMemberTaskRecordVo"/>
    <select id="selectMemberTaskRecordList" parameterType="MemberTaskRecord" resultMap="MemberTaskRecordResult">
        <include refid="selectMemberTaskRecordVo"/>
        <where>
            <if test="taskId != null  and taskId != ''"> and task_id = #{taskId}</if>
            <if test="userId != null "> and user_id = #{userId}</if>
@@ -27,12 +27,12 @@
        </where>
    </select>

    <select id="selectTMemberTaskRecordById" parameterType="Long" resultMap="MemberTaskRecordResult">
        <include refid="selectTMemberTaskRecordVo"/>
    <select id="selectMemberTaskRecordById" parameterType="Long" resultMap="MemberTaskRecordResult">
        <include refid="selectMemberTaskRecordVo"/>
        where id = #{id}
    </select>

    <insert id="insertTMemberTaskRecord" parameterType="MemberTaskRecord" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertMemberTaskRecord" parameterType="MemberTaskRecord" useGeneratedKeys="true" keyProperty="id">
        insert into t_member_task_record
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -52,7 +52,7 @@
        </trim>
    </insert>

    <update id="updateTMemberTaskRecord" parameterType="MemberTaskRecord">
    <update id="updateMemberTaskRecord" parameterType="MemberTaskRecord">
        update t_member_task_record
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -65,11 +65,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTMemberTaskRecordById" parameterType="Long">
    <delete id="deleteMemberTaskRecordById" parameterType="Long">
        delete from t_member_task_record where id = #{id}
    </delete>

    <delete id="deleteTMemberTaskRecordByIds" parameterType="String">
    <delete id="deleteMemberTaskRecordByIds" parameterType="String">
        delete from t_member_task_record where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopCertificateMapper.xml

@@ -12,12 +12,12 @@
        <result property="cerPicture"    column="cer_picture"    />
    </resultMap>

    <sql id="selectTShopCertificateVo">
    <sql id="selectShopCertificateVo">
        select cer_id, del_flag, cer_status, shop_id, cer_name, cer_number, cer_picture from t_shop_certificate
    </sql>

    <select id="selectTShopCertificateList" parameterType="ShopCertificate" resultMap="ShopCertificateResult">
        <include refid="selectTShopCertificateVo"/>
    <select id="selectShopCertificateList" parameterType="ShopCertificate" resultMap="ShopCertificateResult">
        <include refid="selectShopCertificateVo"/>
        <where>
            <if test="cerStatus != null "> and cer_status = #{cerStatus}</if>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
@@ -27,12 +27,12 @@
        </where>
    </select>

    <select id="selectTShopCertificateByCerId" parameterType="Long" resultMap="ShopCertificateResult">
        <include refid="selectTShopCertificateVo"/>
    <select id="selectShopCertificateByCerId" parameterType="Long" resultMap="ShopCertificateResult">
        <include refid="selectShopCertificateVo"/>
        where cer_id = #{cerId}
    </select>

    <insert id="insertTShopCertificate" parameterType="ShopCertificate" useGeneratedKeys="true" keyProperty="cerId">
    <insert id="insertShopCertificate" parameterType="ShopCertificate" useGeneratedKeys="true" keyProperty="cerId">
        insert into t_shop_certificate
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -52,7 +52,7 @@
        </trim>
    </insert>

    <update id="updateTShopCertificate" parameterType="ShopCertificate">
    <update id="updateShopCertificate" parameterType="ShopCertificate">
        update t_shop_certificate
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -65,11 +65,11 @@
        where cer_id = #{cerId}
    </update>

    <delete id="deleteTShopCertificateByCerId" parameterType="Long">
    <delete id="deleteShopCertificateByCerId" parameterType="Long">
        delete from t_shop_certificate where cer_id = #{cerId}
    </delete>

    <delete id="deleteTShopCertificateByCerIds" parameterType="String">
    <delete id="deleteShopCertificateByCerIds" parameterType="String">
        delete from t_shop_certificate where cer_id in
        <foreach item="cerId" collection="array" open="(" separator="," close=")">
            #{cerId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopFileMapper.xml

@@ -10,12 +10,12 @@
        <result property="fileUrl"    column="file_url"    />
    </resultMap>

    <sql id="selectTShopFileVo">
    <sql id="selectShopFileVo">
        select id, del_flag, shop_id, file_type, file_url from t_shop_file
    </sql>

    <select id="selectTShopFileList" parameterType="ShopFile" resultMap="ShopFileResult">
        <include refid="selectTShopFileVo"/>
    <select id="selectShopFileList" parameterType="ShopFile" resultMap="ShopFileResult">
        <include refid="selectShopFileVo"/>
        <where>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
            <if test="fileType != null "> and file_type = #{fileType}</if>
@@ -23,12 +23,12 @@
        </where>
    </select>

    <select id="selectTShopFileById" parameterType="Long" resultMap="ShopFileResult">
        <include refid="selectTShopFileVo"/>
    <select id="selectShopFileById" parameterType="Long" resultMap="ShopFileResult">
        <include refid="selectShopFileVo"/>
        where id = #{id}
    </select>

    <insert id="insertTShopFile" parameterType="ShopFile" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertShopFile" parameterType="ShopFile" useGeneratedKeys="true" keyProperty="id">
        insert into t_shop_file
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -44,7 +44,7 @@
        </trim>
    </insert>

    <update id="updateTShopFile" parameterType="ShopFile">
    <update id="updateShopFile" parameterType="ShopFile">
        update t_shop_file
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -55,11 +55,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTShopFileById" parameterType="Long">
    <delete id="deleteShopFileById" parameterType="Long">
        delete from t_shop_file where id = #{id}
    </delete>

    <delete id="deleteTShopFileByIds" parameterType="String">
    <delete id="deleteShopFileByIds" parameterType="String">
        delete from t_shop_file where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopGoodsMapper.xml

@@ -9,16 +9,16 @@
        <result property="goodsId"    column="goods_id"    />
        <result property="salesPrice"    column="sales_price"    />
        <result property="serviceNum"    column="service_num"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
        <result property="updateUserId"    column="update_user_id"    />
    </resultMap>

    <sql id="selectTShopGoodsVo">
    <sql id="selectShopGoodsVo">
        select id, del_flag, shop_id, goods_id, sales_price, service_num, update_time, update_user_id from t_shop_goods
    </sql>

    <select id="selectTShopGoodsList" parameterType="ShopGoods" resultMap="ShopGoodsResult">
        <include refid="selectTShopGoodsVo"/>
    <select id="selectShopGoodsList" parameterType="ShopGoods" resultMap="ShopGoodsResult">
        <include refid="selectShopGoodsVo"/>
        <where>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
@@ -28,12 +28,12 @@
        </where>
    </select>

    <select id="selectTShopGoodsById" parameterType="Long" resultMap="ShopGoodsResult">
        <include refid="selectTShopGoodsVo"/>
    <select id="selectShopGoodsById" parameterType="Long" resultMap="ShopGoodsResult">
        <include refid="selectShopGoodsVo"/>
        where id = #{id}
    </select>

    <insert id="insertTShopGoods" parameterType="ShopGoods" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertShopGoods" parameterType="ShopGoods" useGeneratedKeys="true" keyProperty="id">
        insert into t_shop_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -41,7 +41,7 @@
            <if test="goodsId != null">goods_id,</if>
            <if test="salesPrice != null">sales_price,</if>
            <if test="serviceNum != null">service_num,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateime != null">update_time,</if>
            <if test="updateUserId != null">update_user_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -50,12 +50,12 @@
            <if test="goodsId != null">#{goodsId},</if>
            <if test="salesPrice != null">#{salesPrice},</if>
            <if test="serviceNum != null">#{serviceNum},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateime != null">#{updateime},</if>
            <if test="updateUserId != null">#{updateUserId},</if>
        </trim>
    </insert>

    <update id="updateTShopGoods" parameterType="ShopGoods">
    <update id="updateShopGoods" parameterType="ShopGoods">
        update t_shop_goods
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -63,17 +63,17 @@
            <if test="goodsId != null">goods_id = #{goodsId},</if>
            <if test="salesPrice != null">sales_price = #{salesPrice},</if>
            <if test="serviceNum != null">service_num = #{serviceNum},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateime != null">update_time = #{updateime},</if>
            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTShopGoodsById" parameterType="Long">
    <delete id="deleteShopGoodsById" parameterType="Long">
        delete from t_shop_goods where id = #{id}
    </delete>

    <delete id="deleteTShopGoodsByIds" parameterType="String">
    <delete id="deleteShopGoodsByIds" parameterType="String">
        delete from t_shop_goods where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopMapper.xml

@@ -8,7 +8,7 @@
        <result property="shopStatus"    column="shop_status"    />
        <result property="createTime"    column="create_time"    />
        <result property="createUserId"    column="create_user_id"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
        <result property="updateUserId"    column="update_user_id"    />
        <result property="shopName"    column="shop_name"    />
        <result property="shopNumber"    column="shop_number"    />
@@ -53,12 +53,12 @@
        <result property="shopSource"    column="shop_source"    />
    </resultMap>

    <sql id="selectTShopVo">
    <sql id="selectShopVo">
        select shop_id, del_flag, shop_status, create_time, create_user_id, update_time, update_user_id, shop_name, shop_number, shop_type, business_start_time, business_end_time, shopowner_name, shopowner_phone, sign_time, sign_province_code, sign_city_code, sign_area_code, sign_area_name, shop_service_phone, belong_user_id, belong_shop_id, supporting_capacity_flag, operation_person_flag, executive_force_flag, pattern_flag, connection_flag, economic_ability_flag, relation_partner, business_history, shop_province_code, shop_city_code, shop_area_code, shop_area_name, shop_address, shop_longitude, shop_latitude, shop_detail, marketing_function_flag, platform_coupon_flag, platform_birthday_flag, shop_custom_status, recommend_person, cooperation_end_time, cooperation_start_time, shop_tags, sign_user_id, shop_source from t_shop
    </sql>

    <select id="selectTShopList" parameterType="Shop" resultMap="ShopResult">
        <include refid="selectTShopVo"/>
    <select id="selectShopList" parameterType="Shop" resultMap="ShopResult">
        <include refid="selectShopVo"/>
        <where>
            <if test="shopStatus != null "> and shop_status = #{shopStatus}</if>
            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
@@ -107,19 +107,19 @@
        </where>
    </select>

    <select id="selectTShopByShopId" parameterType="Long" resultMap="ShopResult">
        <include refid="selectTShopVo"/>
    <select id="selectShopByShopId" parameterType="Long" resultMap="ShopResult">
        <include refid="selectShopVo"/>
        where shop_id = #{shopId}
    </select>

    <insert id="insertTShop" parameterType="Shop" useGeneratedKeys="true" keyProperty="shopId">
    <insert id="insertShop" parameterType="Shop" useGeneratedKeys="true" keyProperty="shopId">
        insert into t_shop
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
            <if test="shopStatus != null">shop_status,</if>
            <if test="createTime != null">create_time,</if>
            <if test="createUserId != null">create_user_id,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateime != null">update_time,</if>
            <if test="updateUserId != null">update_user_id,</if>
            <if test="shopName != null">shop_name,</if>
            <if test="shopNumber != null">shop_number,</if>
@@ -168,7 +168,7 @@
            <if test="shopStatus != null">#{shopStatus},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="createUserId != null">#{createUserId},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateime != null">#{updateime},</if>
            <if test="updateUserId != null">#{updateUserId},</if>
            <if test="shopName != null">#{shopName},</if>
            <if test="shopNumber != null">#{shopNumber},</if>
@@ -214,14 +214,14 @@
        </trim>
    </insert>

    <update id="updateTShop" parameterType="Shop">
    <update id="updateShop" parameterType="Shop">
        update t_shop
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="shopStatus != null">shop_status = #{shopStatus},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="createUserId != null">create_user_id = #{createUserId},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateime != null">update_time = #{updateime},</if>
            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
            <if test="shopName != null">shop_name = #{shopName},</if>
            <if test="shopNumber != null">shop_number = #{shopNumber},</if>
@@ -268,11 +268,11 @@
        where shop_id = #{shopId}
    </update>

    <delete id="deleteTShopByShopId" parameterType="Long">
    <delete id="deleteShopByShopId" parameterType="Long">
        delete from t_shop where shop_id = #{shopId}
    </delete>

    <delete id="deleteTShopByShopIds" parameterType="String">
    <delete id="deleteShopByShopIds" parameterType="String">
        delete from t_shop where shop_id in
        <foreach item="shopId" collection="array" open="(" separator="," close=")">
            #{shopId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopMarketingMapper.xml

@@ -10,12 +10,12 @@
        <result property="shopMarketingTotal"    column="shop_marketing_total"    />
    </resultMap>

    <sql id="selectTShopMarketingVo">
    <sql id="selectShopMarketingVo">
        select shop_id, del_flag, shop_birthday_flag, shop_coupon_count, shop_marketing_total from t_shop_marketing
    </sql>

    <select id="selectTShopMarketingList" parameterType="ShopMarketing" resultMap="ShopMarketingResult">
        <include refid="selectTShopMarketingVo"/>
    <select id="selectShopMarketingList" parameterType="ShopMarketing" resultMap="ShopMarketingResult">
        <include refid="selectShopMarketingVo"/>
        <where>
            <if test="shopBirthdayFlag != null "> and shop_birthday_flag = #{shopBirthdayFlag}</if>
            <if test="shopCouponCount != null "> and shop_coupon_count = #{shopCouponCount}</if>
@@ -23,12 +23,12 @@
        </where>
    </select>

    <select id="selectTShopMarketingByShopId" parameterType="Long" resultMap="ShopMarketingResult">
        <include refid="selectTShopMarketingVo"/>
    <select id="selectShopMarketingByShopId" parameterType="Long" resultMap="ShopMarketingResult">
        <include refid="selectShopMarketingVo"/>
        where shop_id = #{shopId}
    </select>

    <insert id="insertTShopMarketing" parameterType="ShopMarketing" useGeneratedKeys="true" keyProperty="shopId">
    <insert id="insertShopMarketing" parameterType="ShopMarketing" useGeneratedKeys="true" keyProperty="shopId">
        insert into t_shop_marketing
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -44,7 +44,7 @@
        </trim>
    </insert>

    <update id="updateTShopMarketing" parameterType="ShopMarketing">
    <update id="updateShopMarketing" parameterType="ShopMarketing">
        update t_shop_marketing
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -55,11 +55,11 @@
        where shop_id = #{shopId}
    </update>

    <delete id="deleteTShopMarketingByShopId" parameterType="Long">
    <delete id="deleteShopMarketingByShopId" parameterType="Long">
        delete from t_shop_marketing where shop_id = #{shopId}
    </delete>

    <delete id="deleteTShopMarketingByShopIds" parameterType="String">
    <delete id="deleteShopMarketingByShopIds" parameterType="String">
        delete from t_shop_marketing where shop_id in
        <foreach item="shopId" collection="array" open="(" separator="," close=")">
            #{shopId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopRelTagMapper.xml

@@ -9,24 +9,24 @@
        <result property="tagId"    column="tag_id"    />
    </resultMap>

    <sql id="selectTShopRelTagVo">
    <sql id="selectShopRelTagVo">
        select id, del_flag, shop_id, tag_id from t_shop_rel_tag
    </sql>

    <select id="selectTShopRelTagList" parameterType="ShopRelTag" resultMap="ShopRelTagResult">
        <include refid="selectTShopRelTagVo"/>
    <select id="selectShopRelTagList" parameterType="ShopRelTag" resultMap="ShopRelTagResult">
        <include refid="selectShopRelTagVo"/>
        <where>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
            <if test="tagId != null "> and tag_id = #{tagId}</if>
        </where>
    </select>

    <select id="selectTShopRelTagById" parameterType="Long" resultMap="ShopRelTagResult">
        <include refid="selectTShopRelTagVo"/>
    <select id="selectShopRelTagById" parameterType="Long" resultMap="ShopRelTagResult">
        <include refid="selectShopRelTagVo"/>
        where id = #{id}
    </select>

    <insert id="insertTShopRelTag" parameterType="ShopRelTag" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertShopRelTag" parameterType="ShopRelTag" useGeneratedKeys="true" keyProperty="id">
        insert into t_shop_rel_tag
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -40,7 +40,7 @@
        </trim>
    </insert>

    <update id="updateTShopRelTag" parameterType="ShopRelTag">
    <update id="updateShopRelTag" parameterType="ShopRelTag">
        update t_shop_rel_tag
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -50,11 +50,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTShopRelTagById" parameterType="Long">
    <delete id="deleteShopRelTagById" parameterType="Long">
        delete from t_shop_rel_tag where id = #{id}
    </delete>

    <delete id="deleteTShopRelTagByIds" parameterType="String">
    <delete id="deleteShopRelTagByIds" parameterType="String">
        delete from t_shop_rel_tag where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopRelUserMapper.xml

@@ -11,12 +11,12 @@
        <result property="userDeptId"    column="user_dept_id"    />
    </resultMap>

    <sql id="selectTShopRelUserVo">
    <sql id="selectShopRelUserVo">
        select id, del_flag, shop_id, user_id, user_mobile, user_dept_id from t_shop_rel_user
    </sql>

    <select id="selectTShopRelUserList" parameterType="ShopRelUser" resultMap="ShopRelUserResult">
        <include refid="selectTShopRelUserVo"/>
    <select id="selectShopRelUserList" parameterType="ShopRelUser" resultMap="ShopRelUserResult">
        <include refid="selectShopRelUserVo"/>
        <where>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
            <if test="userId != null "> and user_id = #{userId}</if>
@@ -25,12 +25,12 @@
        </where>
    </select>

    <select id="selectTShopRelUserById" parameterType="Long" resultMap="ShopRelUserResult">
        <include refid="selectTShopRelUserVo"/>
    <select id="selectShopRelUserById" parameterType="Long" resultMap="ShopRelUserResult">
        <include refid="selectShopRelUserVo"/>
        where id = #{id}
    </select>

    <insert id="insertTShopRelUser" parameterType="ShopRelUser" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertShopRelUser" parameterType="ShopRelUser" useGeneratedKeys="true" keyProperty="id">
        insert into t_shop_rel_user
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -48,7 +48,7 @@
        </trim>
    </insert>

    <update id="updateTShopRelUser" parameterType="ShopRelUser">
    <update id="updateShopRelUser" parameterType="ShopRelUser">
        update t_shop_rel_user
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -60,11 +60,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTShopRelUserById" parameterType="Long">
    <delete id="deleteShopRelUserById" parameterType="Long">
        delete from t_shop_rel_user where id = #{id}
    </delete>

    <delete id="deleteTShopRelUserByIds" parameterType="String">
    <delete id="deleteShopRelUserByIds" parameterType="String">
        delete from t_shop_rel_user where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopTaskMapper.xml

@@ -14,12 +14,12 @@
        <result property="createTime"    column="create_time"    />
    </resultMap>

    <sql id="selectTShopTaskVo">
    <sql id="selectShopTaskVo">
        select task_id, del_flag, shop_id, follow_type_id, follow_content, next_follow_date, task_title, emergency_state_id, create_time from t_shop_task
    </sql>

    <select id="selectTShopTaskList" parameterType="ShopTask" resultMap="ShopTaskResult">
        <include refid="selectTShopTaskVo"/>
    <select id="selectShopTaskList" parameterType="ShopTask" resultMap="ShopTaskResult">
        <include refid="selectShopTaskVo"/>
        <where>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
            <if test="followTypeId != null "> and follow_type_id = #{followTypeId}</if>
@@ -30,12 +30,12 @@
        </where>
    </select>

    <select id="selectTShopTaskByTaskId" parameterType="String" resultMap="ShopTaskResult">
        <include refid="selectTShopTaskVo"/>
    <select id="selectShopTaskByTaskId" parameterType="String" resultMap="ShopTaskResult">
        <include refid="selectShopTaskVo"/>
        where task_id = #{taskId}
    </select>

    <insert id="insertTShopTask" parameterType="ShopTask">
    <insert id="insertShopTask" parameterType="ShopTask">
        insert into t_shop_task
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="taskId != null">task_id,</if>
@@ -61,7 +61,7 @@
        </trim>
    </insert>

    <update id="updateTShopTask" parameterType="ShopTask">
    <update id="updateShopTask" parameterType="ShopTask">
        update t_shop_task
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -76,11 +76,11 @@
        where task_id = #{taskId}
    </update>

    <delete id="deleteTShopTaskByTaskId" parameterType="String">
    <delete id="deleteShopTaskByTaskId" parameterType="String">
        delete from t_shop_task where task_id = #{taskId}
    </delete>

    <delete id="deleteTShopTaskByTaskIds" parameterType="String">
    <delete id="deleteShopTaskByTaskIds" parameterType="String">
        delete from t_shop_task where task_id in
        <foreach item="taskId" collection="array" open="(" separator="," close=")">
            #{taskId}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/ShopTransferRecordMapper.xml

@@ -11,12 +11,12 @@
        <result property="transferRemark"    column="transfer_remark"    />
    </resultMap>

    <sql id="selectTShopTransferRecordVo">
    <sql id="selectShopTransferRecordVo">
        select id, del_flag, shop_id, before_user_id, after_user_id, transfer_remark from t_shop_transfer_record
    </sql>

    <select id="selectTShopTransferRecordList" parameterType="ShopTransferRecord" resultMap="ShopTransferRecordResult">
        <include refid="selectTShopTransferRecordVo"/>
    <select id="selectShopTransferRecordList" parameterType="ShopTransferRecord" resultMap="ShopTransferRecordResult">
        <include refid="selectShopTransferRecordVo"/>
        <where>
            <if test="shopId != null "> and shop_id = #{shopId}</if>
            <if test="beforeUserId != null "> and before_user_id = #{beforeUserId}</if>
@@ -25,12 +25,12 @@
        </where>
    </select>

    <select id="selectTShopTransferRecordById" parameterType="Long" resultMap="ShopTransferRecordResult">
        <include refid="selectTShopTransferRecordVo"/>
    <select id="selectShopTransferRecordById" parameterType="Long" resultMap="ShopTransferRecordResult">
        <include refid="selectShopTransferRecordVo"/>
        where id = #{id}
    </select>

    <insert id="insertTShopTransferRecord" parameterType="ShopTransferRecord" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertShopTransferRecord" parameterType="ShopTransferRecord" useGeneratedKeys="true" keyProperty="id">
        insert into t_shop_transfer_record
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -48,7 +48,7 @@
        </trim>
    </insert>

    <update id="updateTShopTransferRecord" parameterType="ShopTransferRecord">
    <update id="updateShopTransferRecord" parameterType="ShopTransferRecord">
        update t_shop_transfer_record
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -60,11 +60,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTShopTransferRecordById" parameterType="Long">
    <delete id="deleteShopTransferRecordById" parameterType="Long">
        delete from t_shop_transfer_record where id = #{id}
    </delete>

    <delete id="deleteTShopTransferRecordByIds" parameterType="String">
    <delete id="deleteShopTransferRecordByIds" parameterType="String">
        delete from t_shop_transfer_record where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/shop/TaskFileMapper.xml

@@ -11,12 +11,12 @@
        <result property="fileType"    column="file_type"    />
    </resultMap>

    <sql id="selectTTaskFileVo">
    <sql id="selectTaskFileVo">
        select id, del_flag, follow_id, follow_from, file_url, file_type from t_task_file
    </sql>

    <select id="selectTTaskFileList" parameterType="TaskFile" resultMap="TaskFileResult">
        <include refid="selectTTaskFileVo"/>
    <select id="selectTaskFileList" parameterType="TaskFile" resultMap="TaskFileResult">
        <include refid="selectTaskFileVo"/>
        <where>
            <if test="followId != null "> and follow_id = #{followId}</if>
            <if test="followFrom != null "> and follow_from = #{followFrom}</if>
@@ -25,12 +25,12 @@
        </where>
    </select>

    <select id="selectTTaskFileById" parameterType="Long" resultMap="TaskFileResult">
        <include refid="selectTTaskFileVo"/>
    <select id="selectTaskFileById" parameterType="Long" resultMap="TaskFileResult">
        <include refid="selectTaskFileVo"/>
        where id = #{id}
    </select>

    <insert id="insertTTaskFile" parameterType="TaskFile" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertTaskFile" parameterType="TaskFile" useGeneratedKeys="true" keyProperty="id">
        insert into t_task_file
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -48,7 +48,7 @@
        </trim>
    </insert>

    <update id="updateTTaskFile" parameterType="TaskFile">
    <update id="updateTaskFile" parameterType="TaskFile">
        update t_task_file
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -60,11 +60,11 @@
        where id = #{id}
    </update>

    <delete id="deleteTTaskFileById" parameterType="Long">
    <delete id="deleteTaskFileById" parameterType="Long">
        delete from t_task_file where id = #{id}
    </delete>

    <delete id="deleteTTaskFileByIds" parameterType="String">
    <delete id="deleteTaskFileByIds" parameterType="String">
        delete from t_task_file where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysConfigMapper.xml

@@ -13,7 +13,7 @@
        <result property="createBy"      column="create_by"      />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"      column="update_by"      />
        <result property="updateTime"    column="update_time"    />
        <result property="updateime"    column="update_time"    />
    </resultMap>
    
    <sql id="selectConfigVo">

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysDeptMapper.xml

@@ -19,7 +19,7 @@
        <result property="createBy"   column="create_by"   />
        <result property="createTime" column="create_time" />
        <result property="updateBy"   column="update_by"   />
        <result property="updateTime" column="update_time" />
        <result property="updateime" column="update_time" />
    </resultMap>
    
    <sql id="selectDeptVo">

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysDictDataMapper.xml

@@ -17,7 +17,7 @@
        <result property="createBy"   column="create_by"   />
        <result property="createTime" column="create_time" />
        <result property="updateBy"   column="update_by"   />
        <result property="updateTime" column="update_time" />
        <result property="updateime" column="update_time" />
    </resultMap>
    
    <sql id="selectDictDataVo">

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysDictTypeMapper.xml

@@ -12,7 +12,7 @@
        <result property="createBy"   column="create_by"   />
        <result property="createTime" column="create_time" />
        <result property="updateBy"   column="update_by"   />
        <result property="updateTime" column="update_time" />
        <result property="updateime" column="update_time" />
    </resultMap>
    
    <sql id="selectDictTypeVo">

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysMenuMapper.xml

@@ -22,7 +22,7 @@
        <result property="icon"           column="icon"           />
        <result property="createBy"       column="create_by"      />
        <result property="createTime"     column="create_time"    />
        <result property="updateTime"     column="update_time"    />
        <result property="updateime"     column="update_time"    />
        <result property="updateBy"       column="update_by"      />
        <result property="remark"         column="remark"         />
    </resultMap>

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysNoticeMapper.xml

@@ -13,7 +13,7 @@
        <result property="createBy"       column="create_by"       />
        <result property="createTime"     column="create_time"     />
        <result property="updateBy"       column="update_by"       />
        <result property="updateTime"     column="update_time"     />
        <result property="updateime"     column="update_time"     />
        <result property="remark"         column="remark"          />
    </resultMap>
    

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysPostMapper.xml

@@ -13,7 +13,7 @@
        <result property="createBy"      column="create_by"     />
        <result property="createTime"    column="create_time"   />
        <result property="updateBy"      column="update_by"     />
        <result property="updateTime"    column="update_time"   />
        <result property="updateime"    column="update_time"   />
        <result property="remark"        column="remark"        />
    </resultMap>
    

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysRoleMapper.xml

@@ -17,7 +17,7 @@
        <result property="createBy"           column="create_by"             />
        <result property="createTime"         column="create_time"           />
        <result property="updateBy"           column="update_by"             />
        <result property="updateTime"         column="update_time"           />
        <result property="updateime"         column="update_time"           />
        <result property="remark"             column="remark"                />
    </resultMap>
    

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/sys/SysUserMapper.xml

@@ -21,7 +21,7 @@
        <result property="createBy"     column="create_by"    />
        <result property="createTime"   column="create_time"  />
        <result property="updateBy"     column="update_by"    />
        <result property="updateTime"   column="update_time"  />
        <result property="updateime"   column="update_time"  />
        <result property="remark"       column="remark"       />
        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />