Skip to content

G
gxpt_ht
Commit 82880f41 by 吕明尚
Options

修改字段名称

parent 251202cd
Showing with 31 additions and 33 deletions
share-quartz/src/main/java/share/quartz/task/RedisTask.java
......@@ -119,7 +119,7 @@ public class RedisTask {
expiredCoupons.add(coupon.getId());
}
logger.info("券码:{}->查询结束:{}", coupon.getCouponCode(), getconsumed);
} else if (StringUtils.isNoneEmpty(coupon.getSkuId()) && coupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
} else if (StringUtils.isNoneEmpty(coupon.getTiktokSkuId()) && coupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
//抖音复验券
JSONObject object = tiktokService.certificateGet(coupon.getCouponCode());
JSONObject certificate = object.getJSONObject("certificate");
......
share-system/src/main/java/share/system/domain/SConsumerCoupon.java
......@@ -53,7 +53,7 @@ public class SConsumerCoupon extends BaseEntity
private Long dealgroupId;
@Excel(name = "抖音商品id")
private String skuId;
private String tiktokSkuId;
/**
* 适用门店id
......
share-system/src/main/java/share/system/domain/SCoupon.java
......@@ -103,7 +103,7 @@ public class SCoupon extends BaseEntity
* 抖音商品id
*/
@Excel(name = "抖音商品id")
private String skuId;
private String tiktokSkuId;
/**
* 适用门店id
......
share-system/src/main/java/share/system/domain/SStore.java
......@@ -3,10 +3,7 @@ package share.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import share.common.annotation.Excel;
import share.common.core.domain.BaseEntity;
import share.system.domain.vo.SRoomVo;
......@@ -87,7 +84,7 @@ public class SStore extends BaseEntity
private String openShopUuid;
@Excel(name = "抖音店铺id")
private String poiId;
private String tiktokPoiId;
@TableField(exist = false)
private List<SRoomVo> roolList;
......
share-system/src/main/java/share/system/service/impl/SCouponServiceImpl.java
......@@ -115,7 +115,7 @@ public class SCouponServiceImpl extends ServiceImpl<SCouponMapper, SCoupon> impl
sCouponList = sCouponMapper.selectByDealgroupId(sCoupon.getDealgroupId());
} else if (sCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
LambdaQueryWrapper<SCoupon> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SCoupon::getSkuId, sCoupon.getSkuId());
wrapper.eq(SCoupon::getTiktokSkuId, sCoupon.getTiktokSkuId());
sCouponList = sCouponMapper.selectOne(wrapper);
}
if (ObjectUtils.isEmpty(sCouponList)) {
......@@ -286,7 +286,7 @@ public class SCouponServiceImpl extends ServiceImpl<SCouponMapper, SCoupon> impl
public List<SCoupon> querySkuPoiList() {
List<SStore> sStores = storeService.list();
//过滤掉没有poiId的门店
sStores = sStores.stream().filter(store -> StringUtils.isNotBlank(store.getPoiId())).collect(Collectors.toList());
sStores = sStores.stream().filter(store -> StringUtils.isNotBlank(store.getTiktokPoiId())).collect(Collectors.toList());
List<SCoupon> sCouponList = new ArrayList<>();
OnlineQueryDto onlineQueryDto = new OnlineQueryDto();
onlineQueryDto.setAccountId(ACCOUNT_Id);
......@@ -300,7 +300,7 @@ public class SCouponServiceImpl extends ServiceImpl<SCouponMapper, SCoupon> impl
JSONObject product = jsonObject.getJSONObject("product");
JSONArray pois = product.getJSONArray("pois");
SCoupon sCoupon = new SCoupon();
sCoupon.setSkuId(sku.getStr("sku_id"));
sCoupon.setTiktokSkuId(sku.getStr("sku_id"));
sCoupon.setName(sku.getStr("sku_name"));
sCoupon.setStartDate(new Date(product.getInt("sold_start_time") * 1000L));
sCoupon.setEndDate(new Date(product.getInt("sold_end_time") * 1000L));
......@@ -318,7 +318,7 @@ public class SCouponServiceImpl extends ServiceImpl<SCouponMapper, SCoupon> impl
return;
}
Set<String> poiIds = pois.stream().map(poi -> ((JSONObject) poi).getStr("poi_id")).collect(Collectors.toSet());
sCoupon.setStoreIds(String.valueOf(finalSStores.stream().filter(store -> poiIds.contains(store.getPoiId())).map(SStore::getId).collect(Collectors.toList())).replace("[", "").replace("]", "").replace(" ", "").trim());
sCoupon.setStoreIds(String.valueOf(finalSStores.stream().filter(store -> poiIds.contains(store.getTiktokPoiId())).map(SStore::getId).collect(Collectors.toList())).replace("[", "").replace("]", "").replace(" ", "").trim());
sCouponList.add(sCoupon);
}
});
......
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
......@@ -392,7 +392,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (getconsumed == null) {
throw new RuntimeException("优惠券异常，请稍后再试");
}
} else if (StringUtils.isNoneEmpty(byId.getSkuId()) && byId.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
} else if (StringUtils.isNoneEmpty(byId.getTiktokSkuId()) && byId.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
//抖音复验券
JSONObject object = tiktokService.certificateGet(byId.getCouponCode());
JSONObject certificate = object.getJSONObject("certificate");
......
share-system/src/main/java/share/system/service/impl/TiktokServiceImpl.java
......@@ -304,7 +304,7 @@ public class TiktokServiceImpl implements TiktokService {
@Override
public String consumeByUser(String code, String poiId) {
LambdaQueryWrapper<SStore> sStoreLambdaQueryWrapper = new LambdaQueryWrapper<>();
sStoreLambdaQueryWrapper.eq(SStore::getPoiId, poiId);
sStoreLambdaQueryWrapper.eq(SStore::getTiktokPoiId, poiId);
SStore sStore = storeService.getOne(sStoreLambdaQueryWrapper);
if (ObjectUtils.isEmpty(sStore) || StoreStatusEnum.STOP.getIndex().equals(sStore.getStatus())) {
throw new RuntimeException("门店状态异常，请联系管理员");
......@@ -350,7 +350,7 @@ public class TiktokServiceImpl implements TiktokService {
sConsumerCoupon.setEndDate(DateUtil.date(entries.getInt("expire_time") * 1000));
sConsumerCoupon.setStartDate(new Date());
LambdaQueryWrapper<SCoupon> sCouponLambdaQueryWrapper = new LambdaQueryWrapper<>();
sCouponLambdaQueryWrapper.eq(SCoupon::getSkuId, sku.getStr("sku_id"));
sCouponLambdaQueryWrapper.eq(SCoupon::getTiktokSkuId, sku.getStr("sku_id"));
List<SCoupon> sCoupons = isCouponService.list(sCouponLambdaQueryWrapper);
SCoupon sCoupon = null;
if (!CollectionUtils.isEmpty(sCoupons)) {
......@@ -379,7 +379,7 @@ public class TiktokServiceImpl implements TiktokService {
sConsumerCoupon.setCouponTimeStart(sCoupon.getValidStartTime());
sConsumerCoupon.setCouponTimeEnd(sCoupon.getValidEndTime());
sConsumerCoupon.setOrderType(sCoupon.getOrderType());
sConsumerCoupon.setSkuId(sCoupon.getSkuId());
sConsumerCoupon.setTiktokSkuId(sCoupon.getTiktokSkuId());
sConsumerCoupon.setStoreIds(sCoupon.getStoreIds());
sConsumerCoupon.setPackIds(sCoupon.getPackIds());
sConsumerCoupon.setWeeks(sCoupon.getWeeks());
......@@ -412,7 +412,7 @@ public class TiktokServiceImpl implements TiktokService {
List<SStore> list = storeService.list();
//过滤以增加的门店 根据poiId
List<TiktokPoi> collect = tiktokPois.stream().filter(o1 -> {
Optional<SStore> first = list.stream().filter(o2 -> o1.getPoiId().equals(o2.getPoiId())).findFirst();
Optional<SStore> first = list.stream().filter(o2 -> o1.getPoiId().equals(o2.getTiktokPoiId())).findFirst();
if (first.isPresent()) {
return false;
}
......
share-system/src/main/resources/mapper/system/SConsumerCouponMapper.xml
......@@ -11,7 +11,7 @@
<result property="storeId" column="store_id"/>
<result property="dealId" column="deal_id"/>
<result property="dealgroupId" column="dealgroup_id"/>
<result property="skuId" column="sku_id"/>
<result property="tiktokSkuId" column="tiktok_sku_id"/>
<result property="storeIds" column="store_ids"/>
<result property="couponCode" column="coupon_code" />
<result property="name" column="name" />
......@@ -51,7 +51,7 @@
store_id,
deal_id,
dealgroup_id,
sku_id,
tiktok_sku_id,
store_ids,
coupon_code,
name,
......@@ -115,6 +115,7 @@
<if test="weeks != null and weeks != ''">and weeks = #{weeks}</if>
<if test="deleteBy != null and deleteBy != ''"> and delete_by = #{deleteBy}</if>
<if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
<if test="tiktokSkuId != null ">and tiktok_sku_id = #{tiktokSkuId}</if>
ORDER BY create_time DESC
</select>
......@@ -177,7 +178,7 @@
<if test="orderType != null">order_type,</if>
<if test="packIds != null">pack_ids,</if>
<if test="dealgroupId != null">dealgroup_id,</if>
<if test="skuId != null">sku_id,</if>
<if test="tiktokSkuId != null">tiktok_sku_id,</if>
<if test="storeIds != null">store_ids,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
......@@ -215,7 +216,7 @@
<if test="orderType != null">#{orderType},</if>
<if test="packIds != null">#{packIds},</if>
<if test="dealgroupId != null">#{dealgroupId},</if>
<if test="skuId != null">#{skuId},</if>
<if test="tiktokSkuId != null">#{tiktokSkuId},</if>
<if test="storeIds != null">#{storeIds},</if>
</trim>
</insert>
......@@ -257,7 +258,7 @@
<if test="orderType != null">order_type = #{orderType},</if>
<if test="packIds != null">pack_ids = #{packIds},</if>
<if test="dealgroupId != null">dealgroup_id = #{dealgroupId},</if>
<if test="skuId != null">skuId = #{skuId}</if>
<if test="tiktokSkuId != null">tiktok_sku_id = #{tiktokSkuId}</if>
<if test="storeIds != null">store_ids = #{storeIds},</if>
</trim>
where id = #{id}
......
share-system/src/main/resources/mapper/system/SCouponMapper.xml
......@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="orderType" column="order_type"/>
<result property="packIds" column="pack_ids"/>
<result property="dealgroupId" column="dealgroup_id"/>
<result property="skuId" column="sku_id"/>
<result property="tiktokSkuId" column="tiktok_tiktok_sku_id"/>
<result property="storeIds" column="store_ids"/>
<result property="duration" column="duration" />
<result property="minDuration" column="min_duration" />
......@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order_type,
pack_ids,
dealgroup_id,
sku_id,
tiktok_sku_id,
weeks,
store_ids,
duration,min_duration,max_duration,
......@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderType != null">and order_type = #{orderType}</if>
<if test="packIds != null">and pack_ids = #{packIds}</if>
<if test="dealgroupId != null">and dealgroup_id = #{dealgroupId}</if>
<if test="skuId != null">and sku_id =#{skuId}</if>
<if test="tiktokSkuId != null">and tiktok_sku_id =#{tiktokSkuId}</if>
<if test="storeIds != null">and store_ids = #{storeIds}</if>
<if test="duration != null and duration != ''"> and duration = #{duration}</if>
<if test="minDuration != null and minDuration != ''"> and min_duration = #{minDuration}</if>
......@@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderType != null">order_type,</if>
<if test="packIds != null">pack_ids,</if>
<if test="dealgroupId != null">dealgroup_id,</if>
<if test="skuId != null">sku_id,</if>
<if test="tiktokSkuId != null">tiktok_sku_id,</if>
<if test="storeIds != null">store_ids,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
......@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderType != null">#{orderType},</if>
<if test="packIds != null">#{packIds},</if>
<if test="dealgroupId != null">#{dealgroupId},</if>
<if test="skuId != null">#{skuId},</if>
<if test="tiktokSkuId != null">#{tiktokSkuId},</if>
<if test="storeIds != null">#{storeIds},</if>
</trim>
</insert>
......@@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="packIds != null">pack_ids = #{packIds},</if>
<if test="storeIds != null">store_ids = #{storeIds},</if>
<if test="dealgroupId != null">dealgroup_id = #{dealgroupId},</if>
<if test="skuId != null">sku_id = #{skuId},</if>
<if test="tiktokSkuId != null">tiktok_sku_id = #{tiktokSkuId},</if>
<if test="duration != null and duration != ''">duration = #{duration},</if>
<if test="minDuration != null and minDuration != ''">min_duration = #{minDuration},</if>
<if test="maxDuration != null and maxDuration != ''">max_duration = #{maxDuration},</if>
......
share-system/src/main/resources/mapper/system/SStoreMapper.xml
......@@ -15,7 +15,7 @@
<result property="phone" column="phone" />
<result property="info" column="info" />
<result property="openShopUuid" column="open_shop_uuid"/>
<result property="poiId" column="poi_id"/>
<result property="tiktokPoiId" column="tiktok_poi_id"/>
<result property="deviceGroup" column="device_group"/>
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
......@@ -39,7 +39,7 @@
phone,
info,
open_shop_uuid,
poi_id,
tiktok_poi_id,
device_group,
create_by,
create_time,
......@@ -65,7 +65,7 @@
<if test="phone != null and phone != ''">and phone like concat('%', #{phone}, '%')</if>
<if test="info != null and info != ''"> and info = #{info}</if>
<if test="openShopUuid != null and openShopUuid != ''">and open_shop_uuid = #{openShopUuid}</if>
<if test="poiId != null and poiId !=''">and poi_id = #{poiId}</if>
<if test="tiktokPoiId != null and tiktokPoiId !=''">and tiktok_poi_id = #{tiktokPoiId}</if>
<if test="deviceGroup != null and deviceGroup != ''">and device_group = #{deviceGroup}</if>
<if test="status != null "> and status = #{status}</if>
<if test="openStartTime != null "> and open_start_time = #{openStartTime}</if>
......@@ -96,7 +96,7 @@
<if test="phone != null">phone,</if>
<if test="info != null">info,</if>
<if test="openShopUuid != null">open_shop_uuid,</if>
<if test="poiId != null">poi_id,</if>
<if test="tiktokPoiId != null">tiktok_poi_id,</if>
<if test="deviceGroup != null">device_group,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
......@@ -118,7 +118,7 @@
<if test="phone != null">#{phone},</if>
<if test="info != null">#{info},</if>
<if test="openShopUuid != null">#{openShopUuid},</if>
<if test="poiId != null">#{poiId},</if>
<if test="tiktokPoiId != null">#{tiktokPoiId},</if>
<if test="deviceGroup != null">#{deviceGroup},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
......@@ -144,7 +144,7 @@
<if test="phone != null">phone = #{phone},</if>
<if test="info != null">info = #{info},</if>
<if test="openShopUuid != null">open_shop_uuid = #{openShopUuid},</if>
<if test="poiId != null">poi_id = #{poiId},</if>
<if test="tiktokPoiId != null">tiktok_poi_id = #{tiktokPoiId},</if>
<if test="deviceGroup != null">device_group = #{deviceGroup},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment