Commit 0186a3e5 by 吕明尚

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

parent 13f950ee
...@@ -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());
......
...@@ -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 -> {
......
...@@ -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