silent 4 лет назад
Родитель
Сommit
5a95041390

+ 11 - 0
src/main/java/org/springblade/gateway/goods_gateway/service/impl/AppHelpGoodsServiceImpl.java

@@ -16,7 +16,10 @@ import org.springblade.payment.cmcc.exception.CmccRequestException;
 import org.springblade.payment.cmcc.request.CmccDectOrderRequest;
 import org.springblade.payment.cmcc.request.CmccPlaceOrderRequest;
 import org.springblade.payment.cmcc.util.CmccUtil;
+import org.springblade.sing.goods.entity.GoodsRecord;
 import org.springblade.sing.goods.entity.HelpGoods;
+import org.springblade.sing.goods.enums.GoodsRecordType;
+import org.springblade.sing.goods.service.IGoodsRecordService;
 import org.springblade.sing.goods.service.IHelpGoodsService;
 import org.springblade.sing.point.entity.CmccPointRecord;
 import org.springblade.sing.point.entity.PointRecord;
@@ -48,6 +51,8 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 	private IHelpGoodsService helpGoodsService;
 	@Autowired
 	private ICmccPointRecordService cmccPointRecordService;
+	@Autowired
+	private IGoodsRecordService goodsRecordService;
 
 	/**
 	 * 移动积分兑换道具
@@ -106,6 +111,12 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 		//修改用户信息
 		Assert.isTrue(loginUserService.updateById(loginUser),"兑换失败");
 
+		//添加道具兑换记录
+		GoodsRecord goodsRecord = new GoodsRecord();
+		goodsRecord.setHelpGoodsId(helpGoods.getId());
+		goodsRecord.setType(GoodsRecordType.HELP_GOODS_EXCHANGE);
+		Assert.isTrue(goodsRecordService.save(goodsRecord),"兑换失败");
+
 		//TODO 对接移动积分接口
 		if(ObjectUtils.isNotEmpty(helpGoods.getPoint()) && helpGoods.getPoint().longValue()>0L){
 			Assert.notNull(cmccDectOrderRequest.getOutOrderId(),"订单号不能为空");

+ 2 - 0
src/main/java/org/springblade/gateway/point_gateway/service/impl/PointExchangeServiceImpl.java

@@ -6,6 +6,7 @@ import org.springblade.gateway.point_gateway.excetion.PointException;
 import org.springblade.gateway.point_gateway.service.PointExchangeService;
 import org.springblade.sing.goods.entity.GoodsRecord;
 import org.springblade.sing.goods.entity.PointGoods;
+import org.springblade.sing.goods.enums.GoodsRecordType;
 import org.springblade.sing.goods.service.IGoodsRecordService;
 import org.springblade.sing.goods.service.IPointGoodsService;
 import org.springblade.sing.point.entity.PointRecord;
@@ -56,6 +57,7 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 		goodsRecord.setUserId(uid);
 		goodsRecord.setPointGoodsId(goodsId);
 		goodsRecord.setAddressId(addressId);
+		goodsRecord.setType(GoodsRecordType.POINT_GOODS_EXCHANGE);
 
 		Assert.isTrue(goodsRecordService.save(goodsRecord),"兑换失败");
 

+ 11 - 0
src/main/java/org/springblade/sing/goods/entity/GoodsRecord.java

@@ -22,6 +22,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.sing.goods.enums.GoodsRecordType;
 
 /**
  * 商品记录实体类
@@ -53,5 +54,15 @@ public class GoodsRecord extends BaseEntity {
 	@ApiModelProperty(value = "收获地址ID")
 	private Long addressId;
 
+	/**
+	 * 助力道具ID
+	 */
+	@ApiModelProperty(value = "助力道具ID")
+	private Long helpGoodsId;
 
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private GoodsRecordType type;
 }

+ 23 - 0
src/main/java/org/springblade/sing/goods/enums/GoodsRecordType.java

@@ -0,0 +1,23 @@
+package org.springblade.sing.goods.enums;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author: Silent
+ * @Description
+ * @Date: Created in 18:55 2021/11/17
+ * @Modified By:
+ */
+@Getter
+@AllArgsConstructor
+@ApiModel("商品记录类型")
+public enum GoodsRecordType {
+	POINT_GOODS_EXCHANGE("积分商品兑换"),
+	HELP_GOODS_EXCHANGE("助力道具兑换");
+
+	@ApiModelProperty("描述")
+	private String describe;
+}