liuyao пре 1 година
родитељ
комит
1166db90dc

+ 10 - 0
src/main/java/com/dk/oauth/controller/integral/IntegralShareController.java

@@ -88,4 +88,14 @@ public class IntegralShareController{
         return integralShareService.selectShareNumber(integralShareQuery);
     }
 
+    /**
+     * @desc   : 当日积分邀请明细
+     * @date   : 2024/8/1 10:36
+     * @author : 刘尧
+     */
+    @ApiOperation(value = "当日积分邀请明细", notes = "当日积分邀请明细")
+    @PostMapping({"select_share_item"})
+    public ResponseResultVO<?> selectShareItem(@RequestBody IntegralShareQuery integralShareQuery ) {
+        return integralShareService.selectShareItem(integralShareQuery);
+    }
 }

+ 2 - 1
src/main/java/com/dk/oauth/mapper/integral/CouponSendMapper.xml

@@ -205,7 +205,8 @@
         from dkic_a.t_mst_coupon_send tmcs
         left join dkic_a.t_mst_coupon tmc
             on tmc.coupon_id = tmcs.coupon_id
-        where tmcs.send_user = #{sendUser}::uuid
+        where tmcs.flg_valid
+        AND tmcs.send_user = #{sendUser}::uuid
         and ( select COUNT (1) from dkic_a.t_mst_coupon_receive tmcr
         where tmcr.send_id = tmcs.send_id
         ) &lt; tmc.user_num

+ 8 - 0
src/main/java/com/dk/oauth/mapper/integral/IntegralShareMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 *  积分分享 Mapper
@@ -52,5 +53,12 @@ public interface IntegralShareMapper extends BaseMapper<IntegralShare>{
      * @author : 刘尧
      */
     Long selectShareNumber(IntegralShareQuery integralShareQuery);
+
+    /**
+     * @desc   : 当日积分邀请明细
+     * @date   : 2024/8/1 10:36
+     * @author : 刘尧
+     */
+    Map<String, Object> selectShareItem(IntegralShareQuery integralShareQuery);
 }
 

+ 22 - 0
src/main/java/com/dk/oauth/mapper/integral/IntegralShareMapper.xml

@@ -207,4 +207,26 @@
         </where>
     </select>
 
+    <!-- 当日积分邀请明细  -->
+    <select id="selectShareItem" resultType="java.util.Map">
+        SELECT
+            tmis.share_id as "shareId",
+            tmis.cp_id as "cpId",
+            tmis.user_id as "userId",
+            tmis.tactic_id as "tacticId",
+            tmis.integral_type as "integralType",
+            tmis.share_date as "sharDate",
+            tmis.end_date as "endDate",
+            now() as "nowDate"
+        FROM dkic_a.t_mst_integral_share tmis
+        WHERE tmis.flg_valid
+        AND tmis.cp_id = #{cpId}
+        AND tmis.integral_type = #{integralType}
+        AND tmis.tactic_id = #{tacticId}::uuid
+        AND tmis.user_id = #{userId}::uuid
+        AND tmis.end_date > now()
+        ORDER BY tmis.share_date desc
+        limit 1
+    </select>
+
 </mapper>

+ 9 - 0
src/main/java/com/dk/oauth/service/integral/IntegralShareService.java

@@ -209,4 +209,13 @@ public class IntegralShareService extends BaseService<IntegralShare> {
     public ResponseResultVO<?> selectShareNumber(IntegralShareQuery integralShareQuery) {
         return ResponseResultUtil.success(integralShareMapper.selectShareNumber(integralShareQuery));
     }
+
+	/**
+	 * @desc   : 当日积分邀请明细
+	 * @date   : 2024/8/1 10:36
+	 * @author : 刘尧
+	 */
+	public ResponseResultVO<?> selectShareItem(IntegralShareQuery integralShareQuery) {
+		return ResponseResultUtil.success(integralShareMapper.selectShareItem(integralShareQuery));
+	}
 }

+ 1 - 1
src/main/resources/dev/bootstrap.yml

@@ -2,7 +2,7 @@ server:
   port: 7002
 spring:
   application:
-    name: oauth-server
+    name: oauth-server-ly
   profiles:
     active: @environment@
   cloud: