新增订单代码

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyInfo.java

@@ -16,6 +16,8 @@ public class CustomerCompanyInfo implements Serializable {
 
     private String fkCustomerId;
 
+    private String companyType;
+
     private String companyName;
 
     private String orgCode;
@@ -131,4 +133,12 @@ public class CustomerCompanyInfo implements Serializable {
     public void setModifiedTime(Date modifiedTime) {
         this.modifiedTime = modifiedTime;
     }
+
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
 }

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -17,6 +17,10 @@ public class CustomerCompanyInfoForm extends BaseForm {
     private String guid;
 
     private String fkCustomerId;
+    /**
+     * 企业类型
+     */
+    private String companyType;
 
     private String companyName;
 
@@ -45,5 +49,4 @@ public class CustomerCompanyInfoForm extends BaseForm {
 
     private List<String> imageList;
 
-    private Integer companyType;
 }

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -54,11 +54,11 @@ public class GoodsOrderInfoForm extends BaseForm {
     /**
      * 购买起始时间
      */
-    private String beginDate;
+    private String beginTime;
     /**
      * 购买结束时间
      */
-    private String endDate;
+    private String endTime;
     /**
      * 客户账号
      */

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OrderInfoBO.java

@@ -44,6 +44,8 @@ public class OrderInfoBO {
      * 订单状态
      */
     private String orderStatus;
+
+    private String statusNum;
     /**
      * 购买时间
      */

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderInfoMapper.xml

@@ -62,6 +62,7 @@
       ELSE
           '已作废'
       END AS orderStatus,
+       aa.order_status as statusNum,
        aa.create_time AS createTime,
        dd.credential_no AS credentialNo
       FROM
@@ -76,10 +77,10 @@
       AND dd.state = 1
       WHERE
          aa.state=1
-      <if test="data.beginDate!=null and data.beginDate!=''">
+      <if test="data.beginTime!=null and data.beginTime!=''">
         AND aa.create_time >= concat(#{data.beginDate},' 00:00:00')
       </if>
-      <if test="data.endDate!=null and data.endDate!=''">
+      <if test="data.endTime!=null and data.endTime!=''">
         <![CDATA[
         AND aa.create_time <= concat(#{data.endDate},' 23:59:59')
         ]]>