添加后台搜索

src/main/java/org/springblade/sing/goods/mapper/GoodsOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.sing.goods.mapper.GoodsOrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="goodsOrderResultMap" type="org.springblade.sing.goods.entity.GoodsOrder">
+    <resultMap id="goodsOrderResultMap" type="org.springblade.sing.goods.vo.GoodsOrderVO">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
@@ -30,11 +30,30 @@
         <result column="phone" property="phone"/>
         <result column="goods_img_url" property="goodsImgUrl"/>
         <result column="goods_name" property="goodsName"/>
+        <result column="userName" property="userName"/>
+        <result column="pointGoodsName" property="pointGoodsName"/>
+        <result column="addressName" property="addressName"/>
     </resultMap>
 
 
     <select id="selectGoodsOrderPage" resultMap="goodsOrderResultMap">
-        select * from sing_goods_order where is_deleted = 0
+        select u.id,u.nick_name userName,pg.name pointGoodsName,sgo.goods_status,sgo.num,sgo.type,sgo.tracking_number,sgo.tracking_name,sgo.shipper_code,sgo.use_point,sgo.cash,sgo.address
+        ,sgo.consignee,sgo.phone,sgo.goods_point,sgo.goods_img_url,sgo.goods_name
+        from sing_goods_order sgo
+        left join sing_login_user u on sgo.user_id = u.id
+        left join sing_point_goods pg on sgo.point_goods_id = pg.id
+        where sgo.is_deleted = 0
+        <if test="goodsOrder.userName != null">
+            and u.nick_name like concat('%',#{goodsOrder.userName},'%')
+        </if>
+        <if test="goodsOrder.pointGoodsName != null">
+            and pg.name like concat('%',#{goodsOrder.pointGoodsName},'%')
+        </if>
+        <if test="goodsOrder.phone != null">
+            and sgo.phone = #{goodsOrder.phone}
+        </if>
+        order by sgo.create_time DESC
+
     </select>
 
 </mapper>

src/main/java/org/springblade/sing/goods/mapper/GoodsRecordMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.sing.goods.mapper.GoodsRecordMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="goodsRecordResultMap" type="org.springblade.sing.goods.entity.GoodsRecord">
+    <resultMap id="goodsRecordResultMap" type="org.springblade.sing.goods.vo.GoodsRecordVO">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
@@ -20,11 +20,23 @@
         <result column="goods_status" property="goodsStatus"/>
         <result column="tracking_number" property="trackingNumber"/>
         <result column="tracking_name" property="trackingName"/>
+        <result column="userName" property="userName"/>
+        <result column="helpGoodsName" property="helpGoodsName"/>
     </resultMap>
 
 
     <select id="selectGoodsRecordPage" resultMap="goodsRecordResultMap">
-        select * from sing_goods_record where is_deleted = 0
+        select gr.*,u.nick_name userName,hg.name helpGoodsName from sing_goods_record gr
+        left join sing_login_user u on gr.user_id = u.id
+        left join sing_help_goods hg on gr.help_goods_id = hg.id
+        where gr.is_deleted = 0
+        <if test="goodsRecord.userName != null">
+            and u.nick_name like concat('%',#{goodsRecord.userName},'%')
+        </if>
+        <if test="goodsRecord.helpGoodsName != null">
+            and hg.name like concat('%',#{goodsRecord.helpGoodsName},'%')
+        </if>
+        order by gr.create_time DESC
     </select>
 
 

src/main/java/org/springblade/sing/goods/service/impl/GoodsOrderServiceImpl.java

@@ -35,6 +35,7 @@ public class GoodsOrderServiceImpl extends BaseServiceImpl<GoodsOrderMapper, Goo
 
 	@Override
 	public IPage<GoodsOrderVO> selectGoodsOrderPage(IPage<GoodsOrderVO> page, GoodsOrderVO goodsOrder) {
+
 		return page.setRecords(baseMapper.selectGoodsOrderPage(page, goodsOrder));
 	}
 

src/main/java/org/springblade/sing/goods/vo/GoodsOrderVO.java

@@ -33,4 +33,10 @@ import io.swagger.annotations.ApiModel;
 public class GoodsOrderVO extends GoodsOrder {
 	private static final long serialVersionUID = 1L;
 
+	private String userName;
+
+	private String addressName;
+
+	private String pointGoodsName;
+
 }

src/main/java/org/springblade/sing/point/controller/CmccPointRecordController.java

@@ -114,7 +114,7 @@ public class CmccPointRecordController extends BladeController {
 		return R.status(cmccPointRecordService.saveOrUpdate(cmccPointRecord));
 	}
 
-	
+
 	/**
 	 * 删除 移动积分兑换道具记录表
 	 */
@@ -125,5 +125,5 @@ public class CmccPointRecordController extends BladeController {
 		return R.status(cmccPointRecordService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/java/org/springblade/sing/point/controller/PointRecordController.java

@@ -27,6 +27,8 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.sing.active.service.IActiveProductRecordService;
+import org.springblade.sing.goods.service.IHelpGoodsService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +51,8 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class PointRecordController extends BladeController {
 
 	private final IPointRecordService pointRecordService;
+	private final IActiveProductRecordService activeProductRecordService;
+	private final IHelpGoodsService helpGoodsService;
 
 	/**
 	 * 详情
@@ -58,7 +62,7 @@ public class PointRecordController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入pointRecord")
 	public R<PointRecordVO> detail(PointRecord pointRecord) {
 		PointRecord detail = pointRecordService.getOne(Condition.getQueryWrapper(pointRecord));
-		return R.data(PointRecordWrapper.build().entityVO(detail));
+		return R.data(PointRecordWrapper.build(activeProductRecordService,helpGoodsService).entityVO(detail));
 	}
 
 	/**

src/main/java/org/springblade/sing/point/mapper/CmccPointRecordMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.sing.point.mapper.CmccPointRecordMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="cmccPointRecordResultMap" type="org.springblade.sing.point.entity.CmccPointRecord">
+    <resultMap id="cmccPointRecordResultMap" type="org.springblade.sing.point.vo.CmccPointRecordVO">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
@@ -12,17 +12,39 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="pay_status" property="payStatus"/>
         <result column="user_id" property="userId"/>
         <result column="out_order_id" property="outOrderId"/>
         <result column="num" property="num"/>
         <result column="phone" property="phone"/>
         <result column="help_goods_id" property="helpGoodsId"/>
         <result column="point" property="point"/>
+        <result column="helpGoodsName" property="helpGoodsName"/>
+        <result column="userName" property="userName"/>
     </resultMap>
 
 
     <select id="selectCmccPointRecordPage" resultMap="cmccPointRecordResultMap">
-        select * from sing_cmcc_point_record where is_deleted = 0
+        select pr.*,hg.name helpGoodsName,u.nick_name userName from sing_cmcc_point_record pr
+        left join sing_help_goods hg on pr.help_goods_id = hg.id
+        left join sing_login_user u on pr.user_id = u.id
+        where pr.is_deleted = 0
+        <if test="cmccPointRecord.helpGoodsName != null">
+            and hg.name like concat('%',#{cmccPointRecord.helpGoodsName},'%')
+        </if>
+        <if test="cmccPointRecord.payStatus != null">
+            and pr.pay_status = #{cmccPointRecord.payStatus}
+        </if>
+        <if test="cmccPointRecord.point != null">
+            and pr.point = #{cmccPointRecord.point}
+        </if>
+        <if test="cmccPointRecord.phone != null">
+            and pr.phone = #{cmccPointRecord.phone}
+        </if>
+        <if test="cmccPointRecord.userName != null">
+            and u.nick_name like concat('%',#{cmccPointRecord.userName},'%')
+        </if>
+        order by pr.create_time DESC
     </select>
 
 </mapper>

src/main/java/org/springblade/sing/point/mapper/PointRecordMapper.xml

@@ -25,7 +25,7 @@
 
 
     <select id="selectPointRecordPage" resultMap="pointRecordResultMap">
-        select pr.point_type,pr.point,u.nick_name userName,apr.title activeProductName,hg.name helpGoodsName,pg.name pointGoodsName,pr.create_time
+        select pr.id,pr.point_type,pr.point,pr.help_goods_id,u.nick_name userName,apr.title activeProductName,hg.name helpGoodsName,pg.name pointGoodsName,pr.create_time
         from sing_point_record pr
         left join sing_login_user u on u.id = pr.user_id
         left join sing_active_product_record apr on apr.id = pr.active_product_id

src/main/java/org/springblade/sing/point/vo/CmccPointRecordVO.java

@@ -33,4 +33,8 @@ import io.swagger.annotations.ApiModel;
 public class CmccPointRecordVO extends CmccPointRecord {
 	private static final long serialVersionUID = 1L;
 
+	private String helpGoodsName;
+
+	private String userName;
+
 }

src/main/java/org/springblade/sing/point/wrapper/CmccPointRecordWrapper.java

@@ -16,10 +16,17 @@
  */
 package org.springblade.sing.point.wrapper;
 
+import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.sing.goods.entity.HelpGoods;
+import org.springblade.sing.goods.service.IHelpGoodsService;
 import org.springblade.sing.point.entity.CmccPointRecord;
 import org.springblade.sing.point.vo.CmccPointRecordVO;
+import org.springblade.sing.user.entity.LoginUser;
+import org.springblade.sing.user.service.ILoginUserService;
+
 import java.util.Objects;
 
 /**
@@ -30,6 +37,9 @@ import java.util.Objects;
  */
 public class CmccPointRecordWrapper extends BaseEntityWrapper<CmccPointRecord, CmccPointRecordVO>  {
 
+	private static final IHelpGoodsService helpGoodsService = SpringContextHolder.getBean(IHelpGoodsService.class);
+	private static final ILoginUserService loginUserService = SpringContextHolder.getBean(ILoginUserService.class);
+
 	public static CmccPointRecordWrapper build() {
 		return new CmccPointRecordWrapper();
  	}
@@ -38,6 +48,15 @@ public class CmccPointRecordWrapper extends BaseEntityWrapper<CmccPointRecord, C
 	public CmccPointRecordVO entityVO(CmccPointRecord cmccPointRecord) {
 		CmccPointRecordVO cmccPointRecordVO = Objects.requireNonNull(BeanUtil.copy(cmccPointRecord, CmccPointRecordVO.class));
 
+		HelpGoods helpGoods = helpGoodsService.getById(cmccPointRecordVO.getHelpGoodsId());
+		if (ObjectUtil.isNotEmpty(helpGoods)){
+			cmccPointRecordVO.setHelpGoodsName(helpGoods.getName());
+		}
+
+		LoginUser loginUser = loginUserService.getById(cmccPointRecordVO.getUserId());
+		if (ObjectUtil.isNotEmpty(loginUser)){
+			cmccPointRecordVO.setUserName(loginUser.getNickName());
+		}
 		//User createUser = UserCache.getUser(cmccPointRecord.getCreateUser());
 		//User updateUser = UserCache.getUser(cmccPointRecord.getUpdateUser());
 		//cmccPointRecordVO.setCreateUserName(createUser.getName());

src/main/java/org/springblade/sing/point/wrapper/PointRecordWrapper.java

@@ -16,10 +16,21 @@
  */
 package org.springblade.sing.point.wrapper;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.sing.active.entity.ActiveProductRecord;
+import org.springblade.sing.active.service.IActiveProductRecordService;
+import org.springblade.sing.goods.entity.HelpGoods;
+import org.springblade.sing.goods.service.IHelpGoodsService;
 import org.springblade.sing.point.entity.PointRecord;
 import org.springblade.sing.point.vo.PointRecordVO;
+import org.springblade.sing.user.entity.LoginUser;
+import org.springblade.sing.user.service.ILoginUserService;
+
 import java.util.Objects;
 
 /**
@@ -30,19 +41,52 @@ import java.util.Objects;
  */
 public class PointRecordWrapper extends BaseEntityWrapper<PointRecord, PointRecordVO>  {
 
+	private IActiveProductRecordService activeProductRecordService;
+	private IHelpGoodsService helpGoodsService;
+	private final static ILoginUserService loginUserService = SpringContextHolder.getBean(ILoginUserService.class);
+
+	public PointRecordWrapper(IActiveProductRecordService activeProductRecordService, IHelpGoodsService helpGoodsService) {
+		this.activeProductRecordService = activeProductRecordService;
+		this.helpGoodsService = helpGoodsService;
+	}
+
+	public PointRecordWrapper() {
+
+	}
+
 	public static PointRecordWrapper build() {
 		return new PointRecordWrapper();
  	}
 
+	public static PointRecordWrapper build(IActiveProductRecordService activeProductRecordService, IHelpGoodsService helpGoodsService) {
+		return new PointRecordWrapper(activeProductRecordService,helpGoodsService);
+	}
+
 	@Override
 	public PointRecordVO entityVO(PointRecord pointRecord) {
 		PointRecordVO pointRecordVO = Objects.requireNonNull(BeanUtil.copy(pointRecord, PointRecordVO.class));
 
+		if (activeProductRecordService != null && helpGoodsService != null){
+			ActiveProductRecord activeProductRecord = activeProductRecordService.getById(pointRecordVO.getActiveProductId());
+			if (ObjectUtil.isNotEmpty(activeProductRecord)){
+				pointRecordVO.setActiveProductName(activeProductRecord.getTitle());
+			}
+
+			HelpGoods helpGoods = helpGoodsService.getById(pointRecordVO.getHelpGoodsId());
+			if (ObjectUtil.isNotEmpty(helpGoods)){
+				pointRecordVO.setHelpGoodsName(helpGoods.getName());
+			}
+		}
 		//User createUser = UserCache.getUser(pointRecord.getCreateUser());
 		//User updateUser = UserCache.getUser(pointRecord.getUpdateUser());
 		//pointRecordVO.setCreateUserName(createUser.getName());
 		//pointRecordVO.setUpdateUserName(updateUser.getName());
 
+		LoginUser loginUser = loginUserService.getById(pointRecordVO.getUserId());
+		if(ObjectUtils.isNotEmpty(loginUser)){
+			pointRecordVO.setUserName(loginUser.getNickName());
+		}
+
 		return pointRecordVO;
 	}
 

src/main/java/org/springblade/sing/user/controller/LoginUserController.java

@@ -19,6 +19,7 @@ package org.springblade.sing.user.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -74,7 +75,9 @@ public class LoginUserController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入loginUser")
 	public R<IPage<LoginUserVO>> list(LoginUser loginUser, Query query) {
-		IPage<LoginUser> pages = loginUserService.page(Condition.getPage(query), Condition.getQueryWrapper(loginUser));
+		LambdaQueryWrapper<LoginUser> wrapper = new LambdaQueryWrapper<>();
+		wrapper.like(loginUser.getNickName() != null,LoginUser::getNickName,loginUser.getNickName());
+		IPage<LoginUser> pages = loginUserService.page(Condition.getPage(query), wrapper);
 		return R.data(LoginUserWrapper.build().pageVO(pages));
 	}