Merge branch 'master' of http://111.47.29.214:3000/udream-cxs/lift-server.git

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userCoupon/controller/UserCouponController.java

@@ -52,6 +52,12 @@ public class UserCouponController extends BaseController<UserCoupon, UserCouponQ
         return userCouponService.selectByExample(request);
     }
 
+    @PostMapping("/query-all-page")
+    @ApiOperation(value = "分页查询")
+    public RestResponse queryAllPage(@RequestBody UserCouponQuery request) {
+        return userCouponService.queryAllPage(request);
+    }
+
     @PostMapping("/couponNum")
     @ApiOperation(value = "我的卡券红包余额")
     public RestResponse getCouponNum(Long userId) {

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userCoupon/mapper/UserCouponMapper.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.ud.userCoupon.mapper;
 
 import cn.com.ty.lift.ud.userCoupon.controller.query.UserCouponQuery;
 import cn.com.ty.lift.ud.userCoupon.mapper.entity.UserCoupon;
+import cn.com.ty.lift.ud.userCoupon.mapper.entity.UserCouponResp;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,12 +38,16 @@ public interface UserCouponMapper extends BaseMapper<UserCoupon> {
 	
 	/**
 	 * 使用红包
-	 * @param couponId 红包id
+	 * @param id 红包id
 	 * @param status 状态
-	 * @param userId 用户id
 	 * @param orderid 订单id
 	 * @return
 	 */
 	@Update("UPDATE user_coupon SET used_flag=#{status},order_id=#{orderid} WHERE id=#{id} ")
 	int updateOrderIdAndStatusByCouponIdAndUserId(@Param("id")Long id,@Param("status")Integer status,@Param("orderid")Long orderid);
+
+
+	List<UserCouponResp> queryAllPage(UserCouponQuery query);
+
+	int queryAllPageCount(UserCouponQuery query);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userCoupon/mapper/UserCouponMapper.xml

@@ -16,4 +16,42 @@
         ${ew.sqlSegment}
     </where>
   </select>
+
+
+    <select id="queryAllPage" resultType="cn.com.ty.lift.ud.userCoupon.mapper.entity.UserCouponResp">
+        select
+            u.name userName,
+            u.avatar_url userHeadPic,
+            c.name couponName,
+            c.type couponType,
+            uc.used_flag usedFlag
+        from user_coupon uc
+        left join coupon c on uc.coupon_id = c.id
+        left join user_info u on uc.user_id = u.user_id
+        <where>
+            <if test="type != null">
+                and c.type = #{type}
+            </if>
+            <if test="usedFlag != null">
+                and uc.used_flag = #{usedFlag}
+            </if>
+        </where>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="queryAllPageCount" resultType="java.lang.Integer">
+        select
+            count(0)
+        from user_coupon uc
+        left join coupon c on uc.coupon_id = c.id
+        left join user_info u on uc.user_id = u.user_id
+        <where>
+            <if test="type != null">
+                and c.type = #{type}
+            </if>
+            <if test="usedFlag != null">
+                and uc.used_flag = #{usedFlag}
+            </if>
+        </where>
+    </select>
 </mapper>

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userCoupon/mapper/entity/UserCouponResp.java

@@ -0,0 +1,26 @@
+package cn.com.ty.lift.ud.userCoupon.mapper.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserCouponResp extends UserCoupon {
+    /**
+     * 所有者名字
+     */
+    private String userName;
+    /**
+     * 所有者头像
+     */
+    private String userHeadPic;
+    /**
+     * 名称
+     */
+    private String couponName;
+
+    /**
+     * 类型 1:折扣卷2:红包
+     */
+    private Integer couponType;
+
+}

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userCoupon/service/IUserCouponService.java

@@ -25,4 +25,7 @@ public interface IUserCouponService extends IService<UserCoupon> {
     List<UserCoupon> queryAllByType(Long userId, Integer type, BigDecimal amount);
 
     RestResponse selectByExample(UserCouponQuery example);
+
+
+    RestResponse queryAllPage(UserCouponQuery query);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userCoupon/service/impl/UserCouponServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cn.com.ty.lift.ud.userCoupon.mapper.entity.UserCouponResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -99,4 +100,15 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
         return RestResponse.success(page, "Queried successfully");
     }
 
+    @Override
+    public RestResponse queryAllPage(UserCouponQuery query) {
+        IPage page = query.page();
+        List<UserCouponResp> list = userCouponMapper.queryAllPage(query);
+
+        int total = userCouponMapper.queryAllPageCount(query);
+        page.setRecords(list);
+        page.setTotal(total);
+
+        return RestResponse.success(page, "Queried successfully");
+    }
 }