Merge branch 'master' of http://192.168.1.218:3000/lidexi/guosen-ldt

src/main/java/org/springblade/common/constant/SystemConstant.java

@@ -7,6 +7,23 @@ import lombok.Getter;
  **/
 public interface SystemConstant {
 
+
+	/**
+	 * 商场或者商户
+	 */
+	@Getter
+	enum MALLORSHOP{
+
+		MALL(1,"商场"),
+		SHOP(2,"商户");
+
+		int value;
+		String name;
+		MALLORSHOP(int value,String name){
+			this.value = value;
+			this.name = name;
+		}
+	}
 	/**
 	 * 是否
 	 */

src/main/java/org/springblade/modules/ldt/activity/controller/ActivityController.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.modules.ldt.mallshoplabel.entity.MallShopLabel;
+import org.springblade.modules.ldt.mallshoplabel.service.IMallShopLabelService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,6 +50,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class ActivityController extends BladeController {
 
 	private final IActivityService activityService;
+	private final IMallShopLabelService mallShopLabelService;
 
 	/**
 	 * 详情
@@ -61,7 +64,7 @@ public class ActivityController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -72,7 +75,7 @@ public class ActivityController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -83,7 +86,7 @@ public class ActivityController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -93,7 +96,7 @@ public class ActivityController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -103,18 +106,26 @@ public class ActivityController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入activity")
 	public R submit(@Valid @RequestBody Activity activity) {
+		String labelIds = activity.getLabelIds();
+		String[] strings = labelIds.split(",");
+		StringBuffer sb = new StringBuffer();
+		for (String labelId : strings){
+			MallShopLabel mallShopLabel = mallShopLabelService.getById(Long.valueOf(labelId));
+			sb.append(mallShopLabel.getName()+",");
+		}
+		activity.setLabelNames(sb.toString().substring(0,sb.toString().length()-1));
 		return R.status(activityService.saveOrUpdate(activity));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -123,5 +134,5 @@ public class ActivityController extends BladeController {
 		return R.status(activityService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/java/org/springblade/modules/ldt/activity/dto/ActivityDTO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.ldt.activity.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.modules.ldt.activity.entity.Activity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,4 +32,7 @@ import lombok.EqualsAndHashCode;
 public class ActivityDTO extends Activity {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("查询类型 1-自己发起的活动  2-可以参加的活动  3-已参加的活动")
+	private Integer selectType;
+
 }

src/main/java/org/springblade/modules/ldt/activity/service/IActivityService.java

@@ -38,4 +38,5 @@ public interface IActivityService extends BaseService<Activity> {
 	 */
 	IPage<ActivityVO> selectActivityPage(IPage<ActivityVO> page, ActivityVO activity);
 
+	IPage<Activity> getCanJoinActicityByMallId(IPage<ActivityVO> page,Long mallId);
 }

src/main/java/org/springblade/modules/ldt/billrecord/controller/BillRecordController.java

@@ -61,18 +61,19 @@ public class BillRecordController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入billRecord")
 	public R<IPage<BillRecord>> list(BillRecord billRecord, Query query) {
-		IPage<BillRecord> pages = billRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(billRecord));
+		IPage<BillRecord> pages = billRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(billRecord)
+			.lambda().orderByDesc(BillRecord::getCreateTime));
 		return R.data(pages);
 	}
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -83,7 +84,7 @@ public class BillRecordController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -93,7 +94,7 @@ public class BillRecordController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -103,7 +104,7 @@ public class BillRecordController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -112,9 +113,9 @@ public class BillRecordController extends BladeController {
 		return R.status(billRecordService.saveOrUpdate(billRecord));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -123,5 +124,5 @@ public class BillRecordController extends BladeController {
 		return R.status(billRecordService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/java/org/springblade/modules/ldt/billrecord/entity/BillRecord.java

@@ -137,16 +137,7 @@ public class BillRecord extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "支付状态。0：待付款 1：已付款 2：已取消")
 		private Integer payStatus;
-	/**
-	* 是否获得积分
-	*/
-		@ApiModelProperty(value = "是否获得积分")
-		private Integer isPoint;
-	/**
-	* 所获积分
-	*/
-		@ApiModelProperty(value = "所获积分")
-		private Integer pointValue;
+
 	/**
 	 * 订单标题
 	 */

src/main/java/org/springblade/modules/ldt/billrecord/mapper/BillRecordMapper.xml

@@ -30,8 +30,7 @@
         <result column="pay_success_date" property="paySuccessDate"/>
         <result column="payer_info" property="payerInfo"/>
         <result column="pay_status" property="payStatus"/>
-        <result column="is_point" property="isPoint"/>
-        <result column="point_value" property="pointValue"/>
+       
     </resultMap>
 
 

src/main/java/org/springblade/modules/ldt/mall/controller/AppMallController.java

@@ -2,12 +2,22 @@ package org.springblade.modules.ldt.mall.controller;
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.SystemConstant;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.modules.ldt.activity.dto.ActivityDTO;
+import org.springblade.modules.ldt.activity.entity.Activity;
+import org.springblade.modules.ldt.activity.service.IActivityService;
+import org.springblade.modules.ldt.activityjoinrecord.entity.ActivityJoinRecord;
+import org.springblade.modules.ldt.activityjoinrecord.service.IActivityJoinRecordService;
 import org.springblade.modules.ldt.billrecord.entity.BillRecord;
 import org.springblade.modules.ldt.billrecord.service.IBillRecordService;
 import org.springblade.modules.ldt.mall.entity.Mall;
@@ -38,7 +48,7 @@ import java.util.stream.Collectors;
 @RestController
 @AllArgsConstructor
 @RequestMapping("cyzh-ldt/app/mall")
-@Api(value = "", tags = "商场管理app接口")
+@Api(value = "商场app接口", tags = "商场app接口")
 public class AppMallController {
 
 	private final IMallService mallService;
@@ -47,6 +57,8 @@ public class AppMallController {
 	private final IShopService shopService;
 	private final IMemberService memberService;
 	private final IBillRecordService billRecordService;
+	private final IActivityService activityService;
+	private final IActivityJoinRecordService activityJoinRecordService;
 
 	/**
 	 * 通过手机获取商场信息
@@ -195,9 +207,72 @@ public class AppMallController {
 		Assert.notNull(mall.getConsumeOnePoint(),"每消费一元赠送的积分数不能为空");
 		oldEntity.setPoint(mall.getPoint());
 		oldEntity.setPointValue(mall.getPointValue());
+		oldEntity.setConsumeOnePoint(mall.getConsumeOnePoint());
 		oldEntity.setIsOpenMember(SystemConstant.WHETHER.YES.getValue());
 		return R.status(mallService.updateById(oldEntity));
 	}
 
 
+	/**
+	 * 通过商场id获取商场详情
+	 *
+	 * @param mallId
+	 * @return
+	 */
+	@GetMapping("/getById")
+	@ApiOperation(value = "通过商场id获取商场详情", notes = "传入商场id")
+	public R<Mall> getById(@RequestParam Long mallId) {
+		return R.data(this.mallService.getById(mallId));
+	}
+
+	/**
+	 * 通过商场id获取会员列表
+	 */
+	@GetMapping("/getMembersByMallId")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入member")
+	public R<IPage<Member>> getMembersByMallId(Member member, Query query) {
+		Assert.notNull(member.getMallId(),"商场id不能为空");
+		IPage<Member> pages = memberService.page(Condition.getPage(query), new QueryWrapper<>(new Member()).lambda()
+			.eq(Member::getMallId,member.getMallId()).eq(Member::getType,SystemConstant.MALLORSHOP.MALL.getValue())
+			.orderByDesc(Member::getPointValue));
+		return R.data(pages);
+	}
+
+	/**
+	 * 通过商场id获取活动信息
+	 */
+	@GetMapping("/getActivity")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "通过商场id获取活动信息", notes = "传入member")
+	public R<IPage<Activity>> getMembersByMallId(ActivityDTO activityDTO, Query query) {
+		Assert.notNull(activityDTO.getSelectType() == null,"查询类型字段不能为空");
+		Assert.notNull(activityDTO.getMallId(),"商场id不能为空");
+		IPage<Activity> pages = null;
+		if(activityDTO.getSelectType() == 1){//查询该商场发起的活动
+			pages = activityService.page(Condition.getPage(query), new QueryWrapper<>(new Activity()).lambda()
+				.eq(Activity::getSponsorType,SystemConstant.MALLORSHOP.MALL.getValue()).eq(Activity::getSponsorId,activityDTO.getMallId())
+				.orderByDesc(Activity::getCreateTime));
+		}else if(activityDTO.getSelectType() == 2){//可以参加的活动
+			//获取该商场下所有商户发布的活动
+			pages = this.activityService.getCanJoinActicityByMallId(Condition.getPage(query),activityDTO.getMallId());
+
+		}else if(activityDTO.getSelectType() == 3){//已参加的活动
+			//从活动参加记录表中获取
+			List<ActivityJoinRecord> activityJoinRecords = activityJoinRecordService.getBaseMapper().selectList(new QueryWrapper<>(new ActivityJoinRecord()).lambda()
+				.eq(ActivityJoinRecord::getJoinId, activityDTO.getSponsorId()).eq(ActivityJoinRecord::getJoinType, SystemConstant.MALLORSHOP.MALL.getValue()));
+			pages = new Page<>();
+			pages.setCurrent(query.getCurrent());
+			pages.setSize(query.getSize());
+			pages.setTotal(activityJoinRecords.size());
+			List<Long> activityIds = activityJoinRecords.stream().map(ActivityJoinRecord::getActivityId).collect(Collectors.toList());
+			activityIds = activityIds.subList((query.getCurrent()-1) * 10, query.getCurrent() * query.getSize());
+			List<Activity> activities = this.activityService.getBaseMapper().selectList(new QueryWrapper<>(new Activity())
+				.lambda().in(Activity::getId,activityIds));
+			pages.setRecords(activities);
+		}
+
+		return R.data(pages);
+	}
+
 }

src/main/java/org/springblade/modules/ldt/mall/entity/Mall.java

@@ -129,5 +129,19 @@ public class Mall extends BaseEntity {
 	@ApiModelProperty(value = "是否已开启会员中心")
 	private Integer isOpenMember;
 
+	/**
+	 * 会员总数
+	 */
+	@ApiModelProperty(value = "会员总数")
+	private Integer memberCount;
+
+	/**
+	 * 积分总价值
+	 */
+	@ApiModelProperty(value = "积分总价值")
+	private Integer totalPointValue;
+
+
+
 
 }

src/main/java/org/springblade/modules/ldt/mallarea/mapper/MallAreaMapper.xml

@@ -14,6 +14,8 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="name" property="name"/>
         <result column="mall_id" property="mallId"/>
+        <result column="member_count" property="memberCount"/>
+        <result column="total_point_value" property="totalPointValue"/>
     </resultMap>
 
 

src/main/java/org/springblade/modules/ldt/member/entity/Member.java

@@ -65,4 +65,11 @@ public class Member extends BaseEntity {
 		private BigDecimal pointValue;
 
 
+	/**
+	 * 会员类型：1-商场会员 2-商店会员
+	 */
+	@ApiModelProperty(value = "会员类型：1-商场会员 2-商店会员")
+	private Integer type;
+
+
 }

src/main/java/org/springblade/modules/ldt/member/mapper/MemberMapper.xml

@@ -17,6 +17,7 @@
         <result column="shop_id" property="shopId"/>
         <result column="point_total" property="pointTotal"/>
         <result column="point_value" property="pointValue"/>
+        <result column="type" property="type"/>
     </resultMap>
 
     <resultMap id="memberVOResultMap" type="org.springblade.modules.ldt.member.vo.MemberVO" extends="memberResultMap">
@@ -30,7 +31,7 @@
 
     <select id="selectMemberPage" resultMap="memberVOResultMap">
         select
-            lm.user_id,lm.mall_id,lm.shop_id,lm.point_total,lm.point_value,
+            lm.user_id,lm.mall_id,lm.shop_id,lm.point_total,lm.point_value,lm.type,
             llu.nick_name,llu.avatar,llu.phone,llu.gender
         from
             ldt_member lm,ldt_login_user llu
@@ -46,6 +47,9 @@
                 <if test="member.shopId != null">
                     AND lm.shop_id like "%${member.shopId}%"
                 </if>
+                <if test="member.type != null">
+                    AND lm.type = ${member.type}
+                </if>
             </if>
 
     </select>

src/main/java/org/springblade/modules/ldt/pointdetail/entity/PointDetail.java

@@ -74,5 +74,17 @@ public class PointDetail extends BaseEntity {
 		@ApiModelProperty(value = "积分价值")
 		private BigDecimal pointValue;
 
+	/**
+	 * 支付金额
+	 */
+	@ApiModelProperty(value = "支付金额")
+	private BigDecimal price;
+
+	/**
+	 * 关联的支付id
+	 */
+	@ApiModelProperty(value = "关联的支付记录id")
+	private Long billRecordId;
+
 
 }

src/main/java/org/springblade/modules/ldt/shop/entity/Shop.java

@@ -217,5 +217,11 @@ public class Shop extends BaseEntity {
 
 
 
+	/**
+	 * 积分总价值
+	 */
+	@ApiModelProperty(value = "积分总价值")
+	private Integer totalPointValue;
+
 
 }

src/main/java/org/springblade/modules/ldt/shop/mapper/ShopMapper.xml

@@ -41,6 +41,8 @@
         <result column="shop_pic" property="shopPic"/>
         <result column="audit_status" property="auditStatus"/>
         <result column="audit_advice" property="auditAdvice"/>
+        <result column="member_count" property="memberCount"/>
+        <result column="total_point_value" property="totalPointValue"/>
     </resultMap>