修改订单列表查询

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

@@ -137,8 +137,8 @@
 		</if>
 	</select>
  	<select id="queryTotal" resultType="int">
-		select count(*) from tb_cf_coupon
-		WHERE 1=1
+		select count(*)from tb_cf_coupon a left join tb_cf_coupon_category b on a.coupon_category_id=b.coupon_category_id
+		WHERE 1=1 and b.enable_flag=1
         <if test="name != null and name.trim() != ''">
             AND name LIKE concat('%',#{name},'%')
         </if>

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

@@ -57,8 +57,11 @@
 	</select>
 	
  	<select id="queryTotal" resultType="int">
-		select count(*) from tb_cf_toicoupon
-		WHERE 1=1
+		select count(*) from tb_cf_toicoupon t
+		left join tb_cf_user_info u on t.user_id=u.user_id
+		left join tb_cf_coupon c on c.coupon_id=t.coupon_id
+		left join tb_cf_coupon_category y on y.coupon_category_id=c.coupon_category_id
+		WHERE 1=1 and u.nick is not null and u.account is not null
         <if test="name != null and name.trim() != ''">
             AND name LIKE concat('%',#{name},'%')
         </if>

platform-admin/src/main/webapp/js/common.js

@@ -660,7 +660,7 @@ payStatusFormat = function (cellvalue) {
  * @returns {string}
  */
 deliveryFlagFormat = function (cellvalue) {
-    var returnStr="等待处理"
+    var returnStr="待采购"
     if(!!cellvalue||cellvalue == '0'){
         if (cellvalue == '10') {
             returnStr = "已代购";