提交代码

src/app/admin/api-merchants/list/list.component.html

@@ -309,7 +309,7 @@
 
 </nz-modal>
 
-<nz-modal [(nzVisible)]="isVisibleConfig" nzTitle="编辑产品折扣" (nzOnCancel)="isVisibleConfig = false" (nzOnOk)="handleOkConfigProduct()">
+<nz-modal [(nzVisible)]="isVisibleConfig" nzTitle="配置可用接口" (nzOnCancel)="isVisibleConfig = false" (nzOnOk)="handleOkConfigProduct()">
     <nz-spin [nzSpinning]="isSpinning"  nzTip="配置中...">
         <nz-checkbox-group [(ngModel)]="checkOptions"></nz-checkbox-group>
     </nz-spin>

src/app/admin/config-manage/integral-rebate/integral-rebate.component.html

@@ -11,60 +11,19 @@
                     <nz-form-label [nzSpan]="6">产品类型</nz-form-label>
                     <nz-form-control [nzSpan]="16">
                         <nz-select nzShowSearch nzAllowClear formControlName="type" nzPlaceHolder="请选择产品类型">
-                            <nz-option nzLabel="卡券" [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]="3"></nz-option>
-                            <nz-option nzLabel="第三方" [nzValue]="4"></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>
             </div>
-            <div nz-col nzSpan="8" *ngIf="searchForm.value.type == 1">
-                <nz-form-item>
-                    <nz-form-label [nzSpan]="6">产品</nz-form-label>
-                    <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择产品">
-                            <nz-option nzValue="1" nzLabel="卡券产品"></nz-option>
-                        </nz-select>
-                    </nz-form-control>
-                </nz-form-item>
-            </div>
-            <div nz-col nzSpan="8" *ngIf="searchForm.value.type == 2">
-                <nz-form-item>
-                    <nz-form-label [nzSpan]="6">产品</nz-form-label>
-                    <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择产品">
-                            <nz-option nzValue="1" nzLabel="在线加油"></nz-option>
-                        </nz-select>
-                    </nz-form-control>
-                </nz-form-item>
-            </div>
-            <div nz-col nzSpan="8" *ngIf="searchForm.value.type == 3">
-                <nz-form-item>
-                    <nz-form-label [nzSpan]="6">产品</nz-form-label>
-                    <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择产品">
-                            <nz-option nzValue="1" nzLabel="电信"></nz-option>
-                            <nz-option nzValue="2" nzLabel="移动"></nz-option>
-                            <nz-option nzValue="3" nzLabel="联通"></nz-option>
-                        </nz-select>
-                    </nz-form-control>
-                </nz-form-item>
-            </div>
-            <div nz-col nzSpan="8" *ngIf="searchForm.value.type == 4">
-                <nz-form-item>
-                    <nz-form-label [nzSpan]="6">产品</nz-form-label>
-                    <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择产品">
-                            <nz-option nzValue="1" nzLabel="星巴克"></nz-option>
-                            <nz-option nzValue="2" nzLabel="肯德基"></nz-option>
-                            <nz-option nzValue="3" nzLabel="会员充值"></nz-option>
-                        </nz-select>
-                    </nz-form-control>
-                </nz-form-item>
-            </div>
-
-
         </div>
 
 
@@ -88,6 +47,7 @@
     <nz-table
             class="table"
             #ajaxTable
+            nzBordered
             nzShowSizeChanger
             [nzFrontPagination]="false"
             [nzData]="requestData"
@@ -103,7 +63,7 @@
             <th nzWidth="60px">编号</th>
             <th nzWidth="120px">积分返利比例</th>
             <th nzWidth="100px">类型</th>
-            <th nzWidth="100px">产品</th>
+<!--            <th nzWidth="100px">产品</th>-->
             <th nzWidth="200px">返利时间范围</th>
             <th nzWidth="120px">创建时间</th>
             <th nzRight nzWidth="80px">操作</th>
@@ -114,7 +74,7 @@
             <td>{{i + 1}}</td>
             <td>{{data.percentage + "%"}}</td>
             <td>{{data.type | integralType}}</td>
-            <td>{{data.type | integralProduct : data.productId}}</td>
+<!--            <td>{{data.type | integralProduct : data.productId}}</td>-->
             <td>{{data.startTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.endTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td nzRight class="table-td-operation">
@@ -136,46 +96,15 @@
             <nz-form-label [nzSpan]="6" nzRequired>产品类型</nz-form-label>
             <nz-form-control [nzSpan]="16" nzErrorTip="请选择产品类型!">
                 <nz-select nzShowSearch nzAllowClear formControlName="type" nzPlaceHolder="请选择产品类型">
-                    <nz-option nzLabel="卡券" [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]="3"></nz-option>
-                    <nz-option nzLabel="第三方" [nzValue]="4"></nz-option>
+                    <nz-option nzLabel="积分充值" [nzValue]="4"></nz-option>
-                </nz-select>
+                    <nz-option nzLabel="购买卡券" [nzValue]="5"></nz-option>
-            </nz-form-control>
+                    <nz-option nzLabel="加油服务" [nzValue]="6"></nz-option>
-        </nz-form-item>
+                    <nz-option nzLabel="优惠券包" [nzValue]="7"></nz-option>
-        <nz-form-item *ngIf="validateForm.value.type == 1">
+                    <nz-option nzLabel="汇联通充值" [nzValue]="8"></nz-option>
-            <nz-form-label [nzSpan]="6" nzRequired>卡券产品</nz-form-label>
+                    <nz-option nzLabel="话费充值" [nzValue]="9"></nz-option>
-            <nz-form-control [nzSpan]="16" nzErrorTip="请选择卡券产品!">
-                <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择卡券产品">
-                    <nz-option [nzValue]="1" nzLabel="卡券产品"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item *ngIf="validateForm.value.type == 2">
-            <nz-form-label [nzSpan]="6" nzRequired>在线加油产品</nz-form-label>
-            <nz-form-control [nzSpan]="16" nzErrorTip="请选择在线加油产品!">
-                <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择在线加油产品">
-                    <nz-option [nzValue]="1" nzLabel="在线加油"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item *ngIf="validateForm.value.type == 3">
-            <nz-form-label [nzSpan]="6" nzRequired>话费产品</nz-form-label>
-            <nz-form-control [nzSpan]="16" nzErrorTip="请选择话费产品!">
-                <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择话费产品">
-                    <nz-option [nzValue]="1" nzLabel="电信"></nz-option>
-                    <nz-option [nzValue]="2" nzLabel="移动"></nz-option>
-                    <nz-option [nzValue]="3" nzLabel="联通"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item *ngIf="validateForm.value.type == 4">
-            <nz-form-label [nzSpan]="6" nzRequired>第三方产品</nz-form-label>
-            <nz-form-control [nzSpan]="16" nzErrorTip="请选择第三方产品!">
-                <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择第三方产品">
-                    <nz-option [nzValue]="1" nzLabel="星巴克"></nz-option>
-                    <nz-option [nzValue]="2" nzLabel="肯德基"></nz-option>
-                    <nz-option [nzValue]="3" nzLabel="会员充值"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>
@@ -185,7 +114,6 @@
                 <nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm:ss' }" formControlName="time"></nz-range-picker>
             </nz-form-control>
         </nz-form-item>
-
         <nz-form-item>
             <nz-form-label [nzSpan]="6" nzRequired>积分返利比例</nz-form-label>
             <nz-form-control [nzSpan]="16" nzErrorTip="请输入积分返利比例!">

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

@@ -37,6 +37,7 @@
     <nz-table
             class="table"
             #ajaxTable
+            nzBordered
             nzShowSizeChanger
             [nzFrontPagination]="false"
             [nzData]="requestData"

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

@@ -157,7 +157,6 @@
             <th nzWidth="100px">订单金额</th>
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="100px">支付方式</th>
-            <th nzWidth="140px">支付卡号</th>
             <th nzWidth="100px">订单状态</th>
             <th nzWidth="180px">创建时间</th>
             <th nzWidth="110px" nzRight="0px">操作</th>
@@ -171,7 +170,6 @@
             <td>￥{{data.totalPrice}}</td>
             <td>￥{{data.payPrice}}</td>
             <td>{{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}}</td>
-            <td>{{data.memCardNo}}</td>
             <td>{{data.orderStatus | orderStatus}}</td>
             <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight="0px" class="table-td-operation">

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

@@ -7,7 +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";
+import {environment} from '../../../../../environments/environment';
 
 
 @Component({

src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html

@@ -158,7 +158,6 @@
             <th nzWidth="100px">订单金额</th>
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="100px">支付方式</th>
-            <th nzWidth="140px">支付卡号</th>
             <th nzWidth="100px">订单状态</th>
             <th nzWidth="180px">创建时间</th>
             <th nzWidth="110px" nzRight="0px">操作</th>
@@ -172,7 +171,6 @@
             <td>￥{{data.totalPrice}}</td>
             <td>￥{{data.payPrice}}</td>
             <td>{{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}}</td>
-            <td>{{data.memCardNo}}</td>
             <td>{{data.orderStatus | orderStatus}}</td>
             <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight="0px" class="table-td-operation">

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

@@ -7,11 +7,12 @@ 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 {OrderListComponent} from '../recharge-order/order-list/order-list.component';
 import {DiscountUseConditionListComponent} from './discount-use-condition-list/discount-use-condition-list.component';
 import {DicountPackageOrderListComponent} from './dicount-package-order-list/dicount-package-order-list.component';
 import {PreOrderComponent} from './pre-order/pre-order.component';
 
+
+
 const routes: Routes = [
   { path: 'order-oil-list', component: OrderOilListComponent },
   { path: 'order-coupon-list', component: OrderCouponListComponent },
@@ -20,7 +21,7 @@ const routes: Routes = [
   { path: 'order-kfc-list', component: KfcOrderListComponent},
   { path: 'order-starbucks--list', component: StarbucksOrderListComponent},
   { path: 'order-member-charge--list', component: MemberChargeOrderListComponent},
-  { path: 'mobile-recharge-order-list', component: OrderListComponent },
+  //{ path: 'mobile-recharge-order-list', component: MobileRechargeOrderListComponent },
   { path: 'pre-order', component: PreOrderComponent },
   { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent },
   { path: 'discount-package-order-list', component: DicountPackageOrderListComponent},

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

@@ -21,7 +21,9 @@ import {NzSpaceModule} from 'ng-zorro-antd/space';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 
 @NgModule({
-  declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent],
+  declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent,
+    // MobileRechargeOrderListComponent,
+    PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent],
   imports: [
     CommonModule,
     OrderManageRoutingModule,

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

@@ -158,7 +158,6 @@
             <th nzWidth="100px">订单金额</th>
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="100px">支付方式</th>
-            <th nzWidth="140px">支付卡号</th>
             <th nzWidth="100px">订单状态</th>
             <th nzWidth="180px">创建时间</th>
             <th nzWidth="110px" nzRight="0px">操作</th>
@@ -172,7 +171,6 @@
             <td>￥{{data.totalPrice}}</td>
             <td>￥{{data.payPrice}}</td>
             <td>{{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}}</td>
-            <td>{{data.memCardNo}}</td>
             <td>{{data.orderStatus | orderStatus}}</td>
             <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight="0px" class="table-td-operation">

src/app/admin/recharge-order/order-list/order-list.component.ts

@@ -8,9 +8,9 @@ import {IconService} from '../../../services/icon.service';
 import {RechargeService} from '../../../services/recharge.service';
 import {NzMessageService, NzModalService, NzUploadChangeParam} from 'ng-zorro-antd';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace";
+import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
-import {CompanyService} from "../../../services/company.service";
+import {CompanyService} from '../../../services/company.service';
-import {LocalStorageService} from "../../../services/local-storage.service";
+import {LocalStorageService} from '../../../services/local-storage.service';
 
 @Component({
     selector: 'app-order-list',

src/app/pipes/integral/integral-type.pipe.ts

@@ -8,13 +8,23 @@ export class IntegralTypePipe implements PipeTransform {
     transform(value: number): string {
         switch (value) {
             case 1:
-                return '卡券';
+                return '星巴克';
             case 2:
-                return '在线加油';
+                return '肯德基';
             case 3:
-                return '话费';
+                return '会员充值';
             case 4:
-                return '第三方';
+                return '积分充值';
+            case 5:
+                return '购买卡券';
+            case 6:
+                return '加油服务';
+            case 7:
+                return '优惠券包';
+            case 8:
+                return '汇联通充值';
+            case 9:
+                return '话费充值';
         }
     }
 

src/app/pipes/recharge-status.pipe.ts

@@ -15,6 +15,8 @@ export class RechargeStatusPipe implements PipeTransform {
         return '充值失败';
       case 204:
         return '未充值';
+        case 205:
+        return '充值异常';
     }
   }
 

src/environments/environment.ts

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