Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-18 4b486f955cd3d36fa09e372c484b7a66711d7ec7

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java

@@ -1,6 +1,7 @@
package com.ruoyi.order.controller;


import com.ruoyi.account.api.dto.GiveVipDto;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -63,12 +64,25 @@
        return AjaxResult.success();
    }

//    @PostMapping("/callBack")
//    public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){
//        shoppingOrderService.callBack(code,outTradeNo);
//        return R.ok();
//
//    }
    @PostMapping("/callBack")
    public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){

        TVipOrder one = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, code).one();
        one.setSerialNumber(outTradeNo);
        vipOrderService.updateById(one);
        GiveVipDto giveVipDto = new GiveVipDto();
        giveVipDto.setVipId(one.getVipId());
        giveVipDto.setType(one.getVipType());
        giveVipDto.setUserIds(one.getAppUserId().toString());



        appUserClient.giveVip(giveVipDto);

        return R.ok();

    }


}