提交代码

src/app/admin/config-manage/third-product/third-product.component.html

@@ -99,6 +99,7 @@
                     <nz-option nzLabel="优惠券包" [nzValue]="7"></nz-option>
                     <nz-option nzLabel="汇联通充值" [nzValue]="8"></nz-option>
                     <nz-option nzLabel="实物商品" [nzValue]="10"></nz-option>
+                    <nz-option nzLabel="团购套餐" [nzValue]="17"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

src/app/admin/coupon/coupon-routing.module.ts

@@ -5,6 +5,7 @@ import {CouponEditComponent} from './coupon-edit/coupon-edit.component';
 import {CouponDetailComponent} from './coupon-detail/coupon-detail.component';
 import {SalesCodeListComponent} from './sales-code-list/sales-code-list.component';
 import { BlxCouponComponent } from './blx-coupon/blx-coupon.component';
+import {ScPrinterListComponent} from "./sc-printer-list/sc-printer-list.component";
 
 
 const routes: Routes = [
@@ -12,7 +13,8 @@ const routes: Routes = [
   { path: 'coupon-edit', component: CouponEditComponent },
   { path: 'coupon-detail', component: CouponDetailComponent },
   { path: 'salesCode-list', component: SalesCodeListComponent },
-  {path:'blx-coupon',component:BlxCouponComponent}
+  {path:'blx-coupon',component:BlxCouponComponent},
+  {path:'sc-printer-list',component:ScPrinterListComponent}
 ];
 
 @NgModule({

src/app/admin/coupon/coupon.module.ts

@@ -13,10 +13,12 @@ import {RichtextModule} from '../../common/richtext/richtext.module';
 import {AppCommonModule} from '../../app-common.module';
 import { SalesCodeListComponent } from './sales-code-list/sales-code-list.component';
 import { BlxCouponComponent } from './blx-coupon/blx-coupon.component';
+import { ScPrinterListComponent } from './sc-printer-list/sc-printer-list.component';
 
 @NgModule({
     declarations: [CouponListComponent, CouponEditComponent, CouponDetailComponent, SalesCodeListComponent,
-        BlxCouponComponent],
+        BlxCouponComponent,
+        ScPrinterListComponent],
     imports: [
         CommonModule,
         CouponRoutingModule,

src/app/admin/discount/discount-edit/discount-edit.component.html

@@ -23,17 +23,6 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
-<!--            <div nz-col [nzSpan]="8">
-                <nz-form-item>
-                    <nz-form-label [nzFor]="'discountName'" nzRequired>门店id</nz-form-label>
-                    <nz-form-control nzErrorTip="请选择平台!">
-                        <nz-select nzPlaceHolder="请选择优惠券类型"  [formControlName]="'discountType'">
-                            <nz-option nzValue="HSG" nzLabel="嗨森逛"></nz-option>
-                            <nz-option nzValue="GRATIA_PAY" nzLabel="惠支付"></nz-option>
-                        </nz-select>
-                    </nz-form-control>
-                </nz-form-item>
-            </div>-->
             <div nz-col [nzSpan]="8">
                 <nz-form-item>
                     <nz-form-label [nzFor]="'discountName'" nzRequired>优惠券名称</nz-form-label>

src/app/app-common.module.ts

@@ -81,6 +81,7 @@ import {MsgTypePipe} from './pipes/msg/msg-type.pipe';
 import { OrderProductTypePipe } from './pipes/order/order-product-type.pipe';
 import { LogisticsStatusPipe } from './pipes/goods/logistics-status.pipe';
 import { GoodsStatusPipe } from './pipes/goods/goods-status.pipe';
+import { ScPrinterPipe } from './pipes/api-coupon/sc-printer.pipe';
 
 
 
@@ -156,7 +157,8 @@ const PIPES = [
     ReceiveTypePipe,
     LogisticsStatusPipe,
     OrderProductTypePipe,
-    GoodsStatusPipe
+    GoodsStatusPipe,
+    ScPrinterPipe,
 ];
 
 

src/app/pipes/index.ts

@@ -63,3 +63,4 @@ export * from './apiMerchant/verify-product-type.pipe';
 export * from './order/order-product-type.pipe';
 export * from './goods/logistics-status.pipe';
 export * from './goods/goods-status.pipe';
+export * from './api-coupon/sc-printer.pipe';

src/app/pipes/third-product/product-type.pipe.ts

@@ -15,6 +15,7 @@ export class ProductTypePipe implements PipeTransform {
         7: ['优惠券包'],
         8: ['汇联通充值'],
         10: ['实物购买'],
+        17: ['团购套餐'],
     };
 
     transform(type: number , product: number): string {

src/app/services/coupon.service.ts

@@ -178,6 +178,17 @@ export class CouponService {
     });
   }
 
+  /**
+   * 获取四川中石油卡券
+   *
+   * @param callBack 返回参数
+   */
+  public synCouponRule(callBack) {
+    this.http.get(environment.baseUrl + 'apiCoupon/synCouponRule').subscribe(data => {
+      callBack(data);
+    });
+  }
+
 
 
   /**

src/environments/environment.ts

@@ -5,11 +5,9 @@
 export const environment = {
   production: false,
   baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  // orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
+  orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
   // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  //   baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
-  //   orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-    orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+  // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
   imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',