gsb

xggsve-merchant/app/base/service/impl/channel/saaschannelSve.js

@@ -133,10 +133,14 @@ class SaasChannelService extends ServiceBase {
     channel.contact_addr = this.trim(params.contact_addr);
 
     channel.term = term;
-    channel.term_end = term_end;
-
+    if(term_end) {
+      channel.term_end = term_end;
+    }
     channel.validity = validity;
-    channel.validity_end = validity_end;
+    if(validity_end) {
+      channel.validity_end = validity_end;
+    }
+    
 
     if (channel.id) {
       await channel.save();

xggsve-merchant/app/base/service/impl/merchant/saasmerchantSve.js

@@ -162,11 +162,14 @@ class SaasMerchantService extends ServiceBase {
     merchant.contact_email = this.trim(params.contact_email);
     merchant.contact_addr = this.trim(params.contact_addr);
 
-    merchant.term = term;
-    merchant.term_end = term_end;
-
-    merchant.validity = validity;
-    merchant.validity_end = validity_end;
+    channel.term = term;
+    if(term_end) {
+      channel.term_end = term_end;
+    }
+    channel.validity = validity;
+    if(validity_end) {
+      channel.validity_end = validity_end;
+    }
 
     let self = this;
     if (merchant.id) {