修改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;
@@ -17,9 +19,11 @@
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;
@@ -28,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.*;

@@ -36,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;
@@ -59,6 +66,8 @@
    private AppUserClient appUserClient;
    @Resource
    private OtherClient otherClient;
    @Resource
    private TVipOrderRefundService vipOrderRefundService;
    
    
    
@@ -114,7 +123,8 @@
    @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();
    }
    
@@ -135,6 +145,25 @@
    }



    @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 = "导出")