积分优惠券coId

添加优惠券查询，优惠券使用查询

src/main/java/com/dk/oauth/controller/integral/CouponController.java

@@ -1,13 +1,16 @@
 package com.dk.oauth.controller.integral;
 
-import com.dk.oauth.model.pojo.integral.Coupon;
-import com.dk.common.controller.BaseController;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.Api;
+import com.dk.oauth.model.pojo.integral.Coupon;
+import com.dk.oauth.model.query.integral.CouponQuery;
+import com.dk.oauth.model.response.integral.CouponResponse;
 import com.dk.oauth.service.integral.CouponService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "优惠券API接口")
 @RestController
@@ -21,4 +24,27 @@ public class CouponController{
     @Autowired
     private CouponService couponService;
 
+    /**
+     * @desc   : 条件查询
+     * @date   : 2024/7/25 10:22
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<CouponResponse>> selectByCond(@RequestBody CouponQuery couponQuery ) {
+        return couponService.selectByCond(couponQuery);
+    }
+
+    /**
+     * @desc   : 通过ID查询
+     * @date   : 2024/7/25 10:21
+     * @author : 寇珊珊
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO<?> selectById(@PathVariable String id) {
+        return couponService.selectById(id);
+    }
+
+
+
 }

src/main/java/com/dk/oauth/controller/integral/CouponSendController.java

@@ -1,11 +1,17 @@
 package com.dk.oauth.controller.integral;
 
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.oauth.model.pojo.integral.CouponSend;
 import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.dk.oauth.model.query.integral.CouponQuery;
+import com.dk.oauth.model.query.integral.CouponSendQuery;
+import com.dk.oauth.model.response.integral.CouponResponse;
+import com.dk.oauth.model.response.integral.CouponSendResponse;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.oauth.service.integral.CouponSendService;
 
@@ -21,4 +27,26 @@ public class CouponSendController{
     @Autowired
     private CouponSendService couponSendService;
 
+
+    /**
+     * @desc   : 条件查询
+     * @date   : 2024/7/25 10:22
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<CouponSendResponse>> selectByCond(@RequestBody CouponSendQuery couponSendQuery ) {
+        return couponSendService.selectByCond(couponSendQuery);
+    }
+
+    /**
+     * @desc   : 通过ID查询
+     * @date   : 2024/7/25 10:21
+     * @author : 寇珊珊
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO<?> selectById(@PathVariable String id) {
+        return couponSendService.selectById(id);
+    }
+
 }

src/main/java/com/dk/oauth/mapper/integral/CouponReceiveMapper.xml

@@ -15,7 +15,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.oauth.model.pojo.integral.CouponReceive">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
                 <result column="coupon_id" property="couponId" typeHandler="UuidTypeHandler"/>
                 <result column="user_wxid" property="userWxid"/>
             <result column="assist_date" property="assistDate" typeHandler="TimestampTypeHandler"/>
@@ -23,7 +23,7 @@
     </resultMap>
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMapResponse" type="com.dk.oauth.model.response.integral.CouponReceiveResponse">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
         <result column="cp_name" property="cpName"/>
         <result column="coupon_id" property="couponId" typeHandler="UuidTypeHandler"/>
         <result column="coupon_name" property="couponName" />
@@ -99,7 +99,7 @@
         FROM dkic_a.t_mst_coupon_receive tmcr
         left join dkic_a.t_mst_coupon tmc on tmc.coupon_id = tmcr.coupon_id
         left join dkic_a.t_a_company tac on tac.cp_id = tmcr.cp_id
-        WHERE cp_id = #{id}::uuid
+        WHERE cp_id = #{id}
     </select>
 
     <!-- 根据主键锁定表dkic_a.t_mst_coupon_receive的一行数据 -->
@@ -107,7 +107,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_a.t_mst_coupon_receive
-        WHERE cp_id = #{cpId}::uuid
+        WHERE cp_id = #{cpId}
         for update
     </select>
 

src/main/java/com/dk/oauth/mapper/integral/CouponSendMapper.xml

@@ -14,7 +14,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.oauth.model.pojo.integral.CouponSend">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
                 <result column="coupon_id" property="couponId" typeHandler="UuidTypeHandler"/>
             <result column="send_date" property="sendDate" typeHandler="TimestampTypeHandler"/>
             <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
@@ -23,7 +23,7 @@
     </resultMap>
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMapResponse" type="com.dk.oauth.model.response.integral.CouponSendResponse">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
         <result column="coupon_id" property="couponId" typeHandler="UuidTypeHandler"/>
         <result column="send_date" property="sendDate" typeHandler="TimestampTypeHandler"/>
         <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
@@ -100,7 +100,7 @@
         FROM dkic_a.t_mst_coupon_send
         left join dkic_a.t_a_company tac on tac.cp_id = tmcs.cp_id
         left join dkic_a.t_mst_coupon tmc on tmc.coupon_id = tmcs.coupon_id
-        WHERE cp_id = #{id}::uuid
+        WHERE cp_id = #{id}
     </select>
 
     <!-- 根据主键锁定表dkic_a.t_mst_coupon_send的一行数据 -->
@@ -108,7 +108,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_a.t_mst_coupon_send
-        WHERE cp_id = #{cpId}::uuid
+        WHERE cp_id = #{cpId}
         for update
     </select>
 

src/main/java/com/dk/oauth/mapper/integral/CouponUseMapper.xml

@@ -14,7 +14,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.oauth.model.pojo.integral.CouponUse">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId"  />
                 <result column="coupon_id" property="couponId" typeHandler="UuidTypeHandler"/>
                 <result column="use_valid_days" property="useValidDays"/>
             <result column="receive_date" property="receiveDate" typeHandler="TimestampTypeHandler"/>
@@ -25,7 +25,7 @@
     </resultMap>
     <!-- 通用查询映射结果Response -->
     <resultMap id="BaseResultMapResponse" type="com.dk.oauth.model.response.integral.CouponUseResponse">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
         <result column="cp_name" property="cpName"/>
         <result column="coupon_id" property="couponId" typeHandler="UuidTypeHandler"/>
         <result column="coupon_name" property="couponName" />
@@ -113,7 +113,7 @@
         FROM dkic_a.t_mst_coupon_use tmcu
         left join dkic_a.t_mst_coupon tmc on tmc.coupon_id = tmcu.coupon_id
         left join dkic_a.t_a_company tac on tac.cp_id = tmcu.cp_id
-        WHERE cp_id = #{id}::uuid
+        WHERE cp_id = #{id}
     </select>
 
     <!-- 根据主键锁定表t_mst_coupon_use的一行数据 -->

src/main/java/com/dk/oauth/mapper/integral/IntegralItemMapper.xml

@@ -18,8 +18,8 @@
         <id column="item_id" property="itemId"/>
                 <result column="integral_type" property="integralType"/>
                 <result column="integral" property="integral"/>
-                <result column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
-                <result column="cp_id_from" property="cpIdFrom" typeHandler="UuidTypeHandler"/>
+                <result column="cp_id" property="cpId" />
+                <result column="cp_id_from" property="cpIdFrom" />
             <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="user_id" property="userId" typeHandler="UuidTypeHandler"/>
@@ -30,9 +30,9 @@
         <id column="item_id" property="itemId"/>
         <result column="integral_type" property="integralType"/>
         <result column="integral" property="integral"/>
-        <result column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <result column="cp_id" property="cpId" />
         <result column="cp_name" property="cpName"/>
-        <result column="cp_id_from" property="cpIdFrom" typeHandler="UuidTypeHandler"/>
+        <result column="cp_id_from" property="cpIdFrom" />
         <result column="cp_name_from" property="cpNameFrom"/>
         <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
@@ -50,10 +50,10 @@
                 AND tmii.integral = #{integral}
             </if>
             <if test="cpId != null and cpId != ''">
-                AND tmii.cp_id = #{cpId}::uuid
+                AND tmii.cp_id = #{cpId}
             </if>
             <if test="cpIdFrom != null and cpIdFrom != ''">
-                AND tmii.cp_id_from = #{cpIdFrom}::uuid
+                AND tmii.cp_id_from = #{cpIdFrom}
             </if>
             <if test="accDate != null">
                 AND tmii.acc_date = #{accDate}

src/main/java/com/dk/oauth/mapper/integral/IntegralMapper.xml

@@ -14,14 +14,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.oauth.model.pojo.integral.Integral">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
                 <result column="integral" property="integral"/>
                 <result column="flg_valid" property="flgValid"/>
     </resultMap>
 
     <!-- 通用查询映射结果Response -->
     <resultMap id="BaseResultMapResponse" type="com.dk.oauth.model.response.integral.IntegralResponse">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId"/>
         <result column="cp_name" property="cpName"/>
         <result column="integral" property="integral"/>
         <result column="flg_valid" property="flgValid"/>
@@ -79,7 +79,7 @@
         ,tac.cp_name
         FROM dkic_a.t_mst_integral tmi
         left join dkic_a.t_a_company tac on tac.cp_id = tmi.cp_id
-        WHERE cp_id = #{id}::uuid
+        WHERE cp_id = #{id}
     </select>
 
     <!-- 根据主键锁定表dkic_a.t_mst_integral的一行数据 -->
@@ -87,7 +87,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_a.t_mst_integral
-        WHERE cp_id = #{cpId}::uuid
+        WHERE cp_id = #{cpId}
         for update
     </select>
 

src/main/java/com/dk/oauth/mapper/integral/IntegralShareMapper.xml

@@ -14,7 +14,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.oauth.model.pojo.integral.IntegralShare">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
                 <result column="tactic_id" property="tacticId" typeHandler="UuidTypeHandler"/>
             <result column="share_date" property="shareDate" typeHandler="TimestampTypeHandler"/>
             <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
@@ -22,7 +22,7 @@
     </resultMap>
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMapResponse" type="com.dk.oauth.model.response.integral.IntegralShareResponse">
-        <id column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <id column="cp_id" property="cpId" />
         <result column="tactic_id" property="tacticId" typeHandler="UuidTypeHandler"/>
         <result column="share_date" property="shareDate" typeHandler="TimestampTypeHandler"/>
         <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
@@ -85,7 +85,7 @@
         ,tac.cp_name
         FROM dkic_a.t_mst_integral_share tmis
         left join dkic_a.t_a_company tac on tac.cp_id = tmis.cp_id
-        WHERE cp_id = #{cpId}::uuid
+        WHERE cp_id = #{cpId}
     </select>
 
     <!-- 根据主键锁定表dkic_a.t_mst_integral_share的一行数据 -->
@@ -93,7 +93,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_a.t_mst_integral_share
-        WHERE cp_id = #{id}::uuid
+        WHERE cp_id = #{id}
         for update
     </select>
 

src/main/java/com/dk/oauth/mapper/integral/SignRecordMapper.xml

@@ -15,7 +15,7 @@
     <resultMap id="BaseResultMap" type="com.dk.oauth.model.pojo.integral.SignRecord">
         <id column="record_id" property="recordId"/>
                 <result column="user_id" property="userId" typeHandler="UuidTypeHandler"/>
-                <result column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+                <result column="cp_id" property="cpId"/>
                 <result column="sign_days" property="signDays"/>
             <result column="last_date" property="lastDate" typeHandler="TimestampTypeHandler"/>
                 <result column="flg_valid" property="flgValid"/>
@@ -26,7 +26,7 @@
         <id column="record_id" property="recordId"/>
         <result column="user_id" property="userId" typeHandler="UuidTypeHandler"/>
         <result column="user_name" property="userName"/>
-        <result column="cp_id" property="cpId" typeHandler="UuidTypeHandler"/>
+        <result column="cp_id" property="cpId" />
         <result column="cp_name" property="cpName"/>
         <result column="sign_days" property="signDays"/>
         <result column="last_date" property="lastDate" typeHandler="TimestampTypeHandler"/>
@@ -42,7 +42,7 @@
                 AND tmsr.user_id = #{userId}::uuid
             </if>
             <if test="cpId != null and cpId != ''">
-                AND tmsr.cp_id = #{cpId}::uuid
+                AND tmsr.cp_id = #{cpId}
             </if>
             <if test="signDays != null">
                 AND tmsr.sign_days = #{signDays}

src/main/java/com/dk/oauth/model/VO/integral/CouponReceiveVO.java

@@ -33,8 +33,7 @@ public class CouponReceiveVO  {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/VO/integral/CouponSendVO.java

@@ -36,8 +36,7 @@ public class CouponSendVO  {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/VO/integral/CouponUseVO.java

@@ -36,8 +36,7 @@ public class CouponUseVO{
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/VO/integral/IntegralItemVO.java

@@ -61,8 +61,7 @@ public class IntegralItemVO{
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**
@@ -70,8 +69,7 @@ public class IntegralItemVO{
      */
     @Excel(name = "来源公司Id")
     @ApiModelProperty(value = "来源公司Id")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpIdFrom;
+    private Integer cpIdFrom;
 
 
     /**

src/main/java/com/dk/oauth/model/VO/integral/IntegralVO.java

@@ -33,8 +33,7 @@ public class IntegralVO {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/VO/integral/SignRecordVO.java

@@ -55,8 +55,7 @@ public class SignRecordVO  {
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/integral/CouponReceive.java

@@ -42,8 +42,7 @@ public class CouponReceive extends PageInfo<CouponReceive> implements Serializab
      */
 //    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/integral/CouponSend.java

@@ -42,8 +42,7 @@ public class CouponSend extends PageInfo<CouponSend> implements Serializable {
      */
 //    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/integral/CouponUse.java

@@ -42,8 +42,7 @@ public class CouponUse extends PageInfo<CouponUse> implements Serializable {
      */
 //    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/integral/Integral.java

@@ -41,8 +41,7 @@ public class Integral extends PageInfo<Integral> implements Serializable {
      */
 //    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/integral/IntegralItem.java

@@ -67,8 +67,7 @@ public class IntegralItem extends PageInfo<IntegralItem> implements Serializable
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**
@@ -76,8 +75,7 @@ public class IntegralItem extends PageInfo<IntegralItem> implements Serializable
      */
     @Excel(name = "来源公司Id")
     @ApiModelProperty(value = "来源公司Id")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpIdFrom;
+    private Integer cpIdFrom;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/integral/IntegralShare.java

@@ -42,8 +42,7 @@ public class IntegralShare extends PageInfo<IntegralShare> implements Serializab
      */
 //    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/integral/SignRecord.java

@@ -60,8 +60,7 @@ public class SignRecord extends PageInfo<SignRecord> implements Serializable {
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/query/integral/CouponReceiveQuery.java

@@ -27,8 +27,7 @@ public class CouponReceiveQuery extends PageInfo<CouponReceiveQuery> {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/query/integral/CouponSendQuery.java

@@ -36,8 +36,7 @@ public class CouponSendQuery extends PageInfo<CouponSendQuery>  {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/query/integral/CouponUseQuery.java

@@ -27,8 +27,7 @@ public class CouponUseQuery extends PageInfo<CouponUseQuery>  {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/query/integral/IntegralItemQuery.java

@@ -52,8 +52,7 @@ public class IntegralItemQuery extends PageInfo<IntegralItemQuery>  {
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**
@@ -61,8 +60,7 @@ public class IntegralItemQuery extends PageInfo<IntegralItemQuery>  {
      */
     @Excel(name = "来源公司Id")
     @ApiModelProperty(value = "来源公司Id")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpIdFrom;
+    private Integer cpIdFrom;
 
 
     /**

src/main/java/com/dk/oauth/model/query/integral/IntegralQuery.java

@@ -23,8 +23,7 @@ public class IntegralQuery extends PageInfo<IntegralQuery>  {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/query/integral/IntegralShareQuery.java

@@ -34,8 +34,7 @@ public class IntegralShareQuery extends PageInfo<IntegralShareQuery>  {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/query/integral/SignRecordQuery.java

@@ -45,8 +45,7 @@ public class SignRecordQuery extends PageInfo<SignRecordQuery>{
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/CouponReceiveResponse.java

@@ -36,8 +36,7 @@ public class CouponReceiveResponse {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/CouponSendResponse.java

@@ -38,8 +38,7 @@ public class CouponSendResponse {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/CouponUseResponse.java

@@ -36,8 +36,7 @@ public class CouponUseResponse {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/IntegralItemResponse.java

@@ -61,8 +61,7 @@ public class IntegralItemResponse{
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**
@@ -70,8 +69,7 @@ public class IntegralItemResponse{
      */
     @Excel(name = "来源公司Id")
     @ApiModelProperty(value = "来源公司Id")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpIdFrom;
+    private Integer cpIdFrom;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/IntegralResponse.java

@@ -33,8 +33,7 @@ public class IntegralResponse {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/IntegralShareResponse.java

@@ -36,8 +36,7 @@ public class IntegralShareResponse {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/SignRecordResponse.java

@@ -54,8 +54,7 @@ public class SignRecordResponse {
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String cpId;
+    private Integer cpId;
 
 
     /**

src/main/java/com/dk/oauth/service/integral/CouponSendService.java

@@ -1,9 +1,16 @@
 package com.dk.oauth.service.integral;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.oauth.model.pojo.integral.CouponSend;
 import com.dk.oauth.mapper.integral.CouponSendMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.oauth.model.query.integral.CouponQuery;
+import com.dk.oauth.model.query.integral.CouponSendQuery;
+import com.dk.oauth.model.response.integral.CouponResponse;
+import com.dk.oauth.model.response.integral.CouponSendResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,4 +27,17 @@ public class CouponSendService extends BaseService<CouponSend> {
 	@Autowired
 	private CouponSendMapper couponSendMapper;
 
+	/**
+	 * @desc   : 条件查询
+	 * @date   : 2024/7/25 10:22
+	 * @author : 寇珊珊
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<CouponSendResponse>> selectByCond(CouponSendQuery couponSendQuery) {
+		return super.mergeListWithCount(couponSendQuery, couponSendMapper.selectByCond(couponSendQuery),
+				couponSendMapper.countByCond(couponSendQuery));
+	}
+
+
+
 }

src/main/java/com/dk/oauth/service/integral/CouponService.java

@@ -1,9 +1,16 @@
 package com.dk.oauth.service.integral;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.oauth.model.pojo.integral.Coupon;
 import com.dk.oauth.mapper.integral.CouponMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.oauth.model.query.integral.CouponQuery;
+import com.dk.oauth.model.query.integral.IntegralQuery;
+import com.dk.oauth.model.response.integral.CouponResponse;
+import com.dk.oauth.model.response.integral.IntegralResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,4 +27,15 @@ public class CouponService extends BaseService<Coupon> {
 	@Autowired
 	private CouponMapper couponMapper;
 
+	/**
+	 * @desc   : 条件查询
+	 * @date   : 2024/7/25 10:22
+	 * @author : 寇珊珊
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<CouponResponse>> selectByCond(CouponQuery couponQuery) {
+		return super.mergeListWithCount(couponQuery, couponMapper.selectByCond(couponQuery),
+				couponMapper.countByCond(couponQuery));
+	}
+
 }