还原错误修改

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

@@ -1165,6 +1165,7 @@ 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;
@@ -1174,6 +1175,7 @@ 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) {
@@ -1183,6 +1185,7 @@ 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;
@@ -1198,7 +1201,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(activityTypeId);
+                    shopStoreActivityItem.setActivity_type_id(activityType);
                     shopStoreActivityItem.setActivity_item_state(activityState);
                     shopStoreActivityItem.setActivity_item_starttime(activityStarttime);
                     shopStoreActivityItem.setActivity_item_endtime(jsonObj.getDate("activityEndtime"));