Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

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

@@ -6,7 +6,9 @@ import com.dk.common.service.BaseService;
 import com.dk.oauth.model.VO.integral.CouponSendVO;
 import com.dk.oauth.model.VO.integral.IntegralShareVO;
 import com.dk.oauth.model.pojo.integral.IntegralShare;
+import com.dk.oauth.model.query.integral.CouponSendQuery;
 import com.dk.oauth.model.query.integral.IntegralShareQuery;
+import com.dk.oauth.model.response.integral.CouponSendResponse;
 import com.dk.oauth.model.response.integral.IntegralShareResponse;
 import com.dk.oauth.service.integral.IntegralShareService;
 import io.swagger.annotations.Api;
@@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Map;
 
 @Api(tags = "积分分享API接口")
 @RestController
@@ -98,4 +101,15 @@ public class IntegralShareController{
     public ResponseResultVO<?> selectShareItem(@RequestBody IntegralShareQuery integralShareQuery ) {
         return integralShareService.selectShareItem(integralShareQuery);
     }
+
+    /**
+     * @desc   : 条件查询
+     * @date   : 2024/8/6 08:59
+     * @author : 刘尧
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by_history"})
+    public ResponseResultVO<PageList<Map<String, Object>>> selectByCondHistory(@RequestBody IntegralShareQuery integralShareQuery ) {
+        return integralShareService.selectByCondHistory(integralShareQuery);
+    }
 }

src/main/java/com/dk/oauth/entity/Company.java

@@ -223,6 +223,12 @@ public class Company extends PageInfo<Company> implements Serializable {
     @ApiModelProperty(value = "负责人联系电话")
     private String cpPhone;
 
+    /**
+     * 分享编号
+     */
+    @Excel(name = "分享编号")
+    @ApiModelProperty(value = "分享编号")
+    private String shareId;
 
     /**
      * 公司规模

src/main/java/com/dk/oauth/entity/CompanyVO.java

@@ -404,6 +404,11 @@ public class CompanyVO extends PageInfo<CompanyVO> implements Serializable {
     private LocalDateTime shareEndDate;
 
     /**
+     * 分享编号
+     */
+    @ApiModelProperty(value = "分享编号")
+    private String shareId;
+    /**
      * @desc : -功能包 授权 续费的优惠券使用ID
      */
     @ApiModelProperty(value = "优惠券使用ID")

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

@@ -4,6 +4,7 @@ import com.dk.oauth.model.pojo.integral.IntegralShare;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.oauth.model.query.integral.IntegralItemQuery;
 import com.dk.oauth.model.query.integral.IntegralShareQuery;
+import com.dk.oauth.model.response.integral.CouponSendResponse;
 import com.dk.oauth.model.response.integral.IntegralItemResponse;
 import com.dk.oauth.model.response.integral.IntegralShareResponse;
 import org.apache.ibatis.annotations.Param;
@@ -60,5 +61,12 @@ public interface IntegralShareMapper extends BaseMapper<IntegralShare>{
      * @author : 刘尧
      */
     Map<String, Object> selectShareItem(IntegralShareQuery integralShareQuery);
+
+    /**
+     * @desc   : 历史记录
+     * @date   : 2024/8/1 10:36
+     * @author : 刘尧
+     */
+    List<Map<String, Object>> selectByCondHistory(IntegralShareQuery integralShareQuery);
 }
 

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

@@ -229,4 +229,29 @@
         limit 1
     </select>
 
+    <!-- 查询历史记录  -->
+    <select id="selectByCondHistory" 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.share_date as "shareDate"
+        , tmis.end_date as "endDate"
+        ,tmis.integral_type as "integralType"
+        , (
+        SELECT COUNT(1) FROM dkic_a.t_mst_integral_item tmii2 where tmii.item_id = tmii2.item_id
+        ) as "itemUserNumber"
+        , tmii.staff_name as "staffName"
+        FROM dkic_a.t_mst_integral_share tmis
+        LEFT JOIN dkic_a.t_mst_integral_item tmii
+        ON tmii.share_id = tmis.share_id
+        WHERE tmis.cp_id = #{cpId}
+        AND tmis.integral_type = '积分类型-邀请'
+        AND (tmis.end_date &lt; now() OR (
+        SELECT COUNT(1) FROM dkic_a.t_mst_integral_item tmii2 where tmii.item_id = tmii2.item_id
+        ) > 0)
+        ORDER BY tmii.acc_date DESC
+    </select>
+
 </mapper>

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

@@ -120,6 +120,12 @@ public class IntegralItem extends PageInfo<IntegralItem> implements Serializable
     @ApiModelProperty(value = "操作员工")
     private String staffName;
 
+    /**
+     * 分享编号
+     * */
+    @ApiModelProperty(value = "分享编号")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String shareId;
 
     /*
      * 相关属性

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -321,6 +321,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 integralItem.setCpId(companyVO.getCpIdFrom());
                 integralItem.setAccDate(LocalDateTime.now());
                 integralItem.setUserId(companyVO.getUserIdFrom());
+                integralItem.setShareId(companyVO.getShareId());
                 // 来源公司公司的人员
                 integralItem.setStaffName(companyVO.getStaffNameFrom());
                 integralItemMapper.insert(integralItem);

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

@@ -20,9 +20,11 @@ import com.dk.oauth.mapper.integral.IntegralShareMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.oauth.model.pojo.integral.IntegralTactic;
+import com.dk.oauth.model.query.integral.CouponSendQuery;
 import com.dk.oauth.model.query.integral.IntegralQuery;
 import com.dk.oauth.model.query.integral.IntegralShareQuery;
 import com.dk.oauth.model.query.integral.IntegralTacticQuery;
+import com.dk.oauth.model.response.integral.CouponSendResponse;
 import com.dk.oauth.model.response.integral.IntegralResponse;
 import com.dk.oauth.model.response.integral.IntegralShareResponse;
 import com.dk.oauth.model.response.integral.IntegralTacticResponse;
@@ -34,6 +36,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional
@@ -220,4 +223,14 @@ public class IntegralShareService extends BaseService<IntegralShare> {
 	public ResponseResultVO<?> selectShareItem(IntegralShareQuery integralShareQuery) {
 		return ResponseResultUtil.success(integralShareMapper.selectShareItem(integralShareQuery));
 	}
+
+    /**
+     * @desc   : 条件查询
+     * @date   : 2024/8/6 08:59
+     * @author : 刘尧
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> selectByCondHistory(IntegralShareQuery integralShareQuery) {
+        return super.mergeListWithCount(integralShareQuery, integralShareMapper.selectByCondHistory(integralShareQuery),
+                integralShareMapper.countByCond(integralShareQuery));
+    }
 }