seata集成

admin

2021-04-12 5129d2c63fbef70c6ee45ba5ec12654937e05231

 src/main/java/com/yeshi/buwan/controller/api/VIPController.java

@@ -1,13 +1,11 @@
package com.yeshi.buwan.controller.api;

import com.google.gson.*;
import com.yeshi.buwan.domain.system.SystemConfig;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.domain.vip.*;
import com.yeshi.buwan.exception.goldcorn.GoldCornException;
import com.yeshi.buwan.exception.order.OrderException;
import com.yeshi.buwan.exception.order.PayException;
import com.yeshi.buwan.exception.vip.VIPException;
import com.yeshi.buwan.pptv.entity.VideoPPTVMap;
import com.yeshi.buwan.service.inter.LoginUserService;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
@@ -127,8 +125,8 @@
        }).create();
        JSONObject root = new JSONObject();

        List<VIPOrderRecord> list = orderService.listOrderRecord(loginUid, null, page, Constant.pageCount);
        for (VIPOrderRecord record : list) {
        List<OrderRecord> list = orderService.listOrderRecord(loginUid, null, page, Constant.pageCount);
        for (OrderRecord record : list) {
            record.setIpInfo(null);
            record.setUpdateTime(null);
        }
@@ -189,7 +187,7 @@
            }
        }

        VIPOrderRecord record = new VIPOrderRecord();
        OrderRecord record = new OrderRecord();
        record.setUid(loginUid);
        if (vipPrice != null)
            record.setType(vipPrice.getType());
@@ -199,7 +197,7 @@
        record.setGoldCorn(goldCorn);
        record.setMoney(vipPrice.getActualPrice());
        record.setPayWay(payWay);
        record.setState(VIPOrderRecord.STATE_NOT_PAY);
        record.setState(OrderRecord.STATE_NOT_PAY);
        record.setIpInfo(IPUtil.getRemotIP(request) + ":" + IPUtil.getRemotePort(request));
        try {
            orderService.createOrder(record);
@@ -221,7 +219,7 @@

        String orderNo = VIPOrderUtil.getOutOrderNo(record.getOrderType(), record.getId());
        switch (payWay) {
            case VIPOrderRecord
            case OrderRecord
                    .PAY_WAY_ALIPAY: {
                //生成支付宝支付订单
                String form = VipUtil.getVipChargeAlipayForm(record.getId(), orderNo, record.getMoney());
@@ -235,7 +233,7 @@
            }


            case VIPOrderRecord
            case OrderRecord
                    .PAY_WAY_WX: {
                //生成微信支付订单
                try {
@@ -266,14 +264,14 @@
    @ResponseBody
    @RequestSerializableByKey(key = "'vip-checkPay-'+#id")
    public String checkPay(AcceptData acceptData, String loginUid, String id) {
        VIPOrderRecord record = orderService.getOrderRecord(id);
        OrderRecord record = orderService.getOrderRecord(id);
        if (record == null || !record.getUid().equalsIgnoreCase(loginUid)) {
            return JsonUtilV2.loadFalseJson("记录不存在/不是您的订单");
        }

        record = orderService.checkOrderPayState(id);
        //未支付
        if (record != null && record.getState() != VIPOrderRecord.STATE_PAY) {
        if (record != null && record.getState() != OrderRecord.STATE_PAY) {
            return JsonUtilV2.loadFalseJson(1, "支付未完成");
        }