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

Pu Zhibing

2024-09-20 7c7354dc331ee0f94938fd27a69047d254e4bdf0

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java

@@ -12,6 +12,8 @@
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.OtherClient;
import com.ruoyi.other.api.feignClient.VipClient;
import com.ruoyi.other.mapper.TCouponMapper;
import com.ruoyi.other.mapper.TVipMapper;
import com.ruoyi.other.service.TVipService;
@@ -80,17 +82,30 @@
        return pageInfo;
    }

    @Resource
    private VipClient vipClient;
    @Override
    public Object vipInfoPay(TVip byId, BigDecimal payMoney, Integer payType,BigDecimal discountMoney,BigDecimal discount,Integer buyType, Long userId) {
        TAppUser user = appUserClient.getUserById(userId).getData();


        //生成会员购买订单

        TVipOrder shopOrder = new TVipOrder();
        shopOrder.setCode(OrderCodeUtil.getOrderCode("HY"));
        shopOrder.setType(1);

        shopOrder.setAppUserId(userId);
        shopOrder.setType(1);
        shopOrder.setVipId(byId.getId());
        shopOrder.setTitle(byId.getName());
        if (buyType==1){
            shopOrder.setTitle(byId.getName()+"月卡");
        }else if (buyType==2){
            shopOrder.setTitle(byId.getName()+"季卡");
        }else {
            shopOrder.setTitle(byId.getName()+"年卡");
        }
        shopOrder.setVipType(buyType);
        shopOrder.setOrderAmount(payMoney.add(discountMoney));
        shopOrder.setDiscount(discount);
@@ -109,7 +124,7 @@
            paymentOrder.setAmount(shopOrder.getPaymentAmount());
            paymentOrder.setOpenId(user.getWxOpenid());
            paymentOrder.setDescription("购买会员");
            return    wxPaymentClient.orderPay(paymentOrder);
            return    wxPaymentClient.orderPay(paymentOrder).getData();
        }else {
            AliPaymentReq req = new AliPaymentReq();
            req.setOutTradeNo(shopOrder.getCode());