Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-24 eb4168a55e5cbfc04fe4e2b6c99d8a232f85ad2e

 cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java

@@ -85,7 +85,6 @@
                            if(vipPayment1.getPayStatus() != 1){
                                return;
                            }

                            /**
                             * SUCCESS--支付成功
                             * REFUND--转入退款
@@ -158,7 +157,7 @@
     */
    public ResultUtil alipay(VipPayment vipPayment) throws Exception{
        String code = vipPayment.getCode();
        ResultUtil alipay = payMoneyUtil.alipay("购买年度会员", "购买年度会员", "", code, vipPayment.getAmount().toString(),
        ResultUtil alipay = payMoneyUtil.alipay("购买年度会员", "购买年度会员", vipPayment.getAppUserId()+"", code, vipPayment.getAmount().toString(),
                "/base/appUser/addVipPaymentAliCallback");
        if(alipay.getCode() == 200){
            new Thread(new Runnable() {
@@ -210,7 +209,7 @@
                                        vipEndTime = new Date();
                                    }
                                    Calendar calendar = Calendar.getInstance();
                                    calendar.setTime(new Date());
                                    calendar.setTime(vipEndTime);
                                    calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
                                    appUser.setVipEndTime(calendar.getTime());
                                    appUserService.updateById(appUser);
@@ -267,7 +266,7 @@
            vipEndTime = new Date();
        }
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(vipEndTime);
        calendar.setTime(new Date());
        calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
        appUser.setVipEndTime(calendar.getTime());
        appUserService.updateById(appUser);