抽奖列表 增加账户查询 排序

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityDrawListSearchParam.java

@@ -33,6 +33,9 @@ public class SweetIntegralActivityDrawListSearchParam implements Serializable {
     @ApiModelProperty(value = "用户昵称")
     private String nickname;
 
+    @ApiModelProperty(value = "用户账户")
+    private String mobile;
+
     @ApiModelProperty(value = "发放状态")
     private Integer receivingStatus;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetIntegralActivityDrawController.java

@@ -51,7 +51,7 @@ public class SweetIntegralActivityDrawController extends BaseController {
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list(SweetIntegralActivityDrawListSearchParam listParam) {
-        PageInfo<SweetIntegralActivityDraw> result = iSweetIntegralActivityDrawService.drawList(listParam);
+        PageInfo<SweetActivityDrawListDao> result = iSweetIntegralActivityDrawService.drawList(listParam);
         return getDataTable(result.getList());
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivityDraw/list.html

@@ -24,6 +24,10 @@
                                         th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
+                        <li>
+                            <label>用户账户：</label>
+                            <input type="text" name="mobile"/>
+                        </li>
                         <li>
                             <label>用户昵称：</label>
                             <input type="text" name="nickname"/>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/ISweetIntegralActivityDrawService.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface ISweetIntegralActivityDrawService extends IService<SweetIntegralActivityDraw> {
 
-    PageInfo<SweetIntegralActivityDraw> drawList(SweetIntegralActivityDrawListSearchParam listParam);
+    PageInfo<SweetActivityDrawListDao> drawList(SweetIntegralActivityDrawListSearchParam listParam);
 
     List<SweetActivityDrawListDao> selectExcelList(String integralActivityId);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -6,7 +6,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityDrawService;
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
+import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityDrawListSearchParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
@@ -46,8 +48,8 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
     private MongoTemplate mongoTemplate;
 
     @Override
-    public PageInfo<SweetIntegralActivityDraw> drawList(SweetIntegralActivityDrawListSearchParam listParam) {
-        PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());
+    public PageInfo<SweetActivityDrawListDao> drawList(SweetIntegralActivityDrawListSearchParam listParam) {
+        /*PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());
         LambdaQueryWrapper<SweetIntegralActivityDraw> queryWrapper = Wrappers.lambdaQuery(SweetIntegralActivityDraw.class)
                 .eq(SweetIntegralActivityDraw::getIntegralActivityId, listParam.getIntegralActivityId());
         if (!listParam.getNickname().isEmpty()) {
@@ -74,8 +76,14 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         }
         List<SweetIntegralActivityDraw> sweetIntegralActivityDraws = sweetIntegralActivityDrawMapper.selectList(
                 queryWrapper
-        );
-        return new PageInfo(sweetIntegralActivityDraws);
+        );*/
+        try {
+            PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());
+            List<SweetActivityDrawListDao> lists = sweetIntegralActivityDrawMapper.searchLists(BeanUtil.convertBeanToMap(listParam));
+            return new PageInfo(lists);
+        } catch (Exception e) {
+            return new PageInfo();
+        }
     }
 
     @Override

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetActivityDrawListDao.java

@@ -82,6 +82,21 @@ public class SweetActivityDrawListDao implements Serializable {
      */
     private String receivingPhone;
 
+    /**
+     * adam收货人地址省份
+     */
+    private String receivingProvince;
+
+    /**
+     * adam收货人地址城市
+     */
+    private String receivingCity;
+
+    /**
+     * adam收货人地址区县
+     */
+    private String receivingCounty;
+
     /**
      * adam收货人完整地址 空格隔离省市区详细地址
      */

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetIntegralActivityDrawMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -18,4 +19,6 @@ import java.util.List;
 public interface SweetIntegralActivityDrawMapper extends BaseMapper<SweetIntegralActivityDraw> {
 
     List<SweetActivityDrawListDao> selectExcelList(@Param("integralActivityId") String integralActivityId);
+
+    List<SweetActivityDrawListDao> searchLists(Map<String, Object> convertBeanToMap);
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityDrawMapper.xml

@@ -9,6 +9,39 @@
         left join sweet_integral_activity_prize as b on b.prize_id = a.prize_id
         left join sweet_integral_activity as c on a.integral_activity_id = c.integral_activity_id
         left join adam_user as u on u.uid = a.user_id
+        <where>
+            <if test="mobile != null  and mobile != ''">
+                and u.mobile = #{mobile}
+            </if>
+            <if test="integralActivityId != null  and integralActivityId != ''">
+                and a.integral_activity_id = #{integralActivityId}
+            </if>
+            <if test="prizeTitle != null  and prizeTitle != ''">
+                and a.prize_title like concat('%', #{prizeTitle}, '%')
+            </if>
+            <if test="nickname != null  and nickname != ''">
+                and a.nickname like concat('%', #{nickname}, '%')
+            </if>
+            <if test="prizeType != null  and prizeType != ''">
+                and a.prize_type = #{prizeType}
+            </if>
+            <if test="receivingStatus != null  and receivingStatus != ''">
+                and a.receiving_status = #{prizeTyreceivingStatuspe}
+            </if>
+            <if test="isWin == 1">
+                and a.prize_type = 1
+            </if>
+            <if test="isWin == 2">
+                and a.prize_type != 1
+            </if>
+        </where>
+        ORDER BY a.mid DESC
+    </select>
+    <select id="searchLists" resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
+        select a.*,
+        u.mobile
+        from sweet_integral_activity_draw as a
+        left join adam_user as u on u.uid = a.user_id
         <where>
             <if test="integralActivityId != null  and integralActivityId != ''">
                 and a.integral_activity_id = #{integralActivityId}