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

src/main/java/org/springblade/modules/ldt/activity/controller/ActivityController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.ldt.activity.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,7 +27,10 @@ import javax.validation.Valid;
 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.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.ldt.activityjoinrecord.entity.ActivityJoinRecord;
+import org.springblade.modules.ldt.activityjoinrecord.service.IActivityJoinRecordService;
 import org.springblade.modules.ldt.mallshoplabel.entity.MallShopLabel;
 import org.springblade.modules.ldt.mallshoplabel.service.IMallShopLabelService;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +41,9 @@ import org.springblade.modules.ldt.activity.vo.ActivityVO;
 import org.springblade.modules.ldt.activity.service.IActivityService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  *  控制器
  *
@@ -51,6 +58,7 @@ public class ActivityController extends BladeController {
 
 	private final IActivityService activityService;
 	private final IMallShopLabelService mallShopLabelService;
+	private final IActivityJoinRecordService activityJoinRecordService;
 
 	/**
 	 * 详情
@@ -58,9 +66,13 @@ public class ActivityController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入activity")
-	public R<Activity> detail(Activity activity) {
+	public R<ActivityVO> detail(Activity activity) {
 		Activity detail = activityService.getOne(Condition.getQueryWrapper(activity));
-		return R.data(detail);
+		List<ActivityJoinRecord> activityJoinRecords = activityJoinRecordService.getBaseMapper().selectList(new QueryWrapper<>(new ActivityJoinRecord()).lambda()
+			.eq(ActivityJoinRecord::getActivityId, activity.getId()));
+		ActivityVO activityVO = Objects.requireNonNull(BeanUtil.copy(detail, ActivityVO.class));
+		activityVO.setActivityJoinRecords(activityJoinRecords);
+		return R.data(activityVO);
 	}
 
 	/**

src/main/java/org/springblade/modules/ldt/activity/vo/ActivityVO.java

@@ -20,6 +20,10 @@ import org.springblade.modules.ldt.activity.entity.Activity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
+import org.springblade.modules.ldt.activityjoinrecord.entity.ActivityJoinRecord;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 视图实体类
@@ -33,4 +37,6 @@ import io.swagger.annotations.ApiModel;
 public class ActivityVO extends Activity {
 	private static final long serialVersionUID = 1L;
 
+	private List<ActivityJoinRecord> activityJoinRecords = new ArrayList<>();
+
 }

src/main/java/org/springblade/modules/ldt/activityjoinrecord/controller/ActivityJoinRecordController.java

@@ -24,12 +24,17 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+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.core.tool.utils.Func;
 import org.springblade.modules.ldt.activity.entity.Activity;
 import org.springblade.modules.ldt.activity.service.IActivityService;
+import org.springblade.modules.ldt.mall.entity.Mall;
+import org.springblade.modules.ldt.mall.service.IMallService;
+import org.springblade.modules.ldt.shop.entity.Shop;
+import org.springblade.modules.ldt.shop.service.IShopService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,6 +43,8 @@ import org.springblade.modules.ldt.activityjoinrecord.vo.ActivityJoinRecordVO;
 import org.springblade.modules.ldt.activityjoinrecord.service.IActivityJoinRecordService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.math.BigDecimal;
+
 /**
  *  控制器
  *
@@ -52,6 +59,8 @@ public class ActivityJoinRecordController extends BladeController {
 
 	private final IActivityJoinRecordService activityJoinRecordService;
 	private final IActivityService activityService;
+	private final IMallService mallService;
+	private final IShopService shopService;
 
 	/**
 	 * 详情
@@ -120,6 +129,32 @@ public class ActivityJoinRecordController extends BladeController {
 		Activity activity = activityService.getById(activityJoinRecord.getActivityId());
 		Assert.notNull(activity,"活动不存在");
 
+		//设置活动初始折扣
+		activityJoinRecord.setInitSupplyPrice(activity.getSupplyPrice());
+		//设置参与者追加的折扣
+		activityJoinRecord.setAppendSupplyPrice(activityJoinRecord.getAppendSupplyPrice() != null ?
+				activityJoinRecord.getAppendSupplyPrice():
+				BigDecimal.valueOf(100));
+		//设置最终折扣
+		activityJoinRecord.setFinalSupplyPrice(
+			activityJoinRecord.getInitSupplyPrice().multiply(activityJoinRecord.getAppendSupplyPrice()).divide(BigDecimal.valueOf(100))
+		);
+		//设置参与者的logo图
+		if(activityJoinRecord.getJoinType() == SystemConstant.MALLORSHOP.MALL.getValue()){//商场
+			Mall mall = mallService.getById(activityJoinRecord.getJoinId());
+			Assert.notNull(mall,"商场不存在");
+			activityJoinRecord.setJoinPic(mall.getPic());
+			activityJoinRecord.setJoinName(mall.getName());
+		}else if(activityJoinRecord.getJoinType() == SystemConstant.MALLORSHOP.SHOP.getValue()){
+			Shop shop = shopService.getById(activityJoinRecord.getJoinId());
+			Assert.notNull(shop,"商店不存在");
+			activityJoinRecord.setJoinPic(shop.getCover());
+			activityJoinRecord.setJoinName(shop.getName());
+		}else{
+			Assert.isTrue(false,"joinType错误");
+		}
+
+
 		return R.status(activityJoinRecordService.saveOrUpdate(activityJoinRecord));
 	}
 

src/main/java/org/springblade/modules/ldt/activityjoinrecord/entity/ActivityJoinRecord.java

@@ -23,6 +23,8 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 /**
  * 实体类
  *
@@ -53,5 +55,34 @@ public class ActivityJoinRecord extends BaseEntity {
 		@ApiModelProperty(value = "参与者id")
 		private Long joinId;
 
+	/**
+	 * 参与者logo
+	 */
+	@ApiModelProperty(value = "参与者logo")
+	private String joinPic;
+	/**
+	 * 参与者名称
+	 */
+	@ApiModelProperty(value = "参与者名称")
+	private String joinName;
+
+	/**
+	 * 初始供应价（活动id的供应价,百分比）
+	 */
+	@ApiModelProperty(value = "初始供应价（活动id的供应价,百分比）")
+	private BigDecimal initSupplyPrice;
+
+	/**
+	 * 追加的折扣，折上折（百分比）
+	 */
+	@ApiModelProperty(value = "追加的折扣，折上折（百分比）")
+	private BigDecimal appendSupplyPrice;
+
+	/**
+	 * 最终的折扣（百分比）
+	 */
+	@ApiModelProperty(value = "最终的折扣（百分比）")
+	private BigDecimal finalSupplyPrice;
+
 
 }

