update

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -80,6 +80,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -3116,18 +3117,41 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Override
     public JSONObject getCheckClientInfo(JSONObject account) {
         JSONObject result = clientContractService.getClientContractExpire(account.getIntValue("client_id"));
-        if(PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER){
-            result.put("is_ordinary",true);
+        JSONObject config = sysConfigManager.getSysConfig();
         boolean expire = result.getBoolean("rate_expire");
         boolean waring = result.getBoolean("rate_waring");
+        if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
+            result.put("is_ordinary", true);
             if (!expire && waring) {
-
+                String [] key = {result.getString("expire_days")};
+                result.put("contract_info",editContractOrdinaryWaring(key,config.getString("sys_contract_ordinary_waring")));
+            }
+            if (expire) {
+                result.put("contract_info",config.getString("sys_contract_ordinary_info"));
             }
             return result;
         }
+        result.put("is_ordinary", false);
+        if (!expire && waring) {
+            String [] key = {result.getString("expire_days")};
+            result.put("contract_info",editContractOrdinaryWaring(key,config.getString("sys_contract_waring")));
+        }
+        if (expire) {
+            result.put("contract_info",config.getString("sys_contract_info"));
+        }
         JSONObject file = clientContractService.getOrGenerateSourceAgreement(account.getIntValue("client_id"));
         result.put("file_url", file.getString("file_value"));
-        result.put("contract_info",sysConfigManager.getSysConfig().getString("sys_contract_info"));
+        result.put("contract_info", config.getString("sys_contract_info"));
         return result;
     }
+
+    private String editContractOrdinaryWaring(String[] key, String sourceStr) {
+        if(StringUtils.isEmpty(sourceStr) || ArrayUtils.isEmpty(key)){
+            return "";
+        }
+        for (int i = 0; i < key.length; i++) {
+            sourceStr = sourceStr.replace("{" + i + "}", key[i]);
+        }
+        return sourceStr;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java

@@ -110,6 +110,7 @@ public class ClientContractServiceImpl implements ClientContractService {
                 p.put("create_time",now);
                 p.put("active_time",now);
                 p.put("expiry_time",DateUtils.addYears(now,1));
+                clientRateMapper.saveRate(p);
             });
         }
         if(!expire && waring){
@@ -118,6 +119,7 @@ public class ClientContractServiceImpl implements ClientContractService {
                 p.put("create_time",now);
                 p.put("active_time",DateUtils.addYears(p.getDate("active_time"),1));
                 p.put("expiry_time",DateUtils.addYears(p.getDate("expiry_time"),1));
+                clientRateMapper.saveRate(p);
             });
         }
 
@@ -161,6 +163,7 @@ public class ClientContractServiceImpl implements ClientContractService {
                 result.put("rate_waring", true);
             }
         });
+        result.put("expire_days",(int)(rateInfo.get(0).getDate("expiry_time").getTime()-now.getTime())/(1000*60*60*24));
         return result;
     }
 }