商城订单导出

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dto/OrderDetailVo.java

@@ -1,11 +1,17 @@
 package com.yonge.cooleshow.admin.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.yonge.cooleshow.admin.enums.OpenTypeEnum;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class OrderDetailVo{
@@ -25,17 +31,20 @@ public class OrderDetailVo{
     @ExcelProperty("订单号")
     private String orderSn;
 
+    @ExcelIgnore
+    private OpenTypeEnum openTypeEnum;
+
     @ExcelProperty(value = "收款渠道")
-    private OpenTypeEnum openType;
+    private String openType;
 
     @ExcelProperty("收款账户")
-    private String merNo;
+    private String merNos;
 
     @ExcelProperty("订单金额")
     private BigDecimal expectAmount;
 
     @ExcelProperty("到账时间")
-    private Date paymentType;
+    private Date paymentTime;
 
     @ExcelProperty("商品货号")
     private String productSn;
@@ -46,6 +55,12 @@ public class OrderDetailVo{
     @ExcelProperty("商品规格")
     private String productSpecification;
 
+    @ExcelIgnore
+    private String productAttr;
+
+    @ExcelProperty("商品属性")
+    private String productAttrDesc;
+
     @ExcelProperty("数量")
     private Integer productQuantity;
 
@@ -66,4 +81,33 @@ public class OrderDetailVo{
 
     @ExcelProperty("备注")
     private String note;
+
+    public String getProductAttr() {
+        return productAttr;
+    }
+
+    public void setProductAttr(String productAttr) {
+        this.productAttr = productAttr;
+        if(StringUtils.isNotEmpty(productAttr)){
+            try {
+                List<JSONObject> list = JSON.parseArray(productAttr,JSONObject.class);
+                StringBuffer sb = new StringBuffer();
+                for (JSONObject jsonObject : list) {
+                    sb.append(jsonObject.get("key")).append(":").append(jsonObject.get("value")).append(";");
+                }
+                this.productAttrDesc = sb.toString();
+            }catch (Exception e){
+
+            }
+        }
+    }
+
+    public OpenTypeEnum getOpenTypeEnum() {
+        return openTypeEnum;
+    }
+
+    public void setOpenTypeEnum(OpenTypeEnum openTypeEnum) {
+        this.openTypeEnum = openTypeEnum;
+        this.openType = openTypeEnum.getMsg();
+    }
 }

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/enums/OpenTypeEnum.java

@@ -4,7 +4,6 @@ public enum OpenTypeEnum {
     ORIGINAL("微信支付宝"),
     ADAPAY("汇付"),
     ;
-
     private String msg;
 
     OpenTypeEnum(String msg) {

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

@@ -183,10 +183,10 @@
     </select>
     <select id="queryOrderDetail" resultType="com.yonge.cooleshow.admin.dto.OrderDetailVo">
         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,
+               uop.open_type_ openTypeEnum,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) receiverDetailAddress,
-               oo.delivery_company deliveryCompany,oo.delivery_sn deliverySn,oo.note
+               oo.delivery_company deliveryCompany,oo.delivery_sn deliverySn,oo.note,ooi.product_attr productAttr
         from oms_order oo
                  left join mec_dev.student_payment_order spo ON spo.order_no_ = oo.order_sn
                  left join mec_dev.organization o ON o.id_ = spo.organ_id_