优化

src/main/java/cn/quantgroup/customer/enums/KdspOrderStatusEnum.java

+package cn.quantgroup.customer.enums;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Objects;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 订单状态枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum KdspOrderStatusEnum {
+    /**
+     * 待付款
+     */
+    WAITING_FOR_PAY(11, "待付款"),
+    /**
+     * 待发货
+     */
+    WAITING_FOR_DELIVERY(12, "待发货"),
+    WAITING_FOR_RECEIVE(13, "待收货"),
+    DELIVERYING_FOR_ORDER(14, "发货中"),
+    /**
+     * 订单完成
+     */
+    FINISH(21, "订单完成"),
+    /**ei
+     * 订单已付款主动取消
+     */
+    PAID_ORDER_CANCEL(31, "订单已付款主动取消"),
+    /**
+     * 只在拆单失败时，才会设置此状态，并且设置pay_status为5待退款
+     */
+    PAID_ORDER_AUTO_CANCEL(32, "订单已付款自动取消"),
+    PAID_ORDER_REJECT_CANCEL(33, "订单拒收取消"),
+    /**
+     * 虚拟充值类订单已付款充值失败系统取消
+     */
+    PAID_VIRTUAL_RECHARGE_FAILED_CANCEL(36, "订单已付款充值失败取消"),
+
+    PAID_ORDER_CANCEL_CLOSE(41, "订单已付款主动取消已退款订单关闭"),
+    PAID_ORDER_AUTO_CANCEL_CLOSE(42, "订单已付款自动取消已退管订单关闭"),
+    NOT_PAY_ORDER_CANCEL_CLOSE(43, "订单未支付主动取消订单关闭"),
+    NOT_PAY_ORDER_TIMEOUT_CLOSE(44, "订单超时未支付订单关闭"),
+    PAID_ORDER_REJECT_CANCEL_CLOSE(45, "订单拒收退款订单关闭"),
+    /**
+     * 虚拟充值类订单 已付款充值失败已退款订单关闭
+     */
+    PAID_VIRTUAL_RECHARGE_FAILED_CANCEL_CLOSE(46, "订单已付款充值失败已退款订单关闭"),
+    SPLIT_ORDER_CLOSE(51, "订单拆单关闭"),
+    ;
+
+    private Integer value;
+    private String desc;
+
+
+    public static Map<Integer,KdspOrderStatusEnum> codeEnumMap = Maps.newHashMap();
+    static {
+        for (KdspOrderStatusEnum value : KdspOrderStatusEnum.values()) {
+            codeEnumMap.put(value.getValue(),value);
+        }
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public static KdspOrderStatusEnum getByCode(Integer status) {
+        if (status == null || status == 0) {
+            return null;
+        }
+        KdspOrderStatusEnum orderStatus = codeEnumMap.get(status);
+        if (Objects.nonNull(orderStatus)) {
+            return orderStatus;
+        }
+        return null;
+    }
+}

src/main/java/cn/quantgroup/customer/enums/ProblemType.java

+package cn.quantgroup.customer.enums;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Objects;
+import lombok.Getter;
+
+@Getter
+public enum ProblemType {
+
+    PRODUCT_CONSULTATION(224, "商品咨询"),
+    SHIPPING_CONSULTATION(225, "发货咨询"),
+    REFUND_CONSULTATION(226, "退款咨询"),
+    LOGISTICS_CONSULTATION(227, "物流咨询"),
+    INVOICE_CONSULTATION(228, "发票咨询"),
+    RESET_PASSWORD(253, "重置密码"),
+    CANCEL_ACCOUNT(254, "注销账户"),
+    PAYMENT_ISSUE(255, "支付问题"),
+    MEMBERSHIP_CONSULTATION(257, "会员咨询"),
+    CHANGE_PHONE_NUMBER(258, "修改手机号"),
+    MERCHANT_REGISTRATION(259, "商家入驻"),
+    SPECIAL_GROUP_CALL(260, "特殊人群来电"),
+    //售前-其他
+    PRE_SALE_OTHER(261, "其他"),
+    REGISTER_ACCOUNT(269, "注册账号"),
+    WALLET_ISSUE(294, "卡包问题"),
+    TEST_USAGE(408, "测试使用"),
+
+
+    /*售中*/
+    URGE_SHIPMENT(231, "催促发货"),
+    URGE_REFUND(232, "催退款"),
+    NO_LOGISTICS_PROGRESS(233, "物流无进度"),
+    CHANGE_ADDRESS(234, "更改地址"),
+    //售中-其他
+    MIDDLE_SALES_OTHER(235, "其他"),
+    MIDDLE_SALES_PAYMENT_ISSUE(252, "支付问题"),
+    LOGISTICS_INTERCEPTION_REJECTION(262, "物流拦截/拒收"),
+    LOGISTICS_EXCEPTION(263, "物流异常"),
+    CONSULT_SHIPMENT_TIMELINESS(266, "咨询发货时效"),
+    CANCEL_ORDER(267, "取消订单"),
+    GIFT_CARD_CONSULTATION(384, "礼品卡咨询"),
+    EXCHANGE_GOODS(388, "换货"),
+    URGE_SHIPMENT_WITHIN_48H(391, "48H内催促发货"),
+    URGE_SHIPMENT_BEYOND_48H(392, "超48H催促发货"),
+    URGE_SHIPMENT_WITHIN_72H(393, "72H内催促发货"),
+    URGE_SHIPMENT_BEYOND_72H(394, "超72H催促发货"),
+    URGE_COLLECTION(395, "催揽收（催促发货）"),
+    URGE_CANCEL_ORDER_REVIEW_WITHIN_TIMELINESS(396, "时效内催取消订单审核"),
+    URGE_CANCEL_ORDER_REVIEW_BEYOND_TIMELINESS(397, "超时催取消订单审核"),
+    URGE_REFUND_REVIEW_WITHIN_TIMELINESS(400, "时效内催仅退款审核"),
+    URGE_REFUND_REVIEW_BEYOND_TIMELINESS(401, "超时催仅退款审核"),
+
+    /*售后*/
+    RETURN_REFUND(237, "退货退款"),
+    PRODUCT_QUALITY_ISSUE(238, "商品质量问题"),
+    SHORTAGE_IN_DELIVERY(239, "漏发/少发"),
+    LOST_DAMAGED_ITEM(240, "丢件/破损"),
+    SHIPPING_COST_REIMBURSEMENT(241, "补运费"),
+    COMPENSATION(242, "赔付"),
+    AFTER_SLAES_URGE_REFUND(243, "催退款"),
+    AFTER_SLAES_INVOICE_CONSULTATION(249, "发票咨询"),
+    OTHER(250, "其他"),
+    INSTALLATION_ISSUE(251, "安装问题"),
+    WRONG_ITEM_DELIVERED(264, "商品错发"),
+    PRICING_ISSUE(265, "价格问题"),
+    SUSPECTED_FAKE_PRODUCT(268, "质疑假货"),
+    EXCHANGE_ISSUE(390, "换货问题"),
+    URGE_AFTERSALES_REVIEW_WITHIN_TIMELINESS(399, "时效内催售后审核"),
+    URGE_AFTERSALES_REVIEW_BEYOND_TIMELINESS(402, "超时催售后审核"),
+    URGE_REFUND_REVIEW(403, "催退款审核"),
+    MAX_MEMBER_REFUND(405, "MAX会员退费"),
+    DIAMOND_MEMBER_REFUND(411, "钻石会员退费"),
+    LOGISTICS_UPLOAD_ERROR(412, "物流上传错误"),
+    TEST(410, "测试"),
+
+    ;
+
+    private final int code;
+    private final String desc;
+
+    public static Map<Integer,ProblemType> codeEnumMap = Maps.newHashMap();
+
+    ProblemType(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    static {
+        for (ProblemType problemType : ProblemType.values()) {
+            codeEnumMap.put(problemType.getCode(),problemType);
+        }
+    }
+
+
+    public static ProblemType getByCode(Integer code) {
+        if (code == null || code == 0) {
+            return null;
+        }
+        ProblemType problemType = codeEnumMap.get(code);
+        if (Objects.nonNull(problemType)) {
+            return problemType;
+        }
+        return null;
+    }
+}

src/main/java/cn/quantgroup/customer/rest/vo/thirdworkorder/ThirdWorkOrderExportVo.java

@@ -107,7 +107,8 @@ public class ThirdWorkOrderExportVo implements Serializable {
    * 订单状态
    */
   @ExcelProperty(value = "订单状态", index = 12)
-  private Integer orderStatus;
+  private String orderStatus;
+
 
   /**
    * 物流单号

src/main/java/cn/quantgroup/customer/service/impl/ThirdWorkOrderServiceImpl.java

 package cn.quantgroup.customer.service.impl;
 
+import cn.quantgroup.customer.enums.KdspOrderStatusEnum;
 import cn.quantgroup.customer.rest.param.mail.SendMailParam;
 import cn.quantgroup.customer.rest.param.thirdworkorder.WorkOrderParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
@@ -353,6 +354,14 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
                     continue;
                 }
                 for (ThirdWorkOrderExportVo orderExportVo : temp){
+                    String orderStatus = exportVo.getOrderStatus();
+                    Integer code = StringUtils.isNotBlank(orderStatus)?Integer.parseInt(orderStatus):null;
+                    KdspOrderStatusEnum orderStatusEnum = KdspOrderStatusEnum.getByCode(code);
+                    if (orderStatusEnum != null){
+                        orderExportVo.setOrderStatus(orderStatusEnum.getDesc());
+                    }
+
+
                     orderExportVo.setId(exportVo.getId());
                     orderExportVo.setProcessInstanceId(exportVo.getProcessInstanceId());
                     orderExportVo.setCreateUser(exportVo.getCreateUser());