fix 订单优惠券信息

netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponMapper.java

@@ -16,4 +16,7 @@ public interface CouponMapper extends BaseMapper<Coupon> {
 
 	@Select("select * from `coupon` where id = #{couponId}")
 	Coupon getCouponById(Long couponId);
+
+	@Select("select c.name from coupon c inner join coupon_user cu on cu.coupon_id = c.id where cu.id = #{couponUserId} limit 1")
+	String getCouponNameByCouponUserId(Long couponUserId);
 }

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -76,6 +76,15 @@ public class OrderDonView {
     @DbField("o.created_time")
     private Date createdTime;
 
+    @DbField("o.coupon_user_id")
+    private Long couponUserId;
+
+    @DbIgnore
+    private String couponName;
+
+    @DbField("o.coupon_money")
+    private BigDecimal couponMoney;
+
     @DbIgnore
     private OrderDonWaybill waybill;
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -1,30 +1,25 @@
 package com.cyksj.web.controller.manage;
 
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.manage.coupon.CouponMapper;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.OrderDonTransport;
 import com.cyksj.model.entity.OrderDonWaybill;
-import com.cyksj.model.excel.ExcelOrderDonInfo;
 import com.cyksj.model.manage.request.ReqSetLogisticsPost;
 import com.cyksj.model.manage.views.OrderDonView;
 import com.cyksj.service.mange.CmsOrderDonService;
 import com.cyksj.service.user.UserService;
-import com.cyksj.web.util.EasyExcelUtils;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
 
 /**
  * @author chan
@@ -45,10 +40,18 @@ public class CmsOrderController {
 
     private final BeanSearcher beanSearcher;
 
+    private final CouponMapper couponMapper;
+
 
     @GetMapping("/get")
     public Result<SearchResult<OrderDonView>> get(){
         SearchResult<OrderDonView> search = beanSearcher.search(OrderDonView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+        search.getDataList().forEach(data->{
+            if (data.getCouponUserId() != 0) {
+                data.setCouponName(couponMapper.getCouponNameByCouponUserId(data.getCouponUserId()));
+                data.setCouponMoney(data.getCouponMoney() == null ? BigDecimal.ZERO : data.getCouponMoney());
+            }
+        });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }