[init]订单状态修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderMapper.xml

@@ -6,6 +6,7 @@
     <select id="queryState" resultType="org.jeecg.modules.demo.erp.vo.OrderStateVo">
       SELECT
         count(1) as totalNum,
+        sum(CASE state WHEN -1 THEN 1 ELSE 0 END ) AS unconfirmed,
         sum(CASE state WHEN 0 THEN 1 ELSE 0 END ) AS unpaid,
         sum(CASE state WHEN 1 THEN 1 ELSE 0 END ) AS notSend,
         sum(CASE state WHEN 2 THEN 1 ELSE 0 END) as send,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderStateVo.java

@@ -16,16 +16,20 @@ public class OrderStateVo {
     @ApiModelProperty(value = "总数")
     private java.lang.String totalNum;
     /**未付款*/
+    @Excel(name = "未确认", width = 15)
+    @ApiModelProperty(value = "未确认")
+    private java.lang.String unconfirmed;
+    /**未付款*/
     @Excel(name = "未付款", width = 15)
     @ApiModelProperty(value = "未付款")
     private java.lang.String unpaid;
     /**未发货*/
-    @Excel(name = "未发货", width = 15)
-    @ApiModelProperty(value = "未发货")
+    @Excel(name = "未提货", width = 15)
+    @ApiModelProperty(value = "未提货")
     private java.lang.String notSend;
     /**已发货*/
-    @Excel(name = "已发货", width = 15)
-    @ApiModelProperty(value = "已发货")
+    @Excel(name = "已提货", width = 15)
+    @ApiModelProperty(value = "已提货")
     private java.lang.String send;
     /**完结*/
     @Excel(name = "完结", width = 15)