增加小程序接口，所有XML中逻辑删除标志值改为1

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/enums/ERoleKey.java

@@ -0,0 +1,33 @@
+package com.xingxi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @program: xingxi
+ * @description: 权限字符串几个固定的
+ * @author: baolei
+ * @create: 2025-03-18 22:37
+ */
+@AllArgsConstructor
+@Getter
+public enum ERoleKey {
+    ADMIN("ADMIN", "管理员"),
+    PLATFORM("PLATFORM", "平台管理"),
+    MERCHANT("MERCHANT", "经销商"),
+    VENDOR("VENDOR", "供应商"),
+    CUSTOMER("CUSTOMER", "零售客户");
+
+    private String code;
+    private String desc;
+
+    /** 解析*/
+    public static ERoleKey parse(String val) {
+        for(ERoleKey type :ERoleKey.values()) {
+            if(type.getCode().equalsIgnoreCase(val)) {
+                return type;
+            }
+        }
+        return null;
+    }
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsRequest.java

@@ -9,6 +9,8 @@ import javax.validation.constraints.NotNull;
 @Setter
 public class CartsRequest {
 
+    // 主键
+    private Long id;
     @NotNull
     private Long prodId;
     @NotNull

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsResponse.java

@@ -8,4 +8,5 @@ import java.util.List;
 @Value
 public class CartsResponse {
     List<Carts> carts;
+    String checkedSumAmount;
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsServiceImpl.java

@@ -8,14 +8,20 @@ import com.xingxi.business.Carts.domain.Carts;
 import com.xingxi.business.Carts.mapper.CartsMapper;
 import com.xingxi.common.core.domain.entity.SysUser;
 import com.xingxi.common.enums.EDelFlag;
+import com.xingxi.common.enums.ERoleKey;
 import com.xingxi.common.enums.EYesNo;
+import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.StringUtils;
+import com.xingxi.master.product.domain.Prod;
+import com.xingxi.master.product.domain.ProdAttrPrice;
+import com.xingxi.master.product.mapper.ProdAttrPriceMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Slf4j
@@ -26,6 +32,8 @@ class CartsServiceImpl implements CartsServiceI {
 
     @Autowired
     CartsMapper cartsMapper;
+    @Autowired
+    ProdAttrPriceMapper prodAttrPriceMapper;
 
     @Override
     public CartsResponse add(UserContext userContext, CartsRequest request) {
@@ -69,26 +77,133 @@ class CartsServiceImpl implements CartsServiceI {
 
         List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
 
-        return new CartsResponse(exiCarts);
+        BigDecimal sum = BigDecimal.ZERO;
+        for (Carts carts : exiCarts) {
+            ProdAttrPrice condPrice = new ProdAttrPrice();
+            condPrice.setProdAttrId(carts.getProdAttrId());
+            condPrice.setProdId(carts.getProdId());
+            condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
+
+            List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
+
+            if (StringUtils.isNotEmpty(priceList)) {
+                if (carts.getCheckFlag().equals(EYesNo.YES.getVal())) {
+                    sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
+                }
+            }
+        }
+        return new CartsResponse(exiCarts, sum.toPlainString());
     }
 
     @Override
     public CartsResponse checked(UserContext userContext, CartsRequest request) {
-        return null;
+
+        SysUser currentUser = userContext.getCurrentUser();
+        Long userId = currentUser.getUserId();
+
+        Carts updCarts = cartsMapper.selectCartsById(request.getId());
+
+        updCarts.setCheckFlag(EYesNo.YES.getVal().equals(updCarts.getCheckFlag()) ? EYesNo.NO.getVal() : EYesNo.YES.getVal());
+        updCarts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
+        updCarts.setUpdateTime(DateUtils.getNowDate());
+        cartsMapper.updateCarts(updCarts);
+
+        Carts cond = new Carts();
+        cond.setUserId(userId);
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+        BigDecimal sum = BigDecimal.ZERO;
+        for (Carts carts : exiCarts) {
+            ProdAttrPrice condPrice = new ProdAttrPrice();
+            condPrice.setProdAttrId(carts.getProdAttrId());
+            condPrice.setProdId(carts.getProdId());
+            condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
+
+            List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
+
+            if (StringUtils.isNotEmpty(priceList)) {
+                if (carts.getCheckFlag().equals(EYesNo.YES.getVal())) {
+                    sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
+                }
+            }
+        }
+
+        return new CartsResponse(exiCarts, sum.toPlainString());
     }
 
     @Override
     public CartsResponse checkedAll(UserContext userContext, CartsRequest request) {
-        return null;
+        SysUser currentUser = userContext.getCurrentUser();
+        Long userId = currentUser.getUserId();
+
+        Carts cond = new Carts();
+        cond.setUserId(userId);
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+        BigDecimal sum = BigDecimal.ZERO;
+        for (Carts carts : exiCarts) {
+            carts.setCheckFlag(EYesNo.YES.getVal());
+            carts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
+            carts.setUpdateTime(DateUtils.getNowDate());
+            cartsMapper.updateCarts(carts);
+
+            ProdAttrPrice condPrice = new ProdAttrPrice();
+            condPrice.setProdAttrId(carts.getProdAttrId());
+            condPrice.setProdId(carts.getProdId());
+            condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
+
+            List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
+
+            if (StringUtils.isNotEmpty(priceList)) {
+                sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
+            }
+        }
+
+        return new CartsResponse(exiCarts, sum.toPlainString());
     }
 
     @Override
     public CartsResponse uncheckedAll(UserContext userContext, CartsRequest request) {
-        return null;
+        SysUser currentUser = userContext.getCurrentUser();
+        Long userId = currentUser.getUserId();
+
+        Carts cond = new Carts();
+        cond.setUserId(userId);
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+        BigDecimal sum = BigDecimal.ZERO;
+        for (Carts carts : exiCarts) {
+            carts.setCheckFlag(EYesNo.YES.getVal());
+            carts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
+            carts.setUpdateTime(DateUtils.getNowDate());
+            cartsMapper.updateCarts(carts);
+        }
+
+        return new CartsResponse(exiCarts, sum.toPlainString());
     }
 
     @Override
     public CartsResponse delete(UserContext userContext, CartsRequest request) {
-        return null;
+
+        SysUser currentUser = userContext.getCurrentUser();
+        Long userId = currentUser.getUserId();
+
+        cartsMapper.logicDeleteCartsById(request.getId());
+
+        Carts cond = new Carts();
+        cond.setUserId(userId);
+        List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+        BigDecimal sum = BigDecimal.ZERO;
+        for (Carts carts : exiCarts) {
+            carts.setCheckFlag(EYesNo.YES.getVal());
+            carts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
+            carts.setUpdateTime(DateUtils.getNowDate());
+            cartsMapper.updateCarts(carts);
+        }
+
+        return new CartsResponse(exiCarts, sum.toPlainString());
     }
 }

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/master/product/domain/ProdAttrPrice.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.math.BigDecimal;
+
 /**
  * 商品属性价格对象 m_prod_attr_price
  *
@@ -47,7 +49,7 @@ public class ProdAttrPrice extends BaseEntity {
 
     // 单价
     @Excel(name = "单价")
-    private Long price;
+    private BigDecimal price;
 
     // 删除标志
     @Excel(name = "删除标志")

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/DesignerMapper.xml

@@ -111,13 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteDesignerById" parameterType="Long">
         update m_designer
-            set delFlag = '2'
+            set delFlag = '1'
         where id = #{id}
     </update>
 
     <update id="logicDeleteDesignerByIds" parameterType="String">
         update m_designer
-        set delFlag = '2'
+        set delFlag = '1'
         where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteDesignerByCondition" parameterType="Designer">
         update m_designer
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="designerName != null  and designerName != ''"> and designerName like concat('%', #{designerName}, '%')</if>
             <if test="designerAvatar != null  and designerAvatar != ''"> and designerAvatar = #{designerAvatar}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/IpInfoMapper.xml

@@ -117,13 +117,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteIpInfoByIpId" parameterType="Long">
         update m_ipinfo
-            set delFlag = '2'
+            set delFlag = '1'
         where ipId = #{ipId}
     </update>
 
     <update id="logicDeleteIpInfoByIpIds" parameterType="String">
         update m_ipinfo
-        set delFlag = '2'
+        set delFlag = '1'
         where ipId in
         <foreach item="ipId" collection="array" open="(" separator="," close=")">
             #{ipId}
@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteIpInfoByCondition" parameterType="IpInfo">
         update m_ipinfo
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="ipName != null  and ipName != ''"> and ipName like concat('%', #{ipName}, '%')</if>
             <if test="ipUrl != null  and ipUrl != ''"> and ipUrl = #{ipUrl}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/MerchantMapper.xml

@@ -159,13 +159,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteMerchantByMercId" parameterType="Long">
         update m_merchant
-            set delFlag = '2'
+            set delFlag = '1'
         where mercId = #{mercId}
     </update>
 
     <update id="logicDeleteMerchantByMercIds" parameterType="String">
         update m_merchant
-        set delFlag = '2'
+        set delFlag = '1'
         where mercId in
         <foreach item="mercId" collection="array" open="(" separator="," close=")">
             #{mercId}
@@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteMerchantByCondition" parameterType="Merchant">
         update m_merchant
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="mercName != null  and mercName != ''"> and mercName like concat('%', #{mercName}, '%')</if>
             <if test="mercStatus != null  and mercStatus != ''"> and mercStatus = #{mercStatus}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/MerchantProdMapper.xml

@@ -123,13 +123,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteMerchantProdByMercProdId" parameterType="Long">
         update m_merchant_prod
-            set delFlag = '2'
+            set delFlag = '1'
         where mercProdId = #{mercProdId}
     </update>
 
     <update id="logicDeleteMerchantProdByMercProdIds" parameterType="String">
         update m_merchant_prod
-        set delFlag = '2'
+        set delFlag = '1'
         where mercProdId in
         <foreach item="mercProdId" collection="array" open="(" separator="," close=")">
             #{mercProdId}
@@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteMerchantProdByCondition" parameterType="MerchantProd">
         update m_merchant_prod
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="mercId != null "> and mercId = #{mercId}</if>
             <if test="prodId != null "> and prodId = #{prodId}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdAttrJointMapper.xml

@@ -117,13 +117,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdAttrJointByProdAttrJointId" parameterType="Long">
         update m_prod_attr_joint
-            set delFlag = '2'
+            set delFlag = '1'
         where prodAttrJointId = #{prodAttrJointId}
     </update>
 
     <update id="logicDeleteProdAttrJointByProdAttrJointIds" parameterType="String">
         update m_prod_attr_joint
-        set delFlag = '2'
+        set delFlag = '1'
         where prodAttrJointId in
         <foreach item="prodAttrJointId" collection="array" open="(" separator="," close=")">
             #{prodAttrJointId}
@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdAttrJointByCondition" parameterType="ProdAttrJoint">
         update m_prod_attr_joint
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdAttrMapper.xml

@@ -111,13 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdAttrByProdAttrId" parameterType="Long">
         update m_prod_attr
-            set delFlag = '2'
+            set delFlag = '1'
         where prodAttrId = #{prodAttrId}
     </update>
 
     <update id="logicDeleteProdAttrByProdAttrIds" parameterType="String">
         update m_prod_attr
-        set delFlag = '2'
+        set delFlag = '1'
         where prodAttrId in
         <foreach item="prodAttrId" collection="array" open="(" separator="," close=")">
             #{prodAttrId}
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdAttrByCondition" parameterType="ProdAttr">
         update m_prod_attr
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="attrName != null  and attrName != ''"> and attrName like concat('%', #{attrName}, '%')</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdAttrPriceMapper.xml

@@ -135,13 +135,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdAttrPriceByProdAttrPriceId" parameterType="Long">
         update m_prod_attr_price
-            set delFlag = '2'
+            set delFlag = '1'
         where prodAttrPriceId = #{prodAttrPriceId}
     </update>
 
     <update id="logicDeleteProdAttrPriceByProdAttrPriceIds" parameterType="String">
         update m_prod_attr_price
-        set delFlag = '2'
+        set delFlag = '1'
         where prodAttrPriceId in
         <foreach item="prodAttrPriceId" collection="array" open="(" separator="," close=")">
             #{prodAttrPriceId}
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdAttrPriceByCondition" parameterType="ProdAttrPrice">
         update m_prod_attr_price
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdClassMapper.xml

@@ -111,13 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdClassByProdClassId" parameterType="Long">
         update m_prod_class
-            set delFlag = '2'
+            set delFlag = '1'
         where prodClassId = #{prodClassId}
     </update>
 
     <update id="logicDeleteProdClassByProdClassIds" parameterType="String">
         update m_prod_class
-        set delFlag = '2'
+        set delFlag = '1'
         where prodClassId in
         <foreach item="prodClassId" collection="array" open="(" separator="," close=")">
             #{prodClassId}
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdClassByCondition" parameterType="ProdClass">
         update m_prod_class
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="className != null  and className != ''"> and className like concat('%', #{className}, '%')</if>
             <if test="classUrl != null  and classUrl != ''"> and classUrl = #{classUrl}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdMapper.xml

@@ -135,13 +135,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdById" parameterType="Long">
         update m_prod
-            set delFlag = '2'
+            set delFlag = '1'
         where id = #{id}
     </update>
 
     <update id="logicDeleteProdByIds" parameterType="String">
         update m_prod
-        set delFlag = '2'
+        set delFlag = '1'
         where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdByCondition" parameterType="Prod">
         update m_prod
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="prodClassId != null "> and prodClassId = #{prodClassId}</if>
             <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdPicMapper.xml

@@ -111,13 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdPicById" parameterType="Long">
         update m_prod_pic
-            set delFlag = '2'
+            set delFlag = '1'
         where id = #{id}
     </update>
 
     <update id="logicDeleteProdPicByIds" parameterType="String">
         update m_prod_pic
-        set delFlag = '2'
+        set delFlag = '1'
         where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdPicByCondition" parameterType="ProdPic">
         update m_prod_pic
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="picUrl != null  and picUrl != ''"> and picUrl = #{picUrl}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdTagMapper.xml

@@ -105,13 +105,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdTagById" parameterType="Long">
         update m_prod_tag
-            set delFlag = '2'
+            set delFlag = '1'
         where id = #{id}
     </update>
 
     <update id="logicDeleteProdTagByIds" parameterType="String">
         update m_prod_tag
-        set delFlag = '2'
+        set delFlag = '1'
         where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdTagByCondition" parameterType="ProdTag">
         update m_prod_tag
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="tagId != null "> and tagId = #{tagId}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdVendorMapper.xml

@@ -111,13 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdVendorByProdVendorId" parameterType="Long">
         update m_prod_vendor
-            set delFlag = '2'
+            set delFlag = '1'
         where prodVendorId = #{prodVendorId}
     </update>
 
     <update id="logicDeleteProdVendorByProdVendorIds" parameterType="String">
         update m_prod_vendor
-        set delFlag = '2'
+        set delFlag = '1'
         where prodVendorId in
         <foreach item="prodVendorId" collection="array" open="(" separator="," close=")">
             #{prodVendorId}
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteProdVendorByCondition" parameterType="ProdVendor">
         update m_prod_vendor
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/TagMapper.xml

@@ -99,13 +99,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteTagByTagId" parameterType="Long">
         update m_tag
-            set delFlag = '2'
+            set delFlag = '1'
         where tagId = #{tagId}
     </update>
 
     <update id="logicDeleteTagByTagIds" parameterType="String">
         update m_tag
-        set delFlag = '2'
+        set delFlag = '1'
         where tagId in
         <foreach item="tagId" collection="array" open="(" separator="," close=")">
             #{tagId}
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteTagByCondition" parameterType="Tag">
         update m_tag
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="tagName != null  and tagName != ''"> and tagName like concat('%', #{tagName}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/VendorMapper.xml

@@ -141,13 +141,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteVendorByVendorId" parameterType="Long">
         update m_vendor
-            set delFlag = '2'
+            set delFlag = '1'
         where vendorId = #{vendorId}
     </update>
 
     <update id="logicDeleteVendorByVendorIds" parameterType="String">
         update m_vendor
-        set delFlag = '2'
+        set delFlag = '1'
         where vendorId in
         <foreach item="vendorId" collection="array" open="(" separator="," close=")">
             #{vendorId}
@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="logicDeleteVendorByCondition" parameterType="Vendor">
         update m_vendor
-        set delFlag = '2'
+        set delFlag = '1'
         <where>
             <if test="vendorName != null  and vendorName != ''"> and vendorName like concat('%', #{vendorName}, '%')</if>
             <if test="contact != null  and contact != ''"> and contact = #{contact}</if>