zoujiajian 2 lat temu
rodzic
commit
0a72354e4a

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/mapper/OrderDonMapper.java

@@ -73,5 +73,5 @@ public interface OrderDonMapper extends BaseMapper<OrderDon> {
 
 	List<RealGoodsSourceData> getRealGoodsSourceData(@Param("isGeneral") Boolean isGeneral, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-	BigDecimal selectSubChannelOrderMoney(@Param("sharedId") Long sharedId, @Param("limitTime") Date limitTime);
+	BigDecimal selectSubChannelOrderMoney(@Param("sharedId") Long sharedId, @Param("invitedTime") Date invitedTime, @Param("limitTime") Date limitTime);
 }

+ 2 - 1
netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -430,6 +430,7 @@
         where dp.shared_id = #{sharedId}
           and o.goods_id != 15
             and o.status not in ('close', 'noPayment')
-        and o.created_time &lt; #{limitTime}
+        and o.created_time > #{invitedTime}
+          and o.created_time &lt; #{limitTime}
     </select>
 </mapper>

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2945,7 +2945,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						Integer months = userDistributeSubReward.getMonths();
 						BigDecimal targetAmount = userDistributeSubReward.getTargetAmount();
 						//是否达到目标额
-						BigDecimal subOrderMoney = orderDonMapper.selectSubChannelOrderMoney(subUserId, DateUtil.offsetMonth(userDistributeSub.getCreatedTime(), months));
+						BigDecimal subOrderMoney = orderDonMapper.selectSubChannelOrderMoney(subUserId, userDistributeSub.getCreatedTime(), DateUtil.offsetMonth(userDistributeSub.getCreatedTime(), months));
 						if (subOrderMoney != null && subOrderMoney.compareTo(targetAmount) >= 0) {
 							try {
 								//达标 发放提成