修改一个小bug

platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java

@@ -247,8 +247,8 @@ public class TbCfOrderController extends AbstractController {
         //查询列表数据
         OrderBasicVo orderBasicVo = tbCfOrderListService.queryorderBasic(orderId);
         orderBasicVo.setAtcTime("35天（day）");
-        orderBasicVo.setCountry("赞比亚（Zambia）");
-        orderBasicVo.setSource("APP");
+//        orderBasicVo.setCountry("赞比亚（Zambia）");
+        orderBasicVo.setSource(orderBasicVo.getOrderSource().toString());
         orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId));
         return R.ok().put("orderBasicVo", orderBasicVo);
     }

platform-admin/src/main/java/com/platform/vo/OrderBasicVo.java

@@ -33,6 +33,8 @@ public class OrderBasicVo implements Serializable {
     private Date updateTime;
     private BigDecimal itemsPrice;
 
+    private Integer orderSource;
+
     public BigDecimal getItemsPrice() {
         return itemsPrice;
     }
@@ -232,4 +234,12 @@ public class OrderBasicVo implements Serializable {
     public void setRealityPay(BigDecimal realityPay) {
         this.realityPay = realityPay;
     }
+
+    public Integer getOrderSource() {
+        return orderSource;
+    }
+
+    public void setOrderSource(Integer orderSource) {
+        this.orderSource = orderSource;
+    }
 }

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

@@ -186,7 +186,8 @@
 		o.order_time,
 		o.order_status,
 		o.remark_info,
-		o.update_time
+		o.update_time,
+		o.order_source
 		from tb_cf_order o
 		LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
 		LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id

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

@@ -375,10 +375,10 @@ let vm = new Vue({
             }, {
                 type: '订单来源',
                 data: 18
-            }, {
+            },/* {
                 type: '订单地区',
                 data: 18
-            }, {
+            },*/ {
                 type: '交易流水号',
                 data: 18
             }, {
@@ -840,15 +840,22 @@ let vm = new Vue({
                         vm.tranSuccessful = false;
                         vm.orderClose = true;
                     }
-
+                    let source;
+                    if(r.orderBasicVo.source==1){
+                        source='APP';
+                    }else if(r.orderBasicVo.source==2){
+                        source='PC';
+                    }else if(r.orderBasicVo.source==3){
+                        source='MOBILE';
+                    }
                     vm.basicInfoData[0].data = r.orderBasicVo.orderNo;
                     vm.basicInfoData[1].data = r.orderBasicVo.userName;
                     vm.basicInfoData[2].data = r.orderBasicVo.atcTime;
-                    vm.basicInfoData[3].data = r.orderBasicVo.source;
-                    vm.basicInfoData[4].data = r.orderBasicVo.country;
+                    vm.basicInfoData[3].data = source;
+                    // vm.basicInfoData[4].data = r.orderBasicVo.country;
                     vm.basicInfoData[5].data = r.orderBasicVo.payId;
                     vm.basicInfoData[6].data = r.orderBasicVo.payWayCode;
-                    vm.basicInfoData[7].data = r.orderBasicVo.couponTitle;
+                    // vm.basicInfoData[7].data = r.orderBasicVo.couponTitle;
                     vm.recipientsData[0].recipients = r.orderBasicVo.deliveryName;
                     vm.recipientsData[0].phone = r.orderBasicVo.deliveryPhone
                     vm.recipientsData[0].email = r.orderBasicVo.email;