订单相关优化

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -77,9 +77,11 @@ public class SysOrder extends BaseEntity {
     private String preSale;
 
     /** 售中ID */
-    @Excel(name = "售中ID")
     private Long onSaleId;
 
+    @Excel(name = "售中")
+    private String onSale;
+
     /**
      * 售后
      */
@@ -235,23 +237,21 @@ public class SysOrder extends BaseEntity {
     private Integer amountFlag;
 
     /** 订单类型 0普通单 1比例拆分单 2体验单 */
-    @Excel(name = "订单类型 0普通单 1比例拆分单 2体验单")
     private String orderType;
 
+    @Excel(name = "订单类型")
+    private String orderTypeName;
+
     /** 订单次数类型 0一开单  1二开单 */
-    @Excel(name = "订单次数类型 0一开单  1二开单")
     private String orderCountType;
 
     /** 订单金额类型 0全款单  1定金单  2尾款单 */
-    @Excel(name = "订单金额类型 0全款单  1定金单  2尾款单")
     private String orderMoneyType;
 
     /** 拆分订单中的主订单id，非拆分订单时，该id都为0 */
-    @Excel(name = "拆分订单中的主订单id，非拆分订单时，该id都为0")
     private Long mainOrderId;
 
     /** 售后二开提成单, 0非提成单 1提成单 */
-    @Excel(name = "售后二开提成单, 0非提成单 1提成单")
     private Integer afterSaleCommissOrder;
 
     /** 删除标记 */

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java

@@ -187,6 +187,11 @@ public class SysOrderServiceImpl implements ISysOrderService {
         setOrderServerEndDate(sysOrder);
         sysOrder.setUpdateBy(SecurityUtils.getUsername());
         sysOrder.setUpdateTime(DateUtils.getNowDate());
+        //体验单
+        /*if("2".equals(sysOrder.getOrderType())){
+
+        }*/
+
         //更新订单
         int row = sysOrderMapper.updateSysOrder(sysOrder);
         // 审核后的订单才生成食谱

stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java

@@ -0,0 +1,26 @@
+package com.stdiet.custom.utils;
+
+import com.stdiet.custom.domain.SysOrder;
+
+public class OrderUtils {
+
+    private static final String[] orderTypeArray = {"普通单","比例拆分单","体验单"};
+
+    private static final String[] orderCountTypeArray = {"一开单","二开单"};
+
+    private static final String[] orderMoneyTypeArray = {"全款单","定金单","尾款单"};
+
+    /**
+     * 根据订单对象获取订单类型名称
+     * @param sysOrder
+     * @return
+     */
+    public static final String getOrderTypeName(SysOrder sysOrder){
+        String orderTypeName = "";
+        orderTypeName += orderTypeArray[Integer.parseInt(sysOrder.getOrderType())];
+        orderTypeName += "/"+orderCountTypeArray[Integer.parseInt(sysOrder.getOrderCountType())];
+        orderTypeName += "/"+orderMoneyTypeArray[Integer.parseInt(sysOrder.getOrderMoneyType())];
+        return orderTypeName;
+    }
+
+}

stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml

@@ -59,7 +59,8 @@
         select o.order_id, o.review_status, o.cus_id, sc.name as customer, sc.phone, o.amount, o.start_time, o.pause_time, o.status, o.weight, ser.dict_label as serve_time,
         o.serve_time_id, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time,
         o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.operator_assis_id,
-        o.recommender, o.order_time,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time,o.become_fan_time
+        o.recommender, o.order_time,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time,o.become_fan_time,
+        o.on_sale_id,o.order_type,o.order_count_type,o.order_money_type,o.main_order_id,o.after_sale_commiss_order
         from sys_order o
         LEFT JOIN sys_customer sc ON sc.id = o.cus_id
         LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_pay_type') AS pay ON pay.dict_value = o.pay_type_id
@@ -368,9 +369,6 @@
       <if test="userId != null">
           and (su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId})
       </if>
-      <!--<if test="beginTime != null and beginTime != ''">
-          AND o.order_time &gt;= #{beginTime}
-      </if>-->
       <if test="endTime != null and endTime != ''">
           AND DATE_FORMAT(o.order_time,'%Y-%m-%d') &lt;= #{endTime}
       </if>