优化订单

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

@@ -111,6 +111,9 @@
 		<if test="deliveryFlag != null and deliveryFlag.trim() != ''">
 			AND o.delivery_flag =#{deliveryFlag}
 		</if>
+        <if test="payStatus != null and payStatus.trim() != ''">
+            AND o.pay_status =#{payStatus}
+        </if>
 	</select>
 
 	<!--查询代购订单列表-->
@@ -123,7 +126,7 @@
 		o.order_no,
 		i.item_img,
 		i.item_title,
-		i.item_num,
+		r.item_num,
 		i.item_price,
 		i.item_sku,
 		i.source_item_id,

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

@@ -686,7 +686,7 @@ deliveryFlagFormat = function (cellvalue) {
         } else if (cellvalue == '40') {
             returnStr = "已到达非洲仓";
         } else if (cellvalue == '50') {
-            returnStr = "买家已签收";
+            returnStr = "已签收";
         }
     }
     return returnStr;

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

@@ -155,7 +155,7 @@ let vm = new Vue({
             label: '已到达非洲仓'
         },{
             value: '50',
-            label: '买家已签收'
+            label: '已签收'
         }],
         pickerOptions: {
             shortcuts: [{

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

@@ -168,7 +168,7 @@ let vm = new Vue({
             label: '已到达非洲仓'
         }, {
             value: '50',
-            label: '买家已签收'
+            label: '已签收'
         }],
         payStatusOptions: [{
             value: '20',
@@ -202,7 +202,7 @@ let vm = new Vue({
             label: '已到达非洲仓'
         }, {
             value: '50',
-            label: '买家已签收'
+            label: '已签收'
         }],
         //代购信息
         agentInfo: {
@@ -536,7 +536,7 @@ let vm = new Vue({
                         } else if (item.deliveryFlag === 40) {
                             vm.$set(item, 'deliveryFlag', '已到达非洲仓')
                         } else if (item.deliveryFlag === 50) {
-                            vm.$set(item, 'deliveryFlag', '买家已签收(交易成功)')
+                            vm.$set(item, 'deliveryFlag', '已签收(交易成功)')
                         }
                     })
                 }
@@ -807,7 +807,7 @@ let vm = new Vue({
                         } else if (item.deliveryFlag === 40) {
                             vm.$set(item, 'deliveryFlag', '已到达非洲仓')
                         } else if (item.deliveryFlag === 50) {
-                            vm.$set(item, 'deliveryFlag', '买家已签收(交易成功)')
+                            vm.$set(item, 'deliveryFlag', '已签收(交易成功)')
                         }
                     })
 

platform-common/src/main/java/com/platform/enums/DeliveryStatusEnum.java

@@ -15,7 +15,7 @@ public enum DeliveryStatusEnum implements EnumItemable<DeliveryStatusEnum> {
 	PURCHASE("已采购并发货", 10),
 	ON_LOAD("已到达中国仓", 20),
 	ON_AFRICA("已到达非洲仓", 40),
-	ARRIVALS("买家已签收", 50);
+	ARRIVALS("已签收", 50);
 
 	private String label;
 	private Integer value;