合并自建站代码到话费修改

src/app/admin/order/oil-station-order/oil-station-order.component.ts

@@ -11,7 +11,7 @@ import {LocalStorageService} from '../../../services/local-storage.service';
 import {CommonsService} from '../../../services/commons.service';
 import {WebsocketService} from '../../../services/websocket.service';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
-import {MerchantStoreService} from "../../../services/merchant-store.service";
+import {MerchantStoreService} from '../../../services/merchant-store.service';
 
 @Component({
   selector: 'app-oil-station-order',

src/app/app-common.module.ts

@@ -47,7 +47,8 @@ import {
     PriceStatusPipe,
     GasStaffStatusPipe,
     PayStatusPipe,
-    ChlidRechargeStatusPipe
+    ChlidRechargeStatusPipe,
+    SourceTypePipe
 } from './pipes';
 import {OilCardStatusPipe} from './pipes';
 import {OilTypePipe} from './pipes/store/oil-type.pipe';
@@ -100,6 +101,7 @@ const PIPES = [
     OilPriceTaskPriceTypePipe,
     PayStatusPipe,
     ChlidRechargeStatusPipe,
+    SourceTypePipe,
 ];
 
 

src/app/app-routing.module.ts

@@ -127,6 +127,16 @@ const routes: Routes = [
                 loadChildren: () => import('./admin/gas-oil-price/gas-oil-price.module').then(m => m.GasOilPriceModule),
                 canActivate: [InitGuardService]
             },
+            {
+                path: 'api-product',
+                loadChildren: () => import('./admin/api-product/api-product.module').then(m => m.ApiProductModule),
+                canActivate: [InitGuardService]
+            },
+            {
+                path: 'api-merchants',
+                loadChildren: () => import('./admin/api-merchants/api-merchants.module').then(m => m.ApiMerchantsModule),
+                canActivate: [InitGuardService]
+            },
         ],
     },
 ];

src/app/pipes/index.ts

@@ -37,3 +37,4 @@ export * from './recharge-price/recharge-platform.pipe';
 export * from './recharge-price/price-status.pipe';
 export * from './pay-status.pipe';
 export * from './chlid-recharge-status.pipe';
+export * from './apiMerchant/source-type.pipe';

src/app/services/commons.service.ts

@@ -388,4 +388,18 @@ export class CommonsService {
         });
     }
 
+    /**
+     * 发送充值短信验证码
+     *
+     * @param  phone  手机号
+     * @param  merchantId  手机号
+     * @param  price  手机号
+     * @param  callBack   回调
+     */
+    public sendRechargeSmsCode(phone: string, merchantId: number, price: string, callBack) {
+        this.http.get(environment.baseUrl + 'sendSms/sendRechargeSmsCodeByMchId?phone=' + phone + '&merchantId=' + merchantId + '&price=' + price).subscribe(data => {
+            callBack(data);
+        });
+    }
+
 }

src/app/services/order.service.ts

@@ -8,6 +8,7 @@ import {CommonsService} from './commons.service';
 })
 export class OrderService {
 
+
   constructor(
       private http: HttpClient,
       private common: CommonsService