rentaiming
2024-06-12 8fa41ca2c6b1d423f57f85a9b86cb581a4fc0bca
用户端商品
4个文件已修改
59 ■■■■ 已修改文件
ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionGoodsMapper.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionGoodsMapper.xml
@@ -2,22 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.auction.mapper.AuctionGoodsMapper">
    <select id="getAuctionGoodsPgeList" resultType="com.ruoyi.system.api.domain.AuctionGoods">
        SELECT * FROM t_auction_goods ta left join
        WHERE ta.del_flag = 0 and ta.listing_status=0
        SELECT * FROM t_auction_goods ta
        WHERE del_flag = 0 and listing_status=0
        <if test="param.startStatus!=null and param.startStatus != ''">
            AND ta.start_status=#{param.startStatus}
            AND start_status=#{param.startStatus}
        </if>
        <if test="param.goodsSkuIdList != null and param.goodsSkuIdList.size()>0">
            OR ta.goods_sku_id IN
            AND goods_sku_id IN
            <foreach collection="param.goodsSkuIdList" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        ORDER BY
        CASE
        WHEN status = 0 THEN 2
        WHEN status = 1 THEN 1
        WHEN status = 2 THEN 3
        END,status
        WHEN start_status = 0 THEN 2
        WHEN start_status = 1 THEN 1
        WHEN start_status = 2 THEN 3
        END,start_status
    </select>
</mapper>
ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
@@ -3,10 +3,10 @@
<mapper namespace="com.ruoyi.auction.mapper.AuctionSalesroomMapper">
    <select id="pageMemberAuctionSalesroomList" resultType="com.ruoyi.system.api.domain.AuctionSalesroom">
        SELECT * FROM t_auction_salesroom ta
        WHERE ta.del_flag = 0
        SELECT * FROM t_auction_salesroom
        WHERE del_flag = 0
        <if test="param.salesroomName!=null and param.salesroomName != ''">
            AND ta.salesroomName LIKE CONCAT('%',#{param.salesroomName},'%')
            AND salesroom_name LIKE CONCAT('%',#{param.salesroomName},'%')
        </if>
        ORDER BY
        CASE
@@ -23,10 +23,10 @@
            AND ta.status=#{param.status}
        </if>
        <if test="param.salesroomName!=null and param.salesroomName != ''">
            AND ta.salesroomName LIKE CONCAT('%',#{param.salesroomName},'%')
            AND ta.salesroom_name LIKE CONCAT('%',#{param.salesroomName},'%')
        </if>
        <if test="param.goodsSkuIdList != null and param.goodsSkuIdList.size()>0">
            OR ta.goods_sku_id IN
            OR ta.id IN
            <foreach collection="param.goodsSkuIdList" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -305,6 +305,12 @@
    public void authentificationMembe(MemberDTO memberDTO) {
        Member member= this.getById(memberDTO.getMemberid());
        member.setPhone(memberDTO.getPhone());
        if(memberDTO.getIdNumber()==null){
            throw new ServiceException("身份证号不能为空");
        }
        if(memberDTO.getRealName()==null){
            throw new ServiceException("姓名不能为空");
        }
        member.setIdNumber(memberDTO.getIdNumber());
        member.setRealName(memberDTO.getRealName());
        String realname = "";// 姓名
@@ -338,6 +344,12 @@
            }
        }
     JSONObject jsonObject= JSON.parseObject(result);
        String object1= jsonObject.get("reason").toString();
        if(!object1.equals("成功")){
            throw new ServiceException(object1);
        }
      String object= jsonObject.get("result").toString();
      JSONObject jsonObject1= JSON.parseObject(object);
      if (Integer.valueOf(jsonObject1.get("res").toString())==2){
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -58,11 +58,26 @@
    o.goods_sku_id as goodsSkuId
    FROM
    t_order o
    LEFT JOIN t_goods_sku tgs ON o.goods_sku_id = tgs.id
    <where>
       o.order_status = 2
      o.order_status = 2
      <if test="skuName != null and skuName != ''">
        AND tgs.goods_sku_name LIKE CONCAT('%',#{skuName},'%')
        AND o.sku_name LIKE CONCAT('%',#{skuName},'%')
      </if>
      AND o.order_from = 3
      AND   o.member_id=#{memberId}
    </where>
  </select>
  <select id="getOrderByGroupPurchaseMemberList" resultType="com.ruoyi.system.api.domain.vo.OrderVO">
    SELECT
    o.*,
    o.goods_sku_id as goodsSkuId
    FROM
    t_order o
    <where>
      o.order_status = 2
      <if test="skuName != null and skuName != ''">
        AND o.sku_name LIKE CONCAT('%',#{skuName},'%')
      </if>
      AND o.order_from = 3
      AND   o.member_id=#{memberId}