backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: backend:14f99acdb04053255f39602195ecc580e65a1887
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0
..
compare: backend:cede2b437821644f8ab7759affc422a6d8b3cf01
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0

No commits in common. "14f99acdb04053255f39602195ecc580e65a1887" and "cede2b437821644f8ab7759affc422a6d8b3cf01" have entirely different histories.
14f99acdb0 ... cede2b4378

1 changed files with 1 additions and 4 deletions
Show Stats Expand all files Collapse all files

5
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
View File

@ -1165,7 +1165,6 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
ShopProductIndex shopProductIndex=new ShopProductIndex();
shopProductIndex.setIs_special(null);
shopProductIndex.setProduct_id(productId);
int activityType = 0;
if (activityTypeId == 1) {//限时秒杀
shopProductIndex.setActivity_type_ids(String.valueOf(StateCode.ACTIVITY_TYPE_LIMITED_DISCOUNT));
ruleType = ActiveShopJsonUtils.SECKILL;
@ -1175,7 +1174,6 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
newDiscout = specPrice.divide(oldPrice, 4, RoundingMode.HALF_UP);
newItems.addAll(getFulReduItemList(itemIds, ruleType, newDiscout));//获取满减规则的itemid
}
activityType=StateCode.ACTIVITY_TYPE_LIMITED_DISCOUNT;
}
if (activityTypeId == 2) {//折扣
if (discount.compareTo(BigDecimal.ZERO) <= 0) {
@ -1185,7 +1183,6 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
ruleType = ActiveShopJsonUtils.DISCOUNT;
newItems.addAll(getFulReduItemList(itemIds, ruleType, discount));//获取满减规则的itemid
shopProductIndex.setActivity_type_ids(String.valueOf(StateCode.ACTIVITY_TYPE_ONE_PIECE_DISCOUNT));
activityType=StateCode.ACTIVITY_TYPE_ONE_PIECE_DISCOUNT;
}
if (activityTypeId == 3) {//满减
ruleType = ActiveShopJsonUtils.FULLREDUCE;
@ -1201,7 +1198,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
for (int i = 0; i < itemIdsArray.length; i++) {
ShopStoreActivityItem shopStoreActivityItem = new ShopStoreActivityItem();
shopStoreActivityItem.setActivity_id(Integer.valueOf(activityId));
shopStoreActivityItem.setActivity_type_id(activityType);
shopStoreActivityItem.setActivity_type_id(activityTypeId);
shopStoreActivityItem.setActivity_item_state(activityState);
shopStoreActivityItem.setActivity_item_starttime(activityStarttime);
shopStoreActivityItem.setActivity_item_endtime(jsonObj.getDate("activityEndtime"));