From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index 7beaf25..e174a7d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -1,22 +1,40 @@
package com.ruoyi.order.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+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.utils.DateUtils;
+import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
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.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
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.TVipOrderService;
+import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
+import com.ruoyi.other.api.feignClient.OtherClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
import org.omg.CORBA.PRIVATE_MEMBER;
+import org.springframework.beans.BeanUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -51,9 +69,17 @@
}
@PostMapping("/addVipOrder")
@ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
- public AjaxResult addVipOrder(@RequestBody TVipOrder dto) {
+ public R<Long> addVipOrder(@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 AjaxResult.success();
+ return R.ok(dto.getId());
}
@GetMapping("/deleteVipOrder")
@ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
@@ -61,5 +87,73 @@
vipOrderService.removeBatchByIds(Arrays.asList(id.split(",")));
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);
+ 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();
+
+ }
+
+
+ @Resource
+ private OtherClient otherClient;
+
+ @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "导出")
+ @PutMapping(value = "/export")
+ @Log(title = "【申请建桩】导出建桩申请列表", businessType = BusinessType.EXPORT)
+ public void export(String landlordPhone) {
+
+ R<List<TEnterpriseUserApplication>> tnterPrise = otherClient.getTnterPrise();
+ List<TEnterpriseUserApplication> list = tnterPrise.getData();
+ List<TEnterpriseExport> orderInvoiceExports = new ArrayList<>();
+ for (TEnterpriseUserApplication orderInvoiceVO : list) {
+ TEnterpriseExport orderInvoiceExport = new TEnterpriseExport();
+ BeanUtils.copyProperties(orderInvoiceVO,orderInvoiceExport);
+ orderInvoiceExport.setCreateTime(DateUtils.localDateTimeToString(orderInvoiceVO.getCreateTime()));
+ orderInvoiceExports.add(orderInvoiceExport);
+ }
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TEnterpriseExport.class, orderInvoiceExports);
+ HttpServletResponse response = WebUtils.response();
+ response.setCharacterEncoding("utf-8");
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("集团用户导出.xls", "utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ workbook.close();
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ }
+
+
+
+
+ }
--
Gitblit v1.7.1