Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	pom.xml
#	src/main/java/au/com/royalpay/payment/manage/merchants/enums/paymentScenarioEnum.java
#	src/main/java/au/com/royalpay/payment/manage/openim/core/OpenimClient.java
#	src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html
#	src/main/ui/static/payment/partner/templates/add_partner.html

pom.xml

@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
-        <docker-image.version>1.0.22</docker-image.version>
+        <docker-image.version>1.0.23</docker-image.version>
     </properties>
 
     <dependencies>

src/main/java/au/com/royalpay/payment/manage/merchants/enums/paymentScenarioEnum.java

@@ -45,4 +45,4 @@ public enum paymentScenarioEnum {
         this.scenarioTypeId = scenarioTypeId;
         this.desc = desc;
     }
-}
+}

src/main/java/au/com/royalpay/payment/manage/posters/core/PosterService.java

@@ -0,0 +1,9 @@
+package au.com.royalpay.payment.manage.posters.core;
+
+
+/**
+ * create by todking at 2019-6-3
+ */
+public interface PosterService {
+    void updatePoster(String imgUrl);
+}

src/main/java/au/com/royalpay/payment/manage/posters/core/impls/PosterServiceImpl.java

@@ -0,0 +1,35 @@
+package au.com.royalpay.payment.manage.posters.core.impls;
+
+import au.com.royalpay.payment.manage.posters.core.PosterService;
+import cn.yixblog.platform.http.HttpRequestGenerator;
+import com.alibaba.fastjson.JSONObject;
+import com.yeepay.shade.org.apache.http.protocol.HTTP;
+import org.apache.http.entity.StringEntity;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.net.URISyntaxException;
+
+
+/**
+ * create by todking at 2019-6-3
+ */
+
+@Service
+public class PosterServiceImpl implements PosterService {
+    @Value("${app.cms.host}")
+    private String cmsHost;
+
+    @Override
+    public void updatePoster(String imgUrl) {
+        String url = cmsHost + "/api/statistics/count";
+        try {
+            new HttpRequestGenerator(url, RequestMethod.PUT).addQueryString("imgUrl", imgUrl).execute();
+        }catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+}

src/main/java/au/com/royalpay/payment/manage/posters/web/posterController.java

@@ -0,0 +1,25 @@
+package au.com.royalpay.payment.manage.posters.web;
+
+
+import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
+import au.com.royalpay.payment.manage.posters.core.PosterService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * create by todking at 2019-6-3
+ */
+@RestController
+@RequestMapping(value = "/app/poster")
+public class posterController {
+
+    @Resource
+    private PosterService posterService;
+
+    @RequestMapping(method = RequestMethod.PUT)
+    public void updatePoster(@RequestBody JSONObject img ){
+        posterService.updatePoster(img.getString("imgUrl"));
+    }
+}

src/main/resources/application.properties

@@ -139,7 +139,7 @@ settle.abafile.bank.NAB.account-name=Tunnel Show Pty Ltd
 
 # 瀚银Secure
 app.hanyin-secure.pid=ROYALPAY
-app.hanyin-secure.sftp-host=180.168.61.86
+app.hanyin-secure.sftp-host=180.168.61.93
 app.hanyin-secure.sftp-port=28480
 app.hanyin-secure.sftp-username=royalpay
 app.hanyin-secure.sftp-pwd=royalpay

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.xml

@@ -3,53 +3,50 @@
 <mapper namespace="au.com.royalpay.payment.manage.mappers.payment.RefundMapper">
 
     <select id="listOrderRefunds" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT
+        SELECT r.*,
-            r.*,
+               a.audit_result,
-            a.audit_result,
+               a.auditorname,
-            a.auditorname,
+               a.audittime
-            a.audittime
         FROM pmt_refunds r
-            LEFT JOIN pmt_refund_applies a ON a.refund_id = r.refund_id
+                 LEFT JOIN pmt_refund_applies a ON a.refund_id = r.refund_id
         WHERE r.order_id = #{order_id}
     </select>
     <select id="findRefundInfoByDay" resultType="com.alibaba.fastjson.JSONObject">
          <![CDATA[
-        SELECT
+        SELECT IFNULL(SUM(prf.amount), 0)      total_refund_amount,
-            IFNULL(SUM(prf.amount), 0)      total_refund_amount,
+               IFNULL(COUNT(prf.refund_id), 0) total_refund_count,
-            IFNULL(COUNT(prf.refund_id), 0) total_refund_count,
+               MAX(prf.amount)                 max_refund_amount
-            MAX(prf.amount)                 max_refund_amount
         FROM pmt_refunds prf
         WHERE prf.create_time <= #{end}
-              AND prf.create_time >= #{begin}
+          AND prf.create_time >= #{begin}
-              AND prf.status IN ('2', '4', '5')
+          AND prf.status IN ('2', '4', '5')
         ]]>
     </select>
     <select id="findClientMoniker" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT DISTINCT sysc.*
         FROM sys_clients sysc,
-            pmt_refunds prf
+             pmt_refunds prf
         WHERE prf.create_time <= #{end}
-              AND prf.create_time >= #{begin}
+          AND prf.create_time >= #{begin}
-              AND prf.amount = #{amount}
+          AND prf.amount = #{amount}
-              AND sysc.client_id = prf.client_id
+          AND sysc.client_id = prf.client_id
-              AND prf.status IN ('2', '4', '5')
+          AND prf.status IN ('2', '4', '5')
         ]]>
     </select>
     <select id="listRefundCount" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-        SELECT
+        SELECT count(1)        refund_counts,
-            count(1)        refund_counts,
+               sum(ptr.clearing_amount) refund_amount,
-            sum(prf.amount) refund_amount,
+               sysc.client_moniker
-            sysc.client_moniker
+        FROM sys_clients sysc
-        FROM pmt_refunds prf,
+                 inner join pmt_refunds prf on prf.client_id = sysc.client_id and prf.create_time <= #{end}
-            sys_clients sysc
+            AND prf.create_time >= #{begin}
-        WHERE prf.create_time <= #{end}
+                 inner join pmt_transactions ptr on ptr.refund_id = prf.refund_id and ptr.transaction_type = 'Debit' and
-              AND prf.create_time >= #{begin}
+                                                    ptr.system_generate = 0
-              AND prf.client_id = sysc.client_id
-              AND prf.status IN ('2', '4', '5')
         GROUP BY prf.client_id
         ORDER BY refund_amount DESC
+        limit 30
         ]]>
     </select>
     <select id="listRefundDate" resultType="com.alibaba.fastjson.JSONObject">
@@ -57,7 +54,7 @@
         SELECT *
         FROM calendar
         WHERE datelist >= #{begin}
-              AND datelist <= #{end}
+          AND datelist <= #{end}
         ORDER BY datelist ASC
         ]]>
     </select>
@@ -71,53 +68,53 @@
     </select>
     <select id="listUnionAllApply" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        	order_id order_id,
+        order_id order_id,
-        	client_id client_id,
+        client_id client_id,
-        	create_time create_time,
+        create_time create_time,
-        	confirm_time confirm_time,
+        confirm_time confirm_time,
-        	operator_name operator_name,
+        operator_name operator_name,
-        	`status` `status` ,
+        `status` `status` ,
-            amount amount,
+        amount amount,
-            currency currency,
+        currency currency,
-        	1 type
+        1 type
         FROM
-        	pmt_refunds
+        pmt_refunds
         <where>
             <if test="client_id!=null">
-              and  client_id = #{client_id}
+                and client_id = #{client_id}
+            </if>
+            <if test="start_time!=null">
+                and create_time &gt;= #{start_time}
+            </if>
+            <if test="start_time!=null">
+                and create_time &lt;= #{end_time}
+            </if>
+            <if test="client_ids!=null">
+                client_id in
+                <foreach collection="client_ids" open="(" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
             </if>
-        <if test="start_time!=null">
-          and  create_time &gt;= #{start_time}
-        </if>
-        <if test="start_time!=null">
-           and create_time &lt;= #{end_time}
-        </if>
-        <if test="client_ids!=null">
-            client_id in
-            <foreach collection="client_ids" open="(" close=")" separator="," item="item">
-                #{item}
-            </foreach>
-        </if>
         </where>
-        	UNION ALL
+        UNION ALL
         SELECT
-        	ra.order_id order_id,
+        ra.order_id order_id,
-        	ra.client_id client_id,
+        ra.client_id client_id,
-        	ra.applytime create_time,
+        ra.applytime create_time,
-        	ra.audittime confirm_time,
+        ra.audittime confirm_time,
-        	ra.auditorname operator_name,
+        ra.auditorname operator_name,
-        	ra.audit_result `status` ,
+        ra.audit_result `status` ,
-            r.amount amount,
+        r.amount amount,
-            r.currency currency,
+        r.currency currency,
-        	2 type
+        2 type
         FROM
-        	pmt_refund_applies ra left join pmt_refunds r on ra.refund_id = r.refund_id
+        pmt_refund_applies ra left join pmt_refunds r on ra.refund_id = r.refund_id
         <where>
             <if test="client_id!=null">
-                and  ra.client_id = #{client_id}
+                and ra.client_id = #{client_id}
             </if>
             <if test="start_time!=null">
-                and  ra.applytime &gt;= #{start_time}
+                and ra.applytime &gt;= #{start_time}
             </if>
             <if test="start_time!=null">
                 and ra.applytime &lt;= #{end_time}

src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html

@@ -43,4 +43,4 @@
             </tbody>
         </table>
     </div>
-</section>
+</section>

src/main/ui/static/data/client_offline_desc.json

@@ -1,54 +0,0 @@
-[
-  {
-    "children": [
-      {
-        "children": [],
-        "label": "立牌",
-        "value": "qrcode"
-      },
-      {
-        "children": [],
-        "label": "POS",
-        "value": "pos"
-      }
-    ],
-    "label": "门店",
-    "value": "1"
-  },
-  {
-    "children": [
-      {
-        "children": [],
-        "label": "ipos",
-        "value": "ipos"
-      },
-      {
-        "children": [],
-        "label": "银豹",
-        "value": "pospal"
-      },
-      {
-        "children": [],
-        "label": "aupos",
-        "value": "aupos"
-      },
-      {
-        "children": [],
-        "label": "其他",
-        "value": "other"
-      }
-    ],
-    "label": "收银系统",
-    "value": "2"
-  },{
-    "children": [
-      {
-        "children": [],
-        "label": "无门店",
-        "value": "no-store"
-      }
-    ],
-    "label": "其他",
-    "value": "3"
-  }
-]

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

@@ -465,9 +465,9 @@
                                     <uib-progressbar value="shopPhotoProgress.value"
                                                      ng-if="shopPhotoProgress"></uib-progressbar>
                                     <a target="_blank" ng-if="partner.company_photo" ng-href="{{partner.company_photo}}">
-                                    <img ng-src="{{partner.company_photo}}"
+                                        <img ng-src="{{partner.company_photo}}"
-                                         ng-if="partner.company_photo"
+                                             ng-if="partner.company_photo"
-                                         class="thumbnail img-size col-sm-9">
+                                             class="thumbnail img-size col-sm-9">
                                     </a>
                                 </div>
                                 <div class="col-sm-4">
@@ -480,8 +480,8 @@
                                     <uib-progressbar value="storePhotoProgress.value"
                                                      ng-if="storePhotoProgress"></uib-progressbar>
                                     <a target="_blank" ng-if="partner.store_photo" ng-href="{{partner.store_photo}}">
-                                    <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo"
+                                        <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo"
-                                         class="thumbnail img-size col-sm-9">
+                                             class="thumbnail img-size col-sm-9">
                                     </a>
                                 </div>
                             </div>

src/main/ui/static/templates/payment/success.js

@@ -112,3 +112,20 @@ $(function () {
     });
 
 });
+
+//点击广告统计次数
+function timesCount(imgUrl,linkUrl){
+    $.ajax({
+        data:JSON.stringify({imgUrl:imgUrl}),
+        contentType: 'application/json',
+        url:"/app/poster",
+        method:'PUT',
+        dataType:'text',
+        success: function (data) {
+            window.location.href = linkUrl;
+        },
+        error: function (data) {
+            window.location.href = linkUrl;
+        }
+    });
+}