Merge branch 'luck_draw_feature' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/InviteMemberBO.java

@@ -10,6 +10,8 @@ import lombok.Data;
  */
 @Data
 public class InviteMemberBO {
+      private Integer userId;
+      private Integer parentId;
       private String username;
       private String headUrl;
       private Long joinTime;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserRelationMapper.java

@@ -23,4 +23,6 @@ public interface AppUserRelationMapper extends Mapper<AppUserRelation> {
     public  int countByParentId(@Param("parentId")Integer parentId,@Param("bindTime")Long bindTime);
 
     List<AppUserRelation> selectByUserIds(@Param("userIds") List<Integer> userIds);
+
+    List<AppUserRelation> selectCountByLeaderId(Integer userId);
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml

@@ -21,4 +21,8 @@
            #{userId}
         </foreach>
     </select>
+
+    <select id="selectCountByLeaderId" resultType="com.github.wxiaoqi.security.admin.entity.AppUserRelation">
+        select * from   `app_user_relation` as `aur` inner join  `app_user_login` as `aul` on aul.id=aur.user_id where aur.is_del=0 and aul.isdel=0  and aur.parent_id=#{userId}
+    </select>
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -10,6 +10,7 @@
 	 IFNULL(ausww.income,0)  AS `income`
 FROM
 	`app_user_relation` AS `aur`
+	INNER JOIN (select `id` from `app_user_login` where  isdel=0)as `aul` ON aul.id=aur.user_id
 	LEFT JOIN (SELECT DISTINCT
 	`source_id` AS userId,
 	IFNULL(
@@ -149,29 +150,29 @@ FROM
         <if test="userName!=null and userName!=' '">
             WHERE `realname` LIKE CONCAT('%',#{userName},'%') OR `nickname` LIKE CONCAT('%',#{userName},'%')
         </if>) AS audd ON audd.userid = ausw.user_id
-      ORDER BY ausw.crt_time DESC
+        ORDER BY ausw.crt_time DESC
     </select>
 
     <select id="statisticsStatffSellerWaterByUserIdsAndTime"
             resultType="com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO">
         SELECT
-   `auswu`.user_id, ( IFNULL(auswu.upIncome,0) - IFNULL(auswd.dowIncome,0) ) AS `commission`
-   FROM
-    ( SELECT `user_id` as `userId`, IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` where STATUS = 0 and waiting=1
-    AND `crt_time` between #{startTime} and #{endTime}
-    <if test="userIds!=null and userIds.size!=0">
-        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-         #{userId}
-    </foreach>
-    </if> group by user_id) AS `auswu`
-     left join
-    ( SELECT `user_id`,IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` where STATUS = 1 and waiting=1
-     and `crt_time` between #{startTime} and #{endTime}
-    <if test="userIds!=null and userIds.size!=0">
-        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-        #{userId}
-    </foreach>
-    </if> group by user_id) AS `auswd`
-    on auswd.user_id=auswu.user_id
+        `auswu`.user_id, ( IFNULL(auswu.upIncome,0) - IFNULL(auswd.dowIncome,0) ) AS `commission`
+        FROM
+        ( SELECT `user_id` as `userId`, IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` where STATUS = 0 and waiting=1
+        AND `crt_time` between #{startTime} and #{endTime}
+        <if test="userIds!=null and userIds.size!=0">
+            AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
+        </if> group by user_id) AS `auswu`
+        left join
+        ( SELECT `user_id`,IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` where STATUS = 1 and waiting=1
+        and `crt_time` between #{startTime} and #{endTime}
+        <if test="userIds!=null and userIds.size!=0">
+            AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
+        </if> group by user_id) AS `auswd`
+        on auswd.user_id=auswu.user_id
     </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPrizeBiz.java

@@ -140,20 +140,24 @@ public class ActivityPrizeBiz extends BaseBiz<ActivityPrizeMapper, ActivityPrize
         int index = LotteryUtils.getrandomIndex(activityPrizes);
         ActivityPrize activityPrize = activityPrizes.get(index);
 
-        //库存为0
-        if (activityPrize.getPrizeGoodsType()!=0 && activityPrize.getTotalStock() == 0) {
-           activityPrize = notActivityPrize;
-        }
-
-        if (activityPrize.getDayMaxUse()!=null){
-            String key = String.format("%s:%s:%d:%s",lotteryDate,LOTTERY_PRE_KEY, activityId, activityPrize.getSerialNumber());
-            Long prizeDayUseStock = valueOperations.increment(key);
-             //达到日上限
-            if (prizeDayUseStock.intValue() > activityPrize.getDayMaxUse()){
+        try {
+            //库存为0
+            if (activityPrize.getPrizeGoodsType() != 0 && activityPrize.getTotalStock() != null && activityPrize.getTotalStock() == 0) {
                 activityPrize = notActivityPrize;
             }
+        }catch (Exception ex){
+            System.out.println("+++++"+activityPrize);
         }
 
+//        if (activityPrize.getDayMaxUse()!=null){
+//            String key = String.format("%s:%s:%d:%s",lotteryDate,LOTTERY_PRE_KEY, activityId, activityPrize.getSerialNumber());
+//            Long prizeDayUseStock = valueOperations.increment(key);
+//             //达到日上限
+//            if (prizeDayUseStock.intValue() > activityPrize.getDayMaxUse()){
+//                activityPrize = notActivityPrize;
+//            }
+//        }
+
         ActivityWinningRecord activityWinningRecord = new ActivityWinningRecord();
         activityWinningRecord.setActivityId(activityId);
         activityWinningRecord.setPrizeType(prizeType);
@@ -182,6 +186,8 @@ public class ActivityPrizeBiz extends BaseBiz<ActivityPrizeMapper, ActivityPrize
             //设置为已中奖
             activityWinningRecord.setHasWinning(1);
             activityWinningRecord.setIconPath(activityPrize.getIconPath());
+            activityWinningRecord.setLotteryTime(new Date());
+            activityWinningRecord.setPrizeName(activityPrize.getName());
         }
         activityWinningRecordBiz.saveRecord(activityWinningRecord);
         lotteryVo.setSerialNumber(activityPrize.getSerialNumber());