Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java

@@ -1,5 +1,28 @@
 package au.com.royalpay.payment.manage.analysis.core.impls;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.TreeMap;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang3.time.DurationFormatUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.miemiedev.mybatis.paginator.domain.Order;
+import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
+
 import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
 import au.com.royalpay.payment.manage.analysis.beans.AnalysisBean;
 import au.com.royalpay.payment.manage.analysis.core.DashboardAnalysisTask;
@@ -10,20 +33,6 @@ import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper
 import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.tools.defines.TradeType;
-import com.alibaba.fastjson.JSONObject;
-import com.github.miemiedev.mybatis.paginator.domain.Order;
-import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
-import org.apache.commons.lang3.time.DateUtils;
-import org.apache.commons.lang3.time.DurationFormatUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 /**
  * Created by davep on 2016-07-28.
@@ -272,6 +281,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
     }
 
     @Override
+    @Cacheable(value = ":exchange_rates:", key = "'exchange_rates'+#root.args[0]+#root.args[1]")
     public List<JSONObject> listExchangeRateHistory(String begin, String end) {
         final String[] pattern = {"yyyyMMdd"};
         Date beginDate;

src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html

@@ -105,12 +105,17 @@
                                 </div>
                             </div>
 
-                            <div class="form-group">
+                            <div class="form-group"
-                                <label class="control-label col-sm-3" for="office_phone_input">Office Phone</label>
+                                 ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}">
+                                <label class="control-label col-sm-3" for="office_phone_input">* Office Phone</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_phone"
-                                           type="text" name="office_phone" id="office_phone_input">
+                                           type="tel" name="office_phone" id="office_phone_input" required>
+                                    <div ng-messages="subForm.office_phone.$error" ng-if="subForm.office_phone.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
                                 </div>
+
                             </div>
 
                             <div class="form-group">
@@ -149,7 +154,7 @@
                 <!--</div>-->
                 <!--end 商品二维码-->
                 <div class="btn-group margin-bottom margin-top">
-                    <button ng-disabled="subForm.$dirty&&subForm.$invalid" class="btn btn-success" type="button"
+                    <button class="btn btn-success" type="button"
                             ng-click="saveAppliy(subForm)">Submit
                     </button>
                 </div>

src/main/ui/static/payment/partner/templates/partner_detail.html

@@ -239,7 +239,7 @@
                         <a ui-sref=".product">Product</a>
                     </li>
                     <li ui-sref-active="active" ng-if="('10'|withRole)">
-                        <a ui-sref=".sub_merchant_applicaitons">Sub Merchant Id Applicaitons</a>
+                        <a ui-sref=".sub_merchant_applicaitons">Wechat Merchant Id Applicaitons</a>
                     </li>
                 </ul>
                 <div class="tab-content" ui-view>