提交代码

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

@@ -109,10 +109,11 @@ export class StoreEditComponent implements OnInit {
                 return;
             }
         }
-        if (this.validateForm.value.prestoreType === '0') {
-            if (this.validateForm.value.splitAccountNo == null || this.validateForm.value.splitRate == null) {
-                this.message.error('必填项不能为空');
-                return;
+        if (this.logoFile.length !== 0) {
+            if (this.logoFile[0]['response'] != null) {
+                this.validateForm.value.storeLogo = this.logoFile[0]['response']['return_data'][0];
+            } else {
+                this.validateForm.value.storeLogo = this.logoFile[0].name;
             }
         }
         if (this.editFlag) {

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

@@ -138,9 +138,9 @@
         </nz-form-item>
 
         <nz-form-item>
-            <nz-form-label [nzSpan]="6" nzRequired >商户名称</nz-form-label>
+            <nz-form-label [nzSpan]="6" nzRequired >商户全称</nz-form-label>
             <nz-form-control [nzSpan]="14">
-                <input nz-input placeholder="请输入第三方平台商户名称" formControlName="platformMerName" />
+                <input nz-input placeholder="请输入第三方平台商户全称" formControlName="platformMerName" />
             </nz-form-control>
         </nz-form-item>
 
@@ -168,6 +168,20 @@
             </nz-form-control>
         </nz-form-item>
 
+        <nz-form-item *ngIf="tripartitePlatformForm.value.profitSharingStatus == 'true'">
+            <nz-form-label [nzSpan]="6" nzRequired >接收方商户号</nz-form-label>
+            <nz-form-control [nzSpan]="14">
+                <input nz-input placeholder="分账接收方商户号" formControlName="profitSharingReceiversNumber" />
+            </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item *ngIf="tripartitePlatformForm.value.profitSharingStatus == 'true'">
+            <nz-form-label [nzSpan]="6" nzRequired >接收方全称</nz-form-label>
+            <nz-form-control [nzSpan]="14">
+                <input nz-input placeholder="分账接收方全称" formControlName="profitSharingReceiversName" />
+            </nz-form-control>
+        </nz-form-item>
+
         <div style="text-align: center;">
             <button nz-button nzType="primary" style="width: 150px;" (click)="submitTripartitePlatform()">确定</button>
         </div>

src/app/admin/merchant/merchant-list/merchant-list.component.ts

@@ -66,6 +66,8 @@ export class MerchantListComponent implements OnInit {
       platformMerNumber: [null, [Validators.required]],
       profitSharingStatus: ['false', [Validators.required]],
       profitSharingRatio: [null],
+      profitSharingReceiversNumber: [null],
+      profitSharingReceiversName: [null],
     });
     this.getRequest(true, this.searchForm.value);
   }
@@ -227,6 +229,17 @@ export class MerchantListComponent implements OnInit {
       });
       return;
     }
+    if (this.tripartitePlatformForm.value.profitSharingStatus === 'true'
+      && (this.tripartitePlatformForm.value.profitSharingRatio == null ||
+          this.tripartitePlatformForm.value.profitSharingReceiversNumber == null ||
+          this.tripartitePlatformForm.value.profitSharingReceiversName == null)) {
+        this.modal.warning({
+          nzTitle: '提示',
+          nzContent: '请填写所有必填项',
+        });
+        return;
+    }
+
     this.tripartitePlatformService.editTripartitePlatform(this.tripartitePlatformForm.value, data => {
       if (data['return_code'] === '000000') {
         this.modal.success({