Merge branch 'order' of http://139.159.177.244:3000/yuanye/high-web into order

* 'order' of http://139.159.177.244:3000/yuanye/high-web:
  提交代码

# Conflicts:
#	src/app/admin/order-manage/order-manage.module.ts

src/app/admin/cms/cms-category/cms-category.component.html

@@ -163,6 +163,7 @@
                     <nz-option nzLabel="数据库数据" [nzValue]="6"></nz-option>
                     <nz-option nzLabel="小图一行五个" [nzValue]="7"></nz-option>
                     <nz-option nzLabel="首页背景图" [nzValue]="8"></nz-option>
+                    <nz-option nzLabel="天天好券" [nzValue]="9"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>
@@ -274,8 +275,15 @@
             </nz-form-label>
             <nz-form-control [nzSm]="14" [nzXs]="24">
                 <nz-select formControlName="type" nzAllowClear nzPlaceHolder="请选择类型" nzShowSearch>
-                    <nz-option nzLabel="cms内容" [nzValue]="1"></nz-option>
+                    <nz-option nzLabel="小图一行四个" [nzValue]="1"></nz-option>
-                    <nz-option nzLabel="数据库数据" [nzValue]="2"></nz-option>
+                    <nz-option nzLabel="轮播图" [nzValue]="2"></nz-option>
+                    <nz-option nzLabel="消息通知" [nzValue]="3"></nz-option>
+                    <nz-option nzLabel="大图展示" [nzValue]="4"></nz-option>
+                    <nz-option nzLabel="一横图三小图" [nzValue]="5"></nz-option>
+                    <nz-option nzLabel="数据库数据" [nzValue]="6"></nz-option>
+                    <nz-option nzLabel="小图一行五个" [nzValue]="7"></nz-option>
+                    <nz-option nzLabel="首页背景图" [nzValue]="8"></nz-option>
+                    <nz-option nzLabel="天天好券" [nzValue]="9"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.html

@@ -1,8 +1,7 @@
 <!-- start 面包屑 -->
 <app-breadcrumb></app-breadcrumb>
 <!-- end 面包屑 -->
-
+<nz-spin [nzSpinning]="loadingObject.status"  [nzTip]="loadingObject.title">
-
 <!-- start 搜索条件 -->
 <div [@openClose]="isCollapse ? 'open' : 'closed'">
     <div class="inner-content">
@@ -132,7 +131,7 @@
 <div class="inner-content">
     <span>共计 {{total?total:0}} 条数据</span>
     <div class="operating-button">
-<!--        <button nz-button nzType="primary" class="right-btn" (click)="exportExcel()" ><i nz-icon nzType="export" nzTheme="outline"></i>导出Excel</button>-->
+        <button nz-button nzType="primary" class="right-btn" (click)="excelOrder(searchForm.value)" ><i nz-icon nzType="export" nzTheme="outline"></i>导出Excel</button>
     </div>
 
     <!--数组表格 -->
@@ -187,6 +186,7 @@
         </tbody>
     </nz-table>
 </div>
+</nz-spin>
 
 <nz-modal [(nzVisible)]="orderDetailModal" nzTitle="交易详情" (nzOnCancel)="orderDetailModal = false" [nzFooter]="null"
           nzWidth="1000px" [nzBodyStyle]=" { padding: '20px 20px 30px 20px'}">

src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts

@@ -7,6 +7,7 @@ import {CommonsService} from '../../../../services/commons.service';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {NzMessageService} from 'ng-zorro-antd';
 import {OrderThirdPartyService} from '../../../../services/order/order-third-party.service';
