订单状态修复

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/bo/OrderInfoBO.java

@@ -77,4 +77,9 @@ public class OrderInfoBO {
      * 商品用途
      */
     private String goodsUse;
+
+    /**
+     * 0无效 1有效
+     */
+    private Integer state;
 }

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/GoodsOrderInfoMapper.xml

@@ -105,7 +105,8 @@
             aa.order_status AS orderStatus,
             aa.order_amount AS orderAmount,
             aa.order_carbon_amount AS orderCarbonAmount,
-            aa.pay_no AS payNo
+            aa.pay_no AS payNo,
+            aa.state
         FROM
             t_goods_order_info aa
         WHERE
@@ -114,9 +115,11 @@
         <if test="orderStatus!=null and orderStatus!=-1">
             <choose>
                 <when test="orderStatus == 1">
+                    AND aa.state = 1
                     AND aa.order_status=1
                 </when>
                 <otherwise>
+                    AND aa.state = 1
                     AND aa.order_status!=1
                 </otherwise>
             </choose>