收入优化

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeDetailMapper.java

@@ -33,4 +33,12 @@ import java.util.List;
 @Mapper
 public interface TIncomeDetailMapper extends BaseMapper<TIncomeDetail> {
 	List<TIncomeDetail> getTIncomeDetailList(@Param("tIncomeDetail") TIncomeDetail tIncomeDetail);
+
+	/**
+	 * @Description: 获取重复性
+	 * @Author: hgw
+	 * @Date: 2022/12/5 11:16
+	 * @return: int
+	 **/
+	int getTIncomeDetailRepeat(@Param("tIncomeDetail") TIncomeDetail detail);
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TIncomeDetailService.java

@@ -30,4 +30,13 @@ import java.util.List;
  */
 public interface TIncomeDetailService extends IService<TIncomeDetail> {
 	List<TIncomeDetail> getTIncomeDetailList(TIncomeDetail detail);
+
+	/**
+	 * @Description: 获取重复性
+	 * @Author: hgw
+	 * @Date: 2022/12/5 11:16
+	 * @return: int
+	 **/
+	int getTIncomeDetailRepeat(TIncomeDetail detail);
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeDetailServiceImpl.java

@@ -39,4 +39,15 @@ public class TIncomeDetailServiceImpl extends ServiceImpl<TIncomeDetailMapper, T
 	public List<TIncomeDetail> getTIncomeDetailList(TIncomeDetail detail) {
 		return baseMapper.getTIncomeDetailList(detail);
 	}
+
+	/**
+	 * @Description: 获取重复性
+	 * @Author: hgw
+	 * @Date: 2022/12/5 11:16
+	 * @return: int
+	 **/
+	@Override
+	public int getTIncomeDetailRepeat(TIncomeDetail detail) {
+		return baseMapper.getTIncomeDetailRepeat(detail);
+	}
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java

@@ -578,12 +578,13 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		if (Common.isNotNull(tIncomeDetail.getSourceId())) {
 			// 如果该id、该类型的金额已存在，则不允许重复生成推送
 			TIncomeDetail a = new TIncomeDetail();
+			a.setId(tIncomeDetail.getId());
 			a.setSourceId(tIncomeDetail.getSourceId());
 			a.setMoney(tIncomeDetail.getMoney());
 			a.setRedData(tIncomeDetail.getRedData());
 			a.setFeeType(tIncomeDetail.getFeeType());
-			List<TIncomeDetail> aList = tIncomeDetailService.getTIncomeDetailList(a);
-			if (aList != null && !aList.isEmpty()) {
+			int repeatNums = tIncomeDetailService.getTIncomeDetailRepeat(a);
+			if (repeatNums > CommonConstants.ZERO_INT) {
 				return true;
 			}
 		}

yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeDetailMapper.xml

@@ -156,4 +156,16 @@
 		</where>
 	</select>
 
+	<!-- 获取重复性 -->
+	<select id="getTIncomeDetailRepeat" resultType="java.lang.Integer">
+		SELECT
+			count(1)
+		FROM t_income_detail a
+		where	a.ID !=  #{tIncomeDetail.id}
+				AND a.SOURCE_ID = #{tIncomeDetail.sourceId}
+				AND a.MONEY = #{tIncomeDetail.money}
+				AND a.RED_DATA = #{tIncomeDetail.redData}
+				AND a.FEE_TYPE = #{tIncomeDetail.feeType}
+	</select>
+
 </mapper>