+import {environment} from "../../../../../environments/environment";
 
 
 @Component({
@@ -65,6 +66,13 @@ export class KfcOrderListComponent implements OnInit {
     orderDetailObject: any = {
         tradeOrder: {},
     };
+    // 数据加载中参数
+    loadingObject = {
+        title: '加载中...',
+        status: false,
+    };
+    // 请求地址参数
+    FILE_URL = environment.imageUrl;
   constructor(
       private form: FormBuilder,
       private store: LocalStorageService,
@@ -86,6 +94,7 @@ export class KfcOrderListComponent implements OnInit {
           companyId: [null],
           payType: [null],
           memCardNo: [null],
+          productType: [2],
       });
       // 角色类型初始化
       this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType);
@@ -110,7 +119,6 @@ export class KfcOrderListComponent implements OnInit {
         }
         whereObject['pageNum'] = this.pageNum;
         whereObject['pageSize'] = this.pageSize;
-        whereObject['productType'] = 2;
         this.thirdPartyOrder.getOrderList(whereObject, data => {
             this.loading = false;
             if (data['return_code'] === '000000') {
@@ -138,6 +146,20 @@ export class KfcOrderListComponent implements OnInit {
 
     }
 
+    // 导出数据
+    public excelOrder(whereObject) {
+        this.loadingObject.status = true;
+        this.loadingObject.title = '数据导出中...';
+        this.thirdPartyOrder.exportThirdPartyOrderList(whereObject, data => {
+            if (data['return_code'] === '000000') {
+                window.location.href = this.FILE_URL + 'temporary/' + data['return_data'];
+            } else {
+                this.message.error(data['return_msg']);
+            }
+            this.loadingObject.status = false;
+        });
+    }
+
 }
 
 

src/app/admin/order-manage/order-manage-routing.module.ts

@@ -7,6 +7,10 @@ import {OrderRefundListComponent} from './order-refund-list/order-refund-list.co
 import {KfcOrderListComponent} from './kfc-order/kfc-order-list/kfc-order-list.component';
 import {StarbucksOrderListComponent} from './starbucks-order/starbucks-order-list/starbucks-order-list.component';
 import {MemberChargeOrderListComponent} from './member-charge-order/member-charge-order-list/member-charge-order-list.component';
+import {OrderHListComponent} from '../order/order-h-list/order-h-list.component';
+import {PreOrderComponent} from '../order/pre-order/pre-order.component';
+import {DiscountUseConditionListComponent} from '../order/discount-use-condition-list/discount-use-condition-list.component';
+import {DicountPackageOrderListComponent} from '../order/dicount-package-order-list/dicount-package-order-list.component';
 
 
 const routes: Routes = [
@@ -16,7 +20,11 @@ const routes: Routes = [
   { path: 'order-refund-list', component: OrderRefundListComponent },
   { path: 'order-kfc-list', component: KfcOrderListComponent},
   { path: 'order-starbucks--list', component: StarbucksOrderListComponent},
-  { path: 'order-member-charge--list', component: MemberChargeOrderListComponent}
+  { path: 'order-member-charge--list', component: MemberChargeOrderListComponent},
+  { path: 'order-h-list', component: OrderHListComponent },
+  { path: 'pre-order', component: PreOrderComponent },
+  { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent },
+  { path: 'discount-package-order-list', component: DicountPackageOrderListComponent},
 ];
 
 @NgModule({

src/app/services/order/order-third-party.service.ts

@@ -32,11 +32,24 @@ export class OrderThirdPartyService {
      * @methodName getOrderDetail
      * @Description // 根据订单号查询订单详情
      * @Date 14:38 2022/10/28
-     * @Param
+     * @Param orderNo: string, callBack
      */
     public getOrderDetail(orderNo: string, callBack) {
         this.http.get(environment.orderUrl + 'thirdParty/getOrderDetail?orderNo=' + orderNo).subscribe(data => {
             callBack(data);
         });
     }
+
+    /**
+     * @Author Sum1Dream
+     * @methodName exportThirdPartyOrderList
+     * @Description // 导出第三方订单表格
+     * @Date 10:07 2022/11/1
+     * @Param param: object, callBack
+     */
+    public exportThirdPartyOrderList(param: object, callBack) {
+        this.http.get(environment.orderUrl + 'thirdParty/exportThirdPartyOrderList?' + this.common.getWhereCondition(param)).subscribe(data => {
+            callBack(data);
+        });
+    }
 }