src/main/java/org/springblade/modules/ldt/activityjoinrecord/mapper/ActivityJoinRecordMapper.xml

@@ -15,6 +15,11 @@
         <result column="activity_id" property="activityId"/>
         <result column="join_type" property="joinType"/>
         <result column="join_id" property="joinId"/>
+        <result column="init_supply_price" property="initSupplyPrice"/>
+        <result column="append_supply_price" property="appendSupplyPrice"/>
+        <result column="final_supply_price" property="finalSupplyPrice"/>
+        <result column="join_pic" property="joinPic"/>
+        <result column="join_name" property="joinName"/>
     </resultMap>
 
 

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

@@ -141,6 +141,12 @@ public class Mall extends BaseEntity {
 	@ApiModelProperty(value = "积分总价值")
 	private Integer totalPointValue;
 
+	/**
+	 * 图片
+	 */
+	@ApiModelProperty(value = "图片")
+	private String pic;
+
 
 
 

src/main/java/org/springblade/modules/ldt/mall/mapper/MallMapper.xml

@@ -25,6 +25,7 @@
         <result column="person_tel" property="personTel"/>
         <result column="person_name" property="personName"/>
         <result column="boundary_path" property="boundaryPath"/>
+        <result column="pic" property="pic"/>
     </resultMap>
 
 

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

@@ -235,4 +235,10 @@ public class Shop extends BaseEntity {
 	@ApiModelProperty(value = "可提现总金额")
 	private String withdrawTotalPrice;
 
+	/**
+	 * 提现密码
+	 */
+	@ApiModelProperty(value = "提现密码")
+	private String withdrawPassword;
+
 }