Merge remote-tracking branch 'origin/dev' into dev

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -325,11 +325,11 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 sConsumerCoupons.stream().filter(sConsumerCoupon -> sConsumerCoupon.getId().equals(item.getCouponId())).findFirst().ifPresent(sConsumerCoupon -> {
                     item.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
                     item.setPlatformType(sConsumerCoupon.getPlatformType());
-//                    if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
-//                        item.setCouponSkuId(String.valueOf(sConsumerCoupon.getDealgroupId()));
-//                    } else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
-//                        item.setCouponSkuId(String.valueOf(sConsumerCoupon.getTiktokSkuId()));
-//                    }
+                    if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
+                        item.setCouponSkuId(String.valueOf(sConsumerCoupon.getDealgroupId()));
+                    } else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
+                        item.setCouponSkuId(String.valueOf(sConsumerCoupon.getTiktokSkuId()));
+                    }
                     totalSalesAmount[0] = totalSalesAmount[0].add(ObjectUtil.isEmpty(sConsumerCoupon.getCouponPayPrice()) ? new BigDecimal("0.00") : sConsumerCoupon.getCouponPayPrice());
                 });
                 if (item.getPayStatus().equals(YesNoEnum.yes.getIndex()) && item.getRefundStatus().equals(RefundStatusEnum.REFUNDED.getCode())) {