提交商品添加

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

@@ -2,11 +2,13 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import {AuditCouponComponent} from './audit-coupon/audit-coupon.component';
 import {RefundAuditComponent} from './refund-audit/refund-audit.component';
+import {GoodsAuditComponent} from './goods-audit/goods-audit.component';
 
 
 const routes: Routes = [
   { path: 'coupon-audit', component: AuditCouponComponent },
   { path: 'refund-audit', component: RefundAuditComponent },
+  { path: 'goods-audit', component: GoodsAuditComponent },
 ];
 
 @NgModule({

src/app/admin/audit/audit.module.ts

@@ -9,10 +9,11 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
 import { RefundAuditComponent } from './refund-audit/refund-audit.component';
+import { GoodsAuditComponent } from './goods-audit/goods-audit.component';
 
 
 @NgModule({
-  declarations: [AuditCouponComponent, RefundAuditComponent],
+  declarations: [AuditCouponComponent, RefundAuditComponent, GoodsAuditComponent],
   imports: [
     CommonModule,
     AuditRoutingModule,

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

@@ -5,6 +5,7 @@ import {BrandComponent} from './brand/brand.component';
 import {ThirdProductComponent} from './third-product/third-product.component';
 import {MemberProductComponent} from './member-product/member-product.component';
 import {IntegralRebateComponent} from './integral-rebate/integral-rebate.component';
+import {FreightComponent} from './freight/freight.component';
 
 
 const routes: Routes = [
@@ -13,6 +14,7 @@ const routes: Routes = [
   { path: 'third-product', component: ThirdProductComponent },
   { path: 'member-product', component: MemberProductComponent },
   { path: 'integral-rebate', component: IntegralRebateComponent },
+  { path: 'freight', component: FreightComponent },
 ];
 
 @NgModule({

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

@@ -13,11 +13,12 @@ import { ThirdProductComponent } from './third-product/third-product.component';
 import {AppCommonModule} from '../../app-common.module';
 import { MemberProductComponent } from './member-product/member-product.component';
 import { IntegralRebateComponent } from './integral-rebate/integral-rebate.component';
-import {PreviewImageModule} from "../../common/preview-image/preview-image.module";
+import {PreviewImageModule} from '../../common/preview-image/preview-image.module';
+import { FreightComponent } from './freight/freight.component';
 
 
 @NgModule({
-  declarations: [GoodsTypeComponent, BrandComponent, ThirdProductComponent, MemberProductComponent, IntegralRebateComponent],
+  declarations: [GoodsTypeComponent, BrandComponent, ThirdProductComponent, MemberProductComponent, IntegralRebateComponent, FreightComponent],
     imports: [
         CommonModule,
         ConfigManageRoutingModule,

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

@@ -20,6 +20,8 @@
                             <nz-option nzLabel="优惠券包" [nzValue]="7"></nz-option>
                             <nz-option nzLabel="汇联通充值" [nzValue]="8"></nz-option>
                             <nz-option nzLabel="话费充值" [nzValue]="9"></nz-option>
+                            <nz-option nzLabel="普通支付" [nzValue]="101"></nz-option>
+                            <nz-option nzLabel="支付差价" [nzValue]="102"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
@@ -74,8 +76,8 @@
         <tr *ngFor="let data of ajaxTable.data; let i = index">
             <td>{{i + 1}}</td>
             <td>{{data.percentage + "%"}}</td>
-            <td>{{data.firstDistribution + "%"}}</td>
-            <td>{{data.secondDistribution + "%"}}</td>
+            <td>{{data.firstDistribution == null ? 0 : data.firstDistribution+ "%"}}</td>
+            <td>{{data.secondDistribution == null ? 0 : data.secondDistribution + "%"}}</td>
             <td>{{data.type | integralType}}</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>
@@ -107,6 +109,8 @@
                     <nz-option nzLabel="优惠券包" [nzValue]="7"></nz-option>
                     <nz-option nzLabel="汇联通充值" [nzValue]="8"></nz-option>
                     <nz-option nzLabel="话费充值" [nzValue]="9"></nz-option>
+                    <nz-option nzLabel="普通支付" [nzValue]="101"></nz-option>
+                    <nz-option nzLabel="支付差价" [nzValue]="102"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

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

@@ -98,6 +98,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]="10"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

src/app/admin/merchant-store/store-edit/store-edit.component.html

@@ -52,10 +52,27 @@
                         <nz-form-control  nzErrorTip="请选择门店类型!">
                             <nz-select formControlName="type" nzAllowClear nzPlaceHolder="请选择门店类型">
                                 <nz-option  nzValue="1" nzLabel="加油站"></nz-option>
+                                <nz-option  nzValue="2" nzLabel="其他"></nz-option>
                             </nz-select>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
+                <div nz-col [nzSpan]="8">
+                    <nz-form-item>
+                        <nz-form-label [nzFor]="'type'"  nzRequired>行业类型</nz-form-label>
+                        <nz-form-control  nzErrorTip="请选择行业类型!">
+                            <nz-tree-select
+                                    style="width: 200px"
+                                    nzPlaceHolder="请选择行业类型"
+                                    formControlName="industryType"
+                                    [nzDropdownMatchSelectWidth]="true"
+                                    [nzDropdownStyle]="{ 'max-height': '300px' }"
+                                    [nzNodes]="industryTypeData"
+                            >
+                            </nz-tree-select>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>
                 <div nz-col [nzSpan]="8">
                     <nz-form-item>
                         <nz-form-label [nzFor]="'contactName'" nzRequired>联系人</nz-form-label>

src/app/admin/merchant-store/store-edit/store-edit.component.ts

@@ -37,6 +37,7 @@ export class StoreEditComponent implements OnInit {
     previewVisible = false;
     previewImage: string | undefined = '';
     brandData = [];
+    industryTypeData = [];
 
     constructor(
         private fb: FormBuilder,
@@ -61,6 +62,7 @@ export class StoreEditComponent implements OnInit {
             address: [null, [Validators.required]],
             contactName: [null, [Validators.required]],
             prestoreType: [null, [Validators.required]],
+            industryType: [null, [Validators.required]],
             telephone: [null, [Validators.required]],
             latitude: [29.553134, [Validators.required]],
             longitude: [106.565428, [Validators.required]],
@@ -76,6 +78,10 @@ export class StoreEditComponent implements OnInit {
             this.brandData = data['return_data'];
         });
 
+        this.commonsService.getIndustry(data => {
+            this.industryTypeData = data['return_data'];
+        });
+
     }
 
     // 图片查看

src/app/admin/merchant-store/store-list/store-list.component.html

@@ -92,8 +92,8 @@
                         <ul nz-menu nzSelectable>
                             <li class="li-a" nz-menu-item><a (click)="getEdit(data.id)">编辑</a></li>
                             <li class="li-a" nz-menu-item><a (click)="getDetail(data.id)">详情</a></li>
-                            <li class="li-a" nz-menu-item><a *ngIf="data.type == 1" (click)="getQrCode(data.storeKey)">下载油站二维码</a></li>
-                            <li class="li-a" nz-menu-item><a *ngIf="'BTN_add_blance' | button"  (click)="getRecharge(data.id)">增加余额</a></li>
+                            <li class="li-a" *ngIf="data.type == 1"  nz-menu-item><a (click)="getQrCode(data.storeKey)">下载油站二维码</a></li>
+                            <li class="li-a" *ngIf="'BTN_add_blance' | button"  nz-menu-item><a  (click)="getRecharge(data.id)">增加余额</a></li>
                             <li class="li-a" nz-menu-item><a (click)="getDelete(data.id)">删除</a></li>
                             <li class="li-a" nz-menu-item><a [routerLink]="['/admin/device/list']" [queryParams]="{ merStoreId: data.id}">设备管理</a></li>
                         </ul>

src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts

@@ -126,8 +126,8 @@ export class HltChargeOrderComponent implements OnInit {
             whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime();
         }
         if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) {
-            whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime();
-            whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime();
+            whereObject['refundTimeS'] = whereObject['refundTimeArray'][0].getTime();
+            whereObject['refundTimeE'] = whereObject['refundTimeArray'][1].getTime();
         }
 
         if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {

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

@@ -124,8 +124,8 @@ export class KfcOrderListComponent implements OnInit {
             whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime();
         }
         if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) {
-            whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime();
-            whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime();
+            whereObject['refundTimeS'] = whereObject['refundTimeArray'][0].getTime();
+            whereObject['refundTimeE'] = whereObject['refundTimeArray'][1].getTime();
         }
 
         if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {

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

@@ -123,8 +123,8 @@ export class MemberChargeOrderListComponent implements OnInit {
             whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime();
         }
         if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) {
-            whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime();
-            whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime();
+            whereObject['refundTimeS'] = whereObject['refundTimeArray'][0].getTime();
+            whereObject['refundTimeE'] = whereObject['refundTimeArray'][1].getTime();
         }
 
         if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {

src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html

@@ -34,6 +34,10 @@
                             </nz-form-control>
                         </nz-form-item>
                     </div>
+
+                </div>
+
+                <div nz-row *ngIf="isCollapse">
                     <div nz-col nzSpan="8">
                         <nz-form-item>
                             <nz-form-label [nzSpan]="8">交易状态</nz-form-label>
@@ -44,9 +48,6 @@
                             </nz-form-control>
                         </nz-form-item>
                     </div>
-                </div>
-
-                <div nz-row *ngIf="isCollapse">
                     <div nz-col nzSpan="8" *ngIf="roleType == 0 || roleType == 1">
                         <nz-form-item>
                             <nz-form-label [nzSpan]="8">分公司</nz-form-label>

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

@@ -125,8 +125,8 @@ export class MobileRechargeOrderListComponent implements OnInit {
             whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime();
         }
         if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) {
-            whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime();
-            whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime();
+            whereObject['refundTimeS'] = whereObject['refundTimeArray'][0].getTime();
+            whereObject['refundTimeE'] = whereObject['refundTimeArray'][1].getTime();
         }
 
         if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {

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

@@ -12,6 +12,7 @@ import {DicountPackageOrderListComponent} from './dicount-package-order-list/dic
 import {PreOrderComponent} from './pre-order/pre-order.component';
 import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component';
 import {HltChargeOrderComponent} from './hlt-charge-order/hlt-charge-order.component';
+import {GoodsOrderComponent} from './goods-order/goods-order.component';
 
 
 const routes: Routes = [
@@ -27,6 +28,7 @@ const routes: Routes = [
   { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent },
   { path: 'discount-package-order-list', component: DicountPackageOrderListComponent},
   { path: 'hlt-order-list', component: HltChargeOrderComponent},
+  { path: 'goods-order', component: GoodsOrderComponent},
 ];
 
 @NgModule({

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

@@ -21,9 +21,11 @@ import {NzSpaceModule} from 'ng-zorro-antd/space';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component';
 import { HltChargeOrderComponent } from './hlt-charge-order/hlt-charge-order.component';
+import { GoodsOrderComponent } from './goods-order/goods-order.component';
+import {PreviewImageModule} from "../../common/preview-image/preview-image.module";
 
 @NgModule({
-  declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent],
+  declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent, GoodsOrderComponent],
     imports: [
         CommonModule,
         OrderManageRoutingModule,
@@ -34,7 +36,8 @@ import { HltChargeOrderComponent } from './hlt-charge-order/hlt-charge-order.com
         BreadcrumbModule,
         RegionSelectorModule,
         AppCommonModule,
-    NzSpaceModule
+        NzSpaceModule,
+        PreviewImageModule
     ]
 })
 export class OrderManageModule { }

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

@@ -123,8 +123,8 @@ export class StarbucksOrderListComponent implements OnInit {
             whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime();
         }
         if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) {
-            whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime();
-            whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime();
+            whereObject['refundTimeS'] = whereObject['refundTimeArray'][0].getTime();
+            whereObject['refundTimeE'] = whereObject['refundTimeArray'][1].getTime();
         }
 
         if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {

src/app/admin/system/system-user/system-user.component.html

@@ -147,6 +147,13 @@
       </nz-form-control>
     </nz-form-item>
 
+      <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24">渠道商商户号</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+              <input formControlName="ext3"  placeholder="请输入渠道商商户号" nz-input />
+          </nz-form-control>
+      </nz-form-item>
+
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24">通知权限</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
@@ -245,6 +252,13 @@
       </nz-form-control>
     </nz-form-item>
 
+      <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" >渠道商商户号</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+              <input formControlName="ext3" [(ngModel)]="secUser.ext3" placeholder="请输入渠道商商户号" nz-input />
+          </nz-form-control>
+      </nz-form-item>
+
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>通知权限</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">

src/app/admin/system/system-user/system-user.component.ts

@@ -90,6 +90,7 @@ export class SystemUserComponent implements OnInit {
       password: [null, [Validators.required, ValidatorsService.minLength(6), ValidatorsService.maxLength(40)]],
       telephone: [null],
       label: [null],
+      ext3: [null],
       roleId: [null, [Validators.required]],
     });
 
@@ -209,6 +210,7 @@ export class SystemUserComponent implements OnInit {
       password: value.password,
       telephone: value.telephone,
       roleId: value.roleId,
+      ext3: value.ext3,
       labelIdArray: value.label
     };
     this.isOkLoading = true;
@@ -264,6 +266,7 @@ export class SystemUserComponent implements OnInit {
     this.secUser.telephone = value.telephone;
     this.secUser.roleId = value.roleId;
     this.secUser.labelIdArray = value.label;
+    this.secUser.ext3 = value.ext3;
 
     this.http.post(this.WEB_SERVE_URL + '/secUser/editUser', this.secUser).subscribe(data => {
       if (data['return_code'] === '000000') {

src/app/app-common.module.ts

@@ -72,10 +72,12 @@ import {
     ProductConfigPipe,
     PayCouponStatusPipe,
     OrderOilChannelTypePipe,
-    VerifyProductTypePipe
+    VerifyProductTypePipe,
 } from './pipes';
 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';
 
 
 
@@ -147,7 +149,9 @@ const PIPES = [
     MsgTypePipe,
     OrderOilChannelTypePipe,
     VerifyProductTypePipe,
+    LogisticsStatusPipe,
     OrderProductTypePipe,
+    GoodsStatusPipe
 ];
 
 
@@ -161,6 +165,7 @@ const PIPES = [
     ],
     declarations: [
         ...PIPES,
+
     ],
 
     exports: [

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

@@ -13,6 +13,8 @@ export class AuditTypePipe implements PipeTransform {
             return '卡卷价格审批';
         case 3:
             return '卡券分发审批';
+        case 4:
+            return '实物审批';
     }
   }
 }

src/app/pipes/index.ts

@@ -61,3 +61,5 @@ export * from './order/pay-coupon-status.pipe';
 export * from './order/order-oil-channel-type.pipe';
 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';

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

@@ -25,6 +25,10 @@ export class IntegralTypePipe implements PipeTransform {
                 return '汇联通充值';
             case 9:
                 return '话费充值';
+            case 101:
+                return '普通支付';
+            case 102:
+                return '支付差价';
         }
     }
 

src/app/pipes/order/order-child-goods-type.pipe.ts

@@ -27,6 +27,8 @@ export class OrderChildGoodsTypePipe implements PipeTransform {
         return '星巴克';
       case 10:
         return '第三方充值';
+        case 12:
+            return '实物商品';
     }
   }
 }

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

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

src/app/services/commons.service.ts

@@ -183,6 +183,12 @@ export class CommonsService {
         });
     }
 
+    public getIndustry(callback): any {
+        this.http.get(environment.baseUrl + '/common/getIndustry').subscribe( data => {
+            callback(data);
+        });
+    }
+
   public mappingSysNameOl(codeType: string , callback): any {
     this.http.get(environment.baseUrl + '/common/getDictionaryByCodeTypeOl?codeType=' + codeType).subscribe( data => {
       callback(data);
@@ -413,17 +419,43 @@ export class CommonsService {
 
     // 拼接图片内容
     public stitchImg(imgUrl: string): any {
-        const img = imgUrl;
         const imgArray = [];
+        for (const i of imgUrl.split(',')) {
             imgArray.push(
                 {
                     uid: 1,
-                name: img,
+                    name: i,
                     status: 'done',
-                url: environment.imageUrl + img
+                    url: environment.imageUrl + i
                 });
+        }
+        console.log(imgArray);
         return imgArray;
     }
 
+    public postImg(imgArray: any): any {
+        const array = [];
+        for (const i of imgArray) {
+            if (i['response'] != null) {
+                array.push(i['response']['return_data'][0]);
+            } else {
+                array.push(i.name);
+            }
+        }
+
+        return array.join(',');
+    }
+
+    /**
+     * @Author Sum1Dream
+     * @methodName getRegional
+     * @Description // 获取区域信息
+     * @Date 17:23 2023/4/14
+     */
+    public getRegional(callback): any {
+        this.http.get(environment.baseUrl + 'common/getRegional').subscribe(data => {
+            callback(data);
+        });
+    }
 
 }

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

@@ -52,4 +52,6 @@ export class OrderThirdPartyService {
             callBack(data);
         });
     }
+
+
 }

src/environments/environment.ts

@@ -5,7 +5,9 @@
 export const environment = {
   production: false,
   baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+  orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
+  //   baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  //   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=',