考级报名

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/ExportController.java

@@ -1,20 +1,19 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.alibaba.excel.EasyExcel;
-import com.yonge.cooleshow.admin.dto.*;
+import com.yonge.cooleshow.admin.dto.OmsOrderQueryParam;
+import com.yonge.cooleshow.admin.dto.OrderDetailVo;
 import com.yonge.cooleshow.admin.service.OmsOrderService;
-import com.yonge.cooleshow.mall.common.api.CommonPage;
-import com.yonge.cooleshow.mall.common.api.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.List;
 
 @RestController

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dao/OmsOrderDao.java

@@ -47,5 +47,5 @@ public interface OmsOrderDao {
     List<OrderStatistical> selectOrderCountAndAmount(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
                                                      @Param("dateFormat") String dateFormat);
 
-    List<OrderDetailVo> queryOrderDetail(@Param("param") OmsOrderQueryParam queryParam);
+    List<OrderDetailVo> queryOrderDetail(@Param("queryParam") OmsOrderQueryParam queryParam);
 }

mec-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -185,7 +185,7 @@
         select o.name_ organName,oo.member_id memberId,oo.member_username memberUsername,spo.trans_no_ transNo,oo.order_sn orderSn,
                uop.open_type_ openType,spo.mer_nos_ merNos,spo.expect_amount_ expectAmount,oo.payment_time paymentTime,
                pp.product_sn productSn,ooi.product_name productName,ooi.product_quantity productQuantity,oo.receiver_name receiverName,oo.receiver_phone receiverPhone,
-               CONCAT(oo.receiver_province,oo.receiver_city,oo.receiver_region,oo.receiver_detail_address) receiver_detail_address receiverDetailAddress,
+               CONCAT(oo.receiver_province,oo.receiver_city,oo.receiver_region,oo.receiver_detail_address) receiverDetailAddress,
                oo.delivery_company deliveryCompany,oo.delivery_sn deliverySn,oo.note
         from oms_order oo
                  left join mec_dev.student_payment_order spo ON spo.order_no_ = oo.order_sn