Merge remote-tracking branch 'origin/master'

nickchange

2023-10-17 3f2e0142a6db9720f6429848840ac6b214a1cd1b

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -63,6 +63,9 @@
    @Autowired
    private SiteMapper siteMapper;

    @Autowired
    private TBackRecordService backRecordService;




@@ -102,6 +105,7 @@
        Store store = storeService.getById(site.getStoreId());
        QuerySiteInfoVo querySiteInfoVo = new QuerySiteInfoVo();
        querySiteInfoVo.setId(site.getId());
        querySiteInfoVo.setTypeName(site.getTypeName());
        querySiteInfoVo.setName(site.getName());
        querySiteInfoVo.setSiteTypeName(siteType.getName());
        querySiteInfoVo.setStoreName(store.getName());
@@ -238,7 +242,11 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        Double payMoney = 0D;
        if(reservationSite.getPayType() == 3){
            payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
            if(reservationSite.getIsHalf()==2){
                payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
            }else {
                payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
            }
            if(appUser.getPlayPaiCoins().compareTo(payMoney.intValue()) < 0){
                return ResultUtil.error("玩湃币不足");
            }
@@ -248,8 +256,12 @@

        //校验优惠券
        Long couponId = reservationSite.getCouponId();
        if (couponId!=null && couponId != 0){

        if(null != couponId && reservationSite.getPayType() != 3){
            UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(),uid));


            if(userCoupon.getStatus() == 2){
                return ResultUtil.error("优惠券已被核销");
            }
@@ -279,6 +291,7 @@
            }
            userCoupon.setStatus(2);
            userCouponClient.updateUserCoupon(userCoupon);
        }
        }


@@ -316,7 +329,11 @@
            return aliPaymentSite(payMoney, siteBooking);
        }
        if(reservationSite.getPayType() == 3){//玩湃币支付
            return playPaiCoinPaymentSite(appUser, payMoney, siteBooking);
            if(reservationSite.getIsHalf()==2){
                return playPaiCoinPaymentSite(appUser, Double.valueOf(site.getPlayPaiCoin()), siteBooking);
            }else {
                return playPaiCoinPaymentSite(appUser, site.getPlayPaiCoinOne(), siteBooking);
            }
        }
        return ResultUtil.success();
    }
@@ -523,6 +540,13 @@
            }
            siteBooking.setCancelUserId(uid);
            siteBookingService.updateById(siteBooking);

            TBackRecord tBackRecord = new TBackRecord();
            tBackRecord.setMoney(siteBooking.getPayMoney());
            tBackRecord.setUserId(siteBooking.getAppUserId());
            tBackRecord.setTime(new Date());
            backRecordService.save(tBackRecord);

        }
        if(siteBooking.getPayType() == 2){//支付宝
            Map<String, String> map = payMoneyUtil.aliRefund(siteBooking.getPayOrderNo(), siteBooking.getPayMoney().toString());
@@ -544,6 +568,13 @@
                userCoupon.setStatus(1);
                userCouponClient.updateUserCoupon(userCoupon);
            }


            TBackRecord tBackRecord = new TBackRecord();
            tBackRecord.setMoney(siteBooking.getPayMoney());
            tBackRecord.setUserId(siteBooking.getAppUserId());
            tBackRecord.setTime(new Date());
            backRecordService.save(tBackRecord);
        }

        if(siteBooking.getPayType() == 3){//玩湃币