Skip to content

G
gxpt_ht
Commit 0186a3e5 by 吕明尚
Options

修改验券，修改自动生成补充优惠卷购买金额

parent 13f950ee
Showing with 35 additions and 3 deletions
share-quartz/src/main/java/share/quartz/task/CouponRetryTask.java
...@@ -90,7 +90,7 @@ public class CouponRetryTask { ...@@ -90,7 +90,7 @@ public class CouponRetryTask {
.getOpenShopUuid(); .getOpenShopUuid();
TuangouReceiptGetConsumedReponseEntity getconsumed = qpService.getconsumed(item.getCouponCode(), openShopUuid); TuangouReceiptGetConsumedReponseEntity getconsumed = qpService.getconsumed(item.getCouponCode(), openShopUuid);
if (!ObjectUtils.isEmpty(getconsumed)) { if (!ObjectUtils.isEmpty(getconsumed)) {
item.setCouponPayPrice(BigDecimal.valueOf(getconsumed.getDeal_price())); item.setCouponPayPrice(BigDecimal.valueOf(getconsumed.getDeal_price()).subtract(BigDecimal.valueOf(getconsumed.getOrder_shoppromo_amount())));
logger.debug("美团优惠卷购买金额为：" + item.getCouponPayPrice()); logger.debug("美团优惠卷购买金额为：" + item.getCouponPayPrice());
} else { } else {
item.setUseStatus(UserStatusEnum.EXPIRED.getCode()); item.setUseStatus(UserStatusEnum.EXPIRED.getCode());
......
share-system/src/main/java/share/system/service/impl/QPServiceImpl.java
...@@ -138,7 +138,7 @@ public class QPServiceImpl implements QPService { ...@@ -138,7 +138,7 @@ public class QPServiceImpl implements QPService {
sConsumerCoupon.setCreateBy(String.valueOf(user.getId())); sConsumerCoupon.setCreateBy(String.valueOf(user.getId()));
sConsumerCoupon.setCreateTime(new Date()); sConsumerCoupon.setCreateTime(new Date());
sConsumerCoupon.setOriginalPrice(BigDecimal.valueOf(prepare.getDeal_marketprice())); sConsumerCoupon.setOriginalPrice(BigDecimal.valueOf(prepare.getDeal_marketprice()));
sConsumerCoupon.setCouponPayPrice(BigDecimal.valueOf(prepare.getDeal_price())); sConsumerCoupon.setCouponPayPrice(prepare.getPayment_detail().get(0).getAmount());
//查询美团团购信息 //查询美团团购信息
List<TuangouDealQueryShopDealResponseEntity> groupActivities = queryshopdeal(sStore.getOpenShopUuid()); List<TuangouDealQueryShopDealResponseEntity> groupActivities = queryshopdeal(sStore.getOpenShopUuid());
groupActivities.forEach(o -> { groupActivities.forEach(o -> {
......
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
...@@ -2980,6 +2980,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -2980,6 +2980,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) { if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) {
if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) { if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode()); orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
statisticsResponse.setMeituanRefundFee(statisticsResponse.getMeituanRefundFee().add(sConsumerCoupon.getCouponPayPrice())); statisticsResponse.setMeituanRefundFee(statisticsResponse.getMeituanRefundFee().add(sConsumerCoupon.getCouponPayPrice()));
...@@ -2988,8 +2991,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -2988,8 +2991,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice());
statisticsResponse.setMeituanRefundFee(statisticsResponse.getMeituanRefundFee().add(sCoupon.getCouponPayPrice())); statisticsResponse.setMeituanRefundFee(statisticsResponse.getMeituanRefundFee().add(sCoupon.getCouponPayPrice()));
} }
}
} else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) { } else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode()); orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
statisticsResponse.setDouyinRefundFee(statisticsResponse.getDouyinRefundFee().add(sConsumerCoupon.getCouponPayPrice())); statisticsResponse.setDouyinRefundFee(statisticsResponse.getDouyinRefundFee().add(sConsumerCoupon.getCouponPayPrice()));
...@@ -3002,6 +3009,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3002,6 +3009,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
} }
} }
} }
}
statisticsResponse.setPlatformRefundFee(statisticsResponse.getPlatformRefundFee().add(order.getPayPrice())); statisticsResponse.setPlatformRefundFee(statisticsResponse.getPlatformRefundFee().add(order.getPayPrice()));
statisticsResponse.setRechargeBalanceRefundFee(statisticsResponse.getRechargeBalanceRefundFee().add(order.getBalance())); statisticsResponse.setRechargeBalanceRefundFee(statisticsResponse.getRechargeBalanceRefundFee().add(order.getBalance()));
} }
...@@ -3017,6 +3025,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3017,6 +3025,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) { if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) {
if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) { if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode()); orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
statisticsResponse.setMeituanFee(statisticsResponse.getMeituanFee().add(sConsumerCoupon.getCouponPayPrice())); statisticsResponse.setMeituanFee(statisticsResponse.getMeituanFee().add(sConsumerCoupon.getCouponPayPrice()));
...@@ -3025,8 +3036,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3025,8 +3036,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice());
statisticsResponse.setMeituanFee(statisticsResponse.getMeituanFee().add(sCoupon.getCouponPayPrice())); statisticsResponse.setMeituanFee(statisticsResponse.getMeituanFee().add(sCoupon.getCouponPayPrice()));
} }
}
} else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) { } else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode()); orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
statisticsResponse.setDouyinFee(statisticsResponse.getDouyinFee().add(sConsumerCoupon.getCouponPayPrice())); statisticsResponse.setDouyinFee(statisticsResponse.getDouyinFee().add(sConsumerCoupon.getCouponPayPrice()));
...@@ -3039,6 +3054,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3039,6 +3054,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
} }
} }
} }
}
finalOrderVoList.add(orderVo); finalOrderVoList.add(orderVo);
}); });
//用户充值 //用户充值
...@@ -3156,14 +3172,21 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3156,14 +3172,21 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) { if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) {
if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) { if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode()); orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
} else { } else {
SCoupon sCoupon = sCouponMap.get(sConsumerCoupon.getCouponId()); SCoupon sCoupon = sCouponMap.get(sConsumerCoupon.getCouponId());
orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice());
} }
}
} else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) { } else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode()); orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
} else { } else {
...@@ -3175,6 +3198,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3175,6 +3198,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
} }
} }
} }
}
if (!map.isEmpty()) { if (!map.isEmpty()) {
if (ObjectUtil.isNotEmpty(order.getCouponId())) { if (ObjectUtil.isNotEmpty(order.getCouponId())) {
SConsumerCoupon sConsumerCoupon = map.get(order.getCouponId()); SConsumerCoupon sConsumerCoupon = map.get(order.getCouponId());
...@@ -3185,14 +3209,21 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3185,14 +3209,21 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) { if (sConsumerCoupon.getCouponType().equals(CouponTypeEnum.CASH.getCode())) {
if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) { if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode()); orderVo.setPlatformType(PlatformTypeEnum.MEITUAN.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
} else { } else {
SCoupon sCoupon = sCouponMap.get(sConsumerCoupon.getCouponId()); SCoupon sCoupon = sCouponMap.get(sConsumerCoupon.getCouponId());
orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sCoupon.getCouponPayPrice());
} }
}
} else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) { } else if (sConsumerCoupon.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode()); orderVo.setPlatformType(PlatformTypeEnum.TIKTOK.getCode());
if (sConsumerCoupon.getUseStatus().equals(UserStatusEnum.EXPIRED.getCode())) {
orderVo.setCouponPayPrice(BigDecimal.ZERO);
} else {
if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) { if (ObjectUtil.isNotEmpty(sConsumerCoupon.getCouponPayPrice())) {
orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice()); orderVo.setCouponPayPrice(sConsumerCoupon.getCouponPayPrice());
} else { } else {
...@@ -3203,6 +3234,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -3203,6 +3234,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
} }
} }
} }
}
finalOrderVoList.add(orderVo); finalOrderVoList.add(orderVo);
}); });
return orderVoList; return orderVoList;
......
share-system/src/main/java/share/system/service/impl/TiktokServiceImpl.java
...@@ -420,7 +420,7 @@ public class TiktokServiceImpl implements TiktokService { ...@@ -420,7 +420,7 @@ public class TiktokServiceImpl implements TiktokService {
sConsumerCoupon.setCreateTime(new Date()); sConsumerCoupon.setCreateTime(new Date());
Integer originalAmount = amount.getInt("list_market_amount"); Integer originalAmount = amount.getInt("list_market_amount");
sConsumerCoupon.setOriginalPrice(BigDecimal.valueOf(originalAmount / 100)); sConsumerCoupon.setOriginalPrice(BigDecimal.valueOf(originalAmount / 100));
sConsumerCoupon.setCouponPayPrice(BigDecimal.valueOf(amount.getInt("coupon_pay_amount") / 100)); sConsumerCoupon.setCouponPayPrice(BigDecimal.valueOf(amount.getInt("pay_amount") / 100));
//时间戳转年月日时分秒 //时间戳转年月日时分秒
sConsumerCoupon.setEndDate(new Date(entries.getInt("expire_time") * 1000L)); sConsumerCoupon.setEndDate(new Date(entries.getInt("expire_time") * 1000L));
//获取本日的00:00:00 //获取本日的00:00:00
......
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