商家端券包代码提交

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/LifeCouponPlatformServiceImpl.java

@@ -305,10 +305,13 @@ public class LifeCouponPlatformServiceImpl extends ServiceImpl<LifeCouponMapper,
     /** 代金券转成与优惠券一致的结构（LifeDiscountCouponVo），type=4 */
     private LifeDiscountCouponVo mapLifeCouponToDiscountVo(LifeCoupon lc) {
         LifeDiscountCouponVo vo = new LifeDiscountCouponVo();
+        // 代金券 id 统一从 life_coupon.id 返回：voucherId 必填（字符串），id/couponId 在为数字时一并返回便于前端与优惠券格式一致
         vo.setVoucherId(lc.getId());
         if (lc.getId() != null) {
             try {
-                vo.setId(Integer.parseInt(lc.getId()));
+                int numericId = Integer.parseInt(lc.getId());
+                vo.setId(numericId);
+                vo.setCouponId(numericId);
             } catch (NumberFormatException ignored) { }
         }
         vo.setStoreId(lc.getStoreId());

alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -680,17 +680,21 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
             return lifeDiscountCouponVos;
         }
         for (LifeDiscountCouponUser lifeDiscountCouponUser : lifeDiscountCouponUserIPage.getRecords()) {
-            LifeDiscountCoupon lifeDiscountCouponOne = lifeDiscountCoupons.stream().filter(lifeDiscountCoupon -> lifeDiscountCoupon.getId().equals(lifeDiscountCouponUser.getCouponId())).collect(Collectors.toList()).get(0);
+            LifeDiscountCoupon lifeDiscountCouponOne = lifeDiscountCoupons.stream().filter(lifeDiscountCoupon -> lifeDiscountCoupon.getId().equals(lifeDiscountCouponUser.getCouponId())).findFirst().orElse(null);
+            if (lifeDiscountCouponOne == null) {
+                continue;
+            }
             StoreInfo storeInfoOne = null;
             if (!storeInfoList.isEmpty() && !StringUtils.isEmpty(lifeDiscountCouponOne.getStoreId())) {
-                storeInfoOne = storeInfoList.stream().filter(storeInfo -> storeInfo.getId().toString().equals(lifeDiscountCouponOne.getStoreId())).collect(Collectors.toList()).get(0);
+                storeInfoOne = storeInfoList.stream().filter(storeInfo -> storeInfo.getId().toString().equals(lifeDiscountCouponOne.getStoreId())).findFirst().orElse(null);
             }
             LifeDiscountCouponVo lifeDiscountCouponVo = new LifeDiscountCouponVo();
             if (null != storeInfoOne) {
                 lifeDiscountCouponVo.setBusinessSection(storeInfoOne.getBusinessSection());
                 lifeDiscountCouponVo.setBusinessSectionName(storeInfoOne.getBusinessSectionName());
             }
-            lifeDiscountCouponVo.setCouponId(lifeDiscountCouponOne.getId());
+            lifeDiscountCouponVo.setCouponId(lifeDiscountCouponUser.getId());
+            lifeDiscountCouponVo.setVoucherId(lifeDiscountCouponUser.getVoucherId());
             BeanUtils.copyProperties(lifeDiscountCouponOne, lifeDiscountCouponVo);
             lifeDiscountCouponVo.setQuantityClaimed(lifeDiscountCouponUserIPage.getRecords().size());
             lifeDiscountCouponVo.setExpirationTime(lifeDiscountCouponUser.getExpirationTime());