update app statement detail api

src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -130,4 +131,6 @@ public interface RetailAppService {
     JSONObject getInvoiceData(JSONObject device, AppQueryBean appQueryBean) throws Exception;
 
     void getInvoiceFile(JSONObject device, AppQueryBean appQueryBean, HttpServletResponse httpResponse) throws Exception;
+
+    Map<String,JSONObject> channelAndDayOfAnalysis(int client_id, String clearingDetailId, String channel, JSONObject device);
 }

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -10,6 +10,7 @@ import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
 import au.com.royalpay.payment.manage.cashback.core.CashbackService;
 import au.com.royalpay.payment.manage.customers.core.CouponValidateService;
 import au.com.royalpay.payment.manage.fund.core.impls.XPlanFundConfigServiceImpl;
+import au.com.royalpay.payment.manage.management.clearing.core.CleanService;
 import au.com.royalpay.payment.manage.mappers.log.AppMessageLogMapper;
 import au.com.royalpay.payment.manage.mappers.log.ClearingDetailAnalysisMapper;
 import au.com.royalpay.payment.manage.mappers.log.ClearingDetailMapper;
@@ -150,7 +151,8 @@ public class RetailAppServiceImp implements RetailAppService {
     private AppActService appActService;
     @Resource
     private LogSettleMailMapper logSettleMailMapper;
-
+    @Resource
+    private CleanService cleanService;
     private Map<String, AppMsgSender> senderMap = new HashMap<>();
 
     @Resource
@@ -293,6 +295,13 @@ public class RetailAppServiceImp implements RetailAppService {
         tradeLogService.exportTransFlow(tradeLogQuery,device,httpResponse);
     }
 
+    @Override
+    public Map<String, JSONObject> channelAndDayOfAnalysis(int client_id, String clearingDetailId, String channel, JSONObject device) {
+        String clientType = device.getString("client_type");
+        deviceSupport.findRegister(clientType);
+        return cleanService.channelAndDayOfAnalysis(client_id, clearingDetailId,channel,device.getJSONObject("client"));
+    }
+
     @Override
     public void updateClient(JSONObject device, AppClientBean appClientBean) {
         String clientType = device.getString("client_type");

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -15,7 +15,6 @@ import au.com.royalpay.payment.manage.settlement.core.ManualSettleSupport;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.manage.signin.core.SignInStatusManager;
 import au.com.royalpay.payment.manage.system.core.ClientContractService;
-import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.device.advise.AppClientController;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
@@ -23,31 +22,22 @@ import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 import au.com.royalpay.payment.tools.merchants.beans.QRCodeConfig;
 import au.com.royalpay.payment.tools.merchants.beans.UpdateSurchargeDTO;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.validation.Errors;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import static au.com.royalpay.payment.tools.CommonConsts.RETAIL_DEVICE;
 
 /**
@@ -137,6 +127,12 @@ public class RetailAppController {
         return retailAppService.getTransactionLogsByClearingDetailId(device, clearing_detail_id, timezone);
     }
 
+    @RequestMapping("/{client_id}/settlement_logs/{clearingDetailId}/analysis/{channel}")
+    public Map<String,JSONObject> channelAndDayOfAnalysis(@PathVariable int client_id, @PathVariable String clearingDetailId,
+                                                          @PathVariable String channel,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
+        return retailAppService.channelAndDayOfAnalysis(client_id, clearingDetailId,channel,device);
+    }
+
     /* 消息模块begin */
     @RequestMapping(value = "/notice", method = RequestMethod.GET)
     public JSONObject listNotices(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, @RequestParam Map<String, Object> params) {

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

@@ -308,7 +308,7 @@
                                 <div class="form-group">
                                     <label class="control-label col-sm-2">Logo</label>
                                     <div class="col-sm-10">
-                                        <img ng-src="{{partner.logo_url}}" ng-if="partner.logo_url" style="height: 100px;">
+                                        <img ng-src="{{partner.logo_url}}" class="col-sm-3 col-xs-5" style="max-height: 100px;width: auto">
                                     </div>
                                 </div>
                                 <div class="form-group" ng-if="partner.abn">
@@ -340,18 +340,18 @@
                                 </div>
                                 <div class="form-group" ng-if="partner.company_photo">
                                     <label class="control-label col-sm-2">Shop Photo</label>
-                                    <div class="col-sm-5"><em>1:</em>&nbsp;
+                                    <div class="col-sm-3 col-xs-5"><em>1:</em>&nbsp;
                                         <div>
-                                            <a target="_blank" ng-href="{{partner.company_photo}}">
+                                            <a class="thumbnail" target="_blank" ng-href="{{partner.company_photo}}">
-                                                <img ng-src="{{partner.company_photo}}" class="thumbnail img-size">
+                                                <img ng-src="{{partner.company_photo}}" style="max-height: 100px">
                                             </a>
                                         </div>
                                     </div>
 
-                                    <div class="col-sm-5" ng-if="partner.store_photo"><em>2:</em>&nbsp;
+                                    <div class="col-sm-3 col-xs-5" ng-if="partner.store_photo"><em>2:</em>&nbsp;
                                         <div>
-                                            <a  target="_blank" ng-href="{{partner.store_photo}}" >
+                                            <a class="thumbnail" target="_blank" ng-href="{{partner.store_photo}}" >
-                                                <img ng-src="{{partner.store_photo}}" class="thumbnail img-size">
+                                                <img ng-src="{{partner.store_photo}}" style="max-height: 100px">
                                             </a>
                                         </div>
                                     </div>