cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化商品直播间同步逻辑，添加直播间的同时添加关联商品操作

Browse Source
This commit is contained in:
xuwenbo
2020-08-12 16:55:03 +08:00
parent f4e9cc2934
commit fff067b1a6
8 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/yx_wechat_live.sql
View File

@ -11,7 +11,7 @@
Target Server Version : 50729
File Encoding : 65001
Date: 11/08/2020 11:22:41
Date: 12/08/2020 16:51:47
*/
SET NAMES utf8mb4;
@ -24,19 +24,20 @@ DROP TABLE IF EXISTS `yx_wechat_live`;
CREATE TABLE `yx_wechat_live` (
`roomid` bigint(11) NOT NULL COMMENT '直播间id',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '直播间标题',
`cover_imge` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '背景图',
`share_imge` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分享图片',
`cover_imge` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '背景图',
`share_imge` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分享图片',
`live_status` int(9) NULL DEFAULT NULL COMMENT '直播间状态',
`start_time` bigint(11) NOT NULL COMMENT '开始时间',
`end_time` bigint(11) NOT NULL COMMENT '预计结束时间',
`anchor_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主播昵称',
`anchor_wechat` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主播微信号',
`start_time` bigint(11) NULL DEFAULT NULL COMMENT '开始时间',
`end_time` bigint(11) NULL DEFAULT NULL COMMENT '预计结束时间',
`anchor_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主播昵称',
`anchor_wechat` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主播微信号',
`anchor_imge` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主播头像',
`type` tinyint(1) NOT NULL COMMENT '直播间类型 1：推流 0：手机直播',
`screen_type` tinyint(1) NOT NULL COMMENT '横屏、竖屏 【1：横屏，0：竖屏】',
`close_like` tinyint(1) NOT NULL COMMENT '是否关闭点赞 【0：开启，1：关闭】',
`close_comment` tinyint(1) NOT NULL COMMENT '是否关闭评论 【0：开启，1：关闭】',
`close_goods` tinyint(1) NOT NULL COMMENT '是否关闭货架 【0：开启，1：关闭】',
`type` tinyint(1) NULL DEFAULT NULL COMMENT '直播间类型 1：推流 0：手机直播',
`screen_type` tinyint(1) NULL DEFAULT NULL COMMENT '横屏、竖屏 【1：横屏，0：竖屏】',
`close_like` tinyint(1) NULL DEFAULT NULL COMMENT '是否关闭点赞 【0：开启，1：关闭】',
`close_comment` tinyint(1) NULL DEFAULT NULL COMMENT '是否关闭评论 【0：开启，1：关闭】',
`close_goods` tinyint(1) NULL DEFAULT NULL COMMENT '是否关闭货架 【0：开启，1：关闭】',
`product_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品id 多个,分割',
PRIMARY KEY (`roomid`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;

1
yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java
View File

@ -119,6 +119,7 @@ public class YxWechatLive implements Serializable {
@NotNull
private Integer closeComment;
private String productId;
public void copy(YxWechatLive source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

12
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java
View File

@ -10,6 +10,8 @@ package co.yixiang.modules.wechat.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -62,9 +64,17 @@ public class YxWechatLiveDto implements Serializable {
/** 横屏、竖屏 【1：横屏，0：竖屏】 */
private Integer screenType;
/** 是否关闭货架 【0：开启，1：关闭】 */
/** 是否关闭点赞 【0：开启，1：关闭】 */
private Integer closeLike;
/** 是否关闭评论 【0：开启，1：关闭】 */
private Integer closeComment;
/** 是否关闭货架 【0：开启，1：关闭】 */
private Integer closeGoods;
/**
* 关联商品id多个，隔开
*/
private String productId;
private List<YxWechatLiveGoodsDto> product;
}

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java
View File

@ -51,7 +51,7 @@ public class YxWechatLiveGoodsDto implements Serializable {
private String thirdPartyTag;
/** 审核单id */
private Long auditid;
private Long auditId;
/** 审核状态 0：未审核，1：审核中，2:审核通过，3审核失败 */
private Integer auditStatus;

5
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java
View File

@ -80,9 +80,6 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl<YxWechatLiveGo
try {
WxMaLiveResult liveInfos = wxMaLiveGoodsService.getGoodsWareHouse(goodsIds);
List<YxWechatLiveGoods> convert = generator.convert(liveInfos.getGoods(), YxWechatLiveGoods.class);
convert.forEach(i ->{
i.setCoverImgeUrl(i.getCoverImgUrl());
});
this.saveOrUpdateBatch(convert);
} catch (WxErrorException e) {
e.printStackTrace();
@ -178,7 +175,7 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl<YxWechatLiveGo
map.put(" price2", yxWechatLiveGoods.getPrice2());
map.put("商品名称", yxWechatLiveGoods.getName());
map.put("1, 2：表示是为api添加商品，否则是直播控制台添加的商品", yxWechatLiveGoods.getThirdPartyTag());
map.put("审核单id", yxWechatLiveGoods.getAuditid());
map.put("审核单id", yxWechatLiveGoods.getAuditId());
map.put("审核状态 0：未审核，1：审核中，2:审核通过，3审核失败", yxWechatLiveGoods.getAuditStatus());
list.add(map);
}

40
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java
View File

@ -15,18 +15,18 @@ import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.wechat.domain.YxWechatLive;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.modules.wechat.domain.YxWechatLiveGoods;
import co.yixiang.modules.wechat.service.WxMaLiveService;
import co.yixiang.modules.wechat.service.dto.WxMaLiveInfo;
import co.yixiang.modules.wechat.service.dto.WxMaLiveResult;
import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService;
import co.yixiang.modules.wechat.service.dto.*;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.utils.DateUtils;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.utils.FileUtil;
import co.yixiang.modules.wechat.service.YxWechatLiveService;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.wechat.service.mapper.YxWechatLiveMapper;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.api.WxConsts;
@ -43,12 +43,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Pageable;
import java.io.File;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.LinkedHashMap;
/**
* @author hupeng
@ -64,10 +61,12 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
@Value("${file.path}")
private String uploadDirStr;
private final WxMaLiveService wxMaLiveService;
private final YxWechatLiveGoodsService wechatLiveGoodsService;
public YxWechatLiveServiceImpl(IGenerator generator, WxMaLiveService wxMaLiveService) {
public YxWechatLiveServiceImpl(IGenerator generator, WxMaLiveService wxMaLiveService, YxWechatLiveGoodsService wechatLiveGoodsService) {
this.generator = generator;
this.wxMaLiveService = wxMaLiveService;
this.wechatLiveGoodsService = wechatLiveGoodsService;
}
/**
@ -80,11 +79,6 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
try {
List<WxMaLiveResult.RoomInfo> liveInfos = wxMaLiveService.getLiveInfos();
List<YxWechatLive> convert = generator.convert(liveInfos, YxWechatLive.class);
convert.forEach(i ->{
i.setAnchorImge(i.getAnchorImg());
i.setCoverImge(i.getCoverImg());
i.setShareImge(i.getShareImg());
});
this.saveOrUpdateBatch(convert);
} catch (WxErrorException e) {
e.printStackTrace();
@ -99,7 +93,14 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
Map<String, Object> map = new LinkedHashMap<>(2);
// List<WxMaLiveResult.RoomInfo> liveInfos = wxMaLiveService.getLiveInfos();
List<YxWechatLiveDto> liveDtos = generator.convert(page.getList(), YxWechatLiveDto.class);
//获取所有商品
liveDtos.forEach(i ->{
if(StringUtils.isNotBlank(i.getProductId())){
List<YxWechatLiveGoodsDto> wechatLiveGoodsDtos = generator.convert(
wechatLiveGoodsService.list(new LambdaQueryWrapper<YxWechatLiveGoods>().in(YxWechatLiveGoods::getGoodsId,i.getProductId().split(",")))
,YxWechatLiveGoodsDto.class);
i.setProduct(wechatLiveGoodsDtos);
}
i.setId(i.getRoomid());
});
map.put("content",liveDtos);
@ -118,6 +119,15 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
WxMaLiveInfo.RoomInfo roomInfo = generator.convert(resources, WxMaLiveInfo.RoomInfo.class);
Integer status = wxMaLiveService.createRoom(roomInfo);
resources.setRoomid(Long.valueOf(status));
if(StringUtils.isNotBlank(resources.getProductId())){
String[] productIds = resources.getProductId().split(",");
List<Integer> pids = new ArrayList<>();
for (String productId : productIds) {
pids.add(Integer.valueOf(productId));
}
//添加商品
wxMaLiveService.addGoodsToRoom(status, pids);
}
this.save(resources);
} catch (WxErrorException e) {
e.printStackTrace();

0
yshop-mall/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java → yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java
View File

0
yshop-mall/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java → yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java
View File