|
|
@@ -5,16 +5,18 @@ import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.excel.support.ExcelTypeEnum;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.cyksj.common.annotation.Log;
|
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
|
import com.cyksj.common.util.Jsons;
|
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.BusinessType;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
-import com.cyksj.mapper.GoodsDonMapper;
|
|
|
import com.cyksj.mapper.GoodsDonSkuMapper;
|
|
|
+import com.cyksj.mapper.OrderDonMapper;
|
|
|
import com.cyksj.mapper.manage.cms.CmsUserMapper;
|
|
|
import com.cyksj.model.entity.CmsUser;
|
|
|
+import com.cyksj.model.entity.OrderDon;
|
|
|
import com.cyksj.model.excel.ExcelExchangeCodeData;
|
|
|
import com.cyksj.model.request.ExchangeCodeReq;
|
|
|
import com.cyksj.model.views.ExchangeCodeView;
|
|
|
@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
|
|
|
/*
|
|
|
*项目名: netflix
|
|
|
@@ -55,7 +58,7 @@ public class ExchangeCodeController {
|
|
|
|
|
|
private final GoodsDonSkuMapper skuMapper;
|
|
|
|
|
|
- private final GoodsDonMapper goodsDonMapper;
|
|
|
+ private final OrderDonMapper orderDonMapper;
|
|
|
|
|
|
/**
|
|
|
* 生成兑换码 并导出
|
|
|
@@ -96,6 +99,11 @@ public class ExchangeCodeController {
|
|
|
try {
|
|
|
List<Long> skuIds = Jsons.parseList(data.getSkuIds(), Long.class);
|
|
|
data.setTitle(skuMapper.selectExchangeTitle(skuIds));
|
|
|
+ if (data.getUseStatus()) {
|
|
|
+ Optional.ofNullable(orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
|
|
|
+ .eq(OrderDon::getExCode, data.getCode())
|
|
|
+ .last("limit 1"))).ifPresent(exCodeOrder -> data.setOrderId(exCodeOrder.getId()));
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
}
|
|
|
});
|