修改bug

Pu Zhibing

1 天以前 50dde470ec18f292e8e58547ef1c4a4cbd4138b2

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

@@ -3,6 +3,8 @@

import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.account.api.dto.GiveVipDto;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.common.core.domain.R;
@@ -12,12 +14,16 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.model.TVipOrderRefund;
import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.api.query.VipShoppingOrderQuery;
import com.ruoyi.order.dto.TEnterpriseExport;
import com.ruoyi.order.service.TVipOrderRefundService;
import com.ruoyi.order.service.TVipOrderService;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
import com.ruoyi.other.api.feignClient.OtherClient;
@@ -26,6 +32,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.omg.CORBA.PRIVATE_MEMBER;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

@@ -34,6 +41,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -55,6 +64,14 @@
    private TVipOrderService vipOrderService;
    @Resource
    private AppUserClient appUserClient;
    @Resource
    private OtherClient otherClient;
    @Resource
    private TVipOrderRefundService vipOrderRefundService;
    
    
    
    @RequiresPermissions(value = {"/vipOrder"}, logical = Logical.OR)
    @PostMapping("/getVipOrderList")
    @ApiOperation(value = "列表查询", tags = {"管理后台-会员订单"})
    public AjaxResult<PageInfo<TVipOrder>> getVipOrderList(@RequestBody VipShoppingOrderQuery query) {
@@ -67,24 +84,54 @@
        PageInfo<TVipOrder> res = vipOrderService.pageList(query);
        return AjaxResult.success(res);
    }
    
    
    @RequiresPermissions(value = {"/vipOrder/add"}, logical = Logical.OR)
    @PostMapping("/addVipOrder")
    @ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
    public R<Long> addVipOrder(@RequestBody TVipOrder dto) {
        List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode()).list();
        if (!list.isEmpty())return R.fail("订单编号已存在");
        if (dto.getId()!=null){
            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode())
                    .ne(TVipOrder::getId, dto.getId()).list();
            if (!list.isEmpty())return R.fail("订单编号已存在");
        }else{
            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode()).list();
            if (!list.isEmpty())return R.fail("订单编号已存在");
        }
        vipOrderService.saveOrUpdate(dto);
        return R.ok(dto.getId());
    }
    
    
    @PostMapping("/addVipOrder1")
    public R<Long> addVipOrder1(@RequestBody TVipOrder dto) {
        if (dto.getId()!=null){
            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode())
                    .ne(TVipOrder::getId, dto.getId()).list();
            if (!list.isEmpty())return R.fail("订单编号已存在");
        }else{
            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode()).list();
            if (!list.isEmpty())return R.fail("订单编号已存在");
        }
        vipOrderService.saveOrUpdate(dto);
        return R.ok(dto.getId());
    }
    
    
    
    @RequiresPermissions(value = {"/vipOrder/del"}, logical = Logical.OR)
    @GetMapping("/deleteVipOrder")
    @ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
    public AjaxResult deleteVipOrder(String id) {
        vipOrderService.removeBatchByIds(Arrays.asList(id.split(",")));
        vipOrderService.update(new LambdaUpdateWrapper<TVipOrder>().in(TVipOrder::getId, Arrays.asList(id.split(",")))
                .set(TVipOrder::getDelFlag, 1));
        return AjaxResult.success();
    }
    
    

    @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);
        one.setPaymentStatus(2);
@@ -93,18 +140,31 @@
        giveVipDto.setVipId(one.getVipId());
        giveVipDto.setType(one.getVipType());
        giveVipDto.setUserIds(one.getAppUserId().toString());



        appUserClient.giveVip(giveVipDto);

        return R.ok();

    }


    @Resource
    private OtherClient otherClient;

    @PostMapping("/vipWxRefund")
    public void vipWxRefund(@RequestParam("out_refund_no") String out_refund_no,
                            @RequestParam("refund_id") String refund_id,
                            @RequestParam("tradeState") String tradeState,
                            @RequestParam("success_time") String success_time){
        if("SUCCESS".equals(tradeState)){
            TVipOrderRefund vipOrderRefund = vipOrderRefundService.getOne(new LambdaUpdateWrapper<TVipOrderRefund>().eq(TVipOrderRefund::getRefundCode, out_refund_no));
            vipOrderRefund.setRefundSerialNumber(refund_id);
            vipOrderRefund.setRefundStatus(2);
            vipOrderRefund.setRefundTime(LocalDateTime.parse(success_time, DateTimeFormatter.ofPattern("yyyy-MM-DDTHH:mm:ss+TIMEZONE")));
            vipOrderRefundService.updateById(vipOrderRefund);
            TVipOrder vipOrder = vipOrderService.getById(vipOrderRefund.getVipOrderId());
            vipOrder.setRefundStatus(2);
            vipOrderService.updateById(vipOrder);
        }
    }


    

    @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "导出")
    @PutMapping(value = "/export")