修改订单列表查询

platform-admin/src/main/java/com/platform/task/FeeTask.java

@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 物流状态定时修改
+ * 汇率定时修改
  */
 @Component("FeeTask")
 public class FeeTask {

platform-admin/src/main/resources/com/platform/dao/TbCfOrderDao.xml

@@ -171,10 +171,10 @@
 			AND o.pay_status=#{payStatus}
 		</if>
 		<if test="deliveryFlag != null and deliveryFlag.trim() != ''">
-			AND o.delivery_flag=#{deliveryFlag}
+			AND i.delivery_flag=#{deliveryFlag}
 		</if>
 		<if test="orderStatus != null and orderStatus.trim() != ''">
-			AND o.order_status=#{orderStatus}
+			AND i.order_status=#{orderStatus}
 		</if>
 	</select>
 

platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml

@@ -55,7 +55,7 @@
 			AND f.pay_way_code =#{payWayCode}
 		</if>
 		<if test="deliveryFlag != null and deliveryFlag.trim() != ''">
-			AND o.delivery_flag =#{deliveryFlag}
+			AND i.delivery_flag =#{deliveryFlag}
 		</if>
 		<choose>
 			<when test="sidx != null and sidx.trim() != ''">
@@ -94,7 +94,7 @@
 			AND f.pay_way_code =#{payWayCode}
 		</if>
 		<if test="deliveryFlag != null and deliveryFlag.trim() != ''">
-			AND o.delivery_flag =#{deliveryFlag}
+			AND i.delivery_flag =#{deliveryFlag}
 		</if>
 	</select>
 

platform-admin/src/main/webapp/js/sys/tbcforderList.js

@@ -60,7 +60,7 @@ let vm = new Vue({
         tbCfOrderList: {},
         deliveryFlagOptions:[{
             value: '0',
-            label: '等待处理'
+            label: '待采购'
         },{
             value: '10',
             label: '已代购'