订单支付修改

admin

2021-06-02 4cdf9b0fdce6d2d7b4ca79055816661b88ac4d5c

 service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java

@@ -2,6 +2,7 @@

import com.alipay.api.AlipayApiException;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.ks.vip.exception.OrderPayException;
import com.ks.vip.exception.VipOrderException;
import com.ks.vip.mapper.VipOrderMapper;
import com.ks.vip.pojo.DO.VipCombo;
@@ -10,11 +11,9 @@
import com.ks.vip.pojo.DTO.VipOrderDTO;
import com.ks.vip.pojo.Enums.OrderTypeEnum;
import com.ks.vip.pojo.Enums.PayWayEnum;
import com.ks.vip.query.VipOrderQuery;
import com.ks.vip.service.VipCenterService;
import com.ks.vip.service.VipComboService;
import com.ks.vip.service.VipOrederPayService;
import com.ks.vip.service.VipOrederService;
import com.ks.vip.service.manager.RedisManager;
import com.ks.vip.util.Constant;
import com.ks.vip.util.PayUtil;
@@ -26,10 +25,7 @@
import org.yeshi.utils.wx.WXPayV3Util;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
import java.util.UUID;

@Service(version = "1.0")
@@ -50,17 +46,17 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public PayWayInfoDTO addOrderByBuy(VipOrderDTO t) throws VipOrderException {
        if(t.getComboId() == null || t.getComboId() <= 0){
    public PayWayInfoDTO addOrderWithPay(VipOrderDTO t, String notifyUrl, String returnUrl) throws VipOrderException {
        if (t.getComboId() == null || t.getComboId() <= 0) {
            throw new VipOrderException(1, "套餐ID不能为空");
        }
        if(StringUtil.isNullOrEmpty(t.getUid())){
        if (StringUtil.isNullOrEmpty(t.getUid())) {
            throw new VipOrderException(1, "用户ID不能为空");
        }
        if(t.getPayWay() == null){
        if (t.getPayWay() == null) {
            throw new VipOrderException(1, "付款方式不能为空");
        }
        if(StringUtil.isNullOrEmpty(t.getThreeOrderId())){
        if (StringUtil.isNullOrEmpty(t.getThreeOrderId())) {
            throw new VipOrderException(1, "付款订单号不能为空");
        }

@@ -71,10 +67,10 @@
        }

        // 判断订单类型: 首单、续费
        String orderType = OrderTypeEnum.buyNewly.name();
        OrderTypeEnum orderType = OrderTypeEnum.buyNewly;
        long count = vipOrderMapper.countByTypeAndUid(t.getUid(), orderType);
        if(count > 0) {
            orderType = OrderTypeEnum.buyRenew.name();
        if (count > 0) {
            orderType = OrderTypeEnum.buyRenew;
        }

        // 插入订单信息
@@ -88,43 +84,48 @@
        vipOrderMapper.insertSelective(newOrder);

        // 支付方式
        return payOrder(newOrder);
        try {
            return payOrder(newOrder, notifyUrl, returnUrl);
        } catch (OrderPayException e) {
            e.printStackTrace();
            throw new VipOrderException(VipOrderException.CODE_CREATE_PAY_ORDER_FAIL, e.getMsg());
        }
    }


    @Override
    @Transactional(rollbackFor = Exception.class)
    public PayWayInfoDTO payOrder(VipOrder order) {
    public PayWayInfoDTO payOrder(VipOrder order, String notifyUrl, String returnUrl) throws OrderPayException {
        if (order.getState() == VipOrder.STATE_PAY) {
            throw new OrderPayException(OrderPayException.CODE_ALREADY_PAY, "已经完成支付");
        }
        String goodsTitle = Constant.ORDER_PAY_TITLE;
        String orderId = order.getId() + "";
        switch (order.getPayWay()) {
            case "alipay":  //生成支付宝支付订单
                if (order.getState() == VipOrder.STATE_PAY) {
                    return new PayWayInfoDTO(PayWayEnum.alipay.getWay(), PayUtil.getPaySuccessUrl(orderId));
            //生成支付宝支付订单
            case "alipay":
                String form = PayUtil.getVipChargeAlipayForm(orderId, goodsTitle, orderId, order.getPayMoney(), notifyUrl, returnUrl);
                if (StringUtil.isNullOrEmpty(form)) {
                    throw new OrderPayException(OrderPayException.CODE_CREATE_PAY_ORDER_FAIL, "创建支付宝支付订单失败");
                }
                String form = PayUtil.getVipChargeAlipayForm(orderId, goodsTitle, orderId, order.getPayMoney());
                //暂存2分钟
                String id = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
                redisManager.cacheCommonString(id, form, 120);
                String payUrl = Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + id;
                return new PayWayInfoDTO(PayWayEnum.alipay.getWay(), payUrl);
                return new PayWayInfoDTO(PayWayEnum.alipay.getWay(), null, id);
            case "weChat":
                try {
                    if (order.getState() == VipOrder.STATE_PAY) {
                        return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), PayUtil.getPaySuccessUrl(orderId));
                    }

                    String formWX = PayUtil.createWXOrder(orderId, null, orderId, order.getPayMoney() ,goodsTitle);
                    //暂存2分钟
                    String idWX = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
                    redisManager.cacheCommonString(formWX, formWX, 120);
                    String payUrlWX = Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + idWX;
                    return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), payUrlWX);
                    String payUrl = PayUtil.createWXOrder(null, orderId, order.getPayMoney(), goodsTitle, notifyUrl, returnUrl);
                    return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), payUrl, null);
                } catch (Exception e) {

                    throw new OrderPayException(OrderPayException.CODE_CREATE_PAY_ORDER_FAIL, e.getMessage());
                }
        }
        return null;
    }

    @Override
    public String getAlipayForm(String formId) {
        return redisManager.getCommonString(formId);
    }


@@ -136,10 +137,11 @@
            return order;
        }
        switch (order.getPayWay()) {
            case "alipay":  //支付宝
            //支付宝
            case "alipay":
                AlipayTradeQueryResponse res = null;
                try {
                    res = AlipayH5PayUtil.queryOrder(PayUtil.getAlipayApp(), id+"" , null);
                    res = AlipayH5PayUtil.queryOrder(PayUtil.getAlipayApp(), id + "", null);
                    //支付成功
                    if (res.isSuccess() && "TRADE_SUCCESS".equalsIgnoreCase(res.getTradeStatus())) {
                        try {
@@ -151,9 +153,10 @@
                } catch (AlipayApiException e) {
                    e.printStackTrace();
                }
            case "weChat": //微信
                //微信
            case "weChat":
                try {
                    WXPayOrderInfoV3 info = WXPayV3Util.getPayOrderInfo(id+"" , PayUtil.getWXAPP());
                    WXPayOrderInfoV3 info = WXPayV3Util.getPayOrderInfo(id + "", PayUtil.getWXAPP());
                    if (info != null && info.getTrade_state().equalsIgnoreCase("SUCCESS")) {
                        paySuccess(order);
                        return order;
@@ -163,11 +166,12 @@
                }
        }
        return null;
     }
    }


    /**
     * 支付成功更新处理
     *
     * @param order
     * @return
     */
@@ -182,22 +186,22 @@
        Integer validDays = vipCombo.getValidDays();

        // 判断订单类型
        String orderType = OrderTypeEnum.buyNewly.name();
        OrderTypeEnum orderType = OrderTypeEnum.buyNewly;
        long count = vipOrderMapper.countByTypeAndUid(order.getUid(), orderType);
        if(count > 0) {
            orderType = OrderTypeEnum.buyRenew.name();
        if (count > 0) {
            orderType = OrderTypeEnum.buyRenew;
        }

        // order.setThreeOrderId(); TODO
         order.setState(VipOrder.STATE_PAY);
         order.setPayTime(new Date());
         order.setUpdateTime(new Date());
         vipOrderMapper.updateByPrimaryKeySelective(order);
        order.setState(VipOrder.STATE_PAY);
        order.setPayTime(new Date());
        order.setUpdateTime(new Date());
        vipOrderMapper.updateByPrimaryKeySelective(order);

         // 更新等级
         vipCenterService.saveVipCenter(order.getUid(), vipCombo.getGradeId(), validDays, order.getId() );
        // 更新等级
        vipCenterService.saveVipCenter(order.getUid(), vipCombo.getGradeId(), validDays * 24, order.getId());

         return order;
     }
        return order;
    }

}