Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.36</version>
+    <version>1.2.39</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -142,6 +142,11 @@
             <artifactId>itext</artifactId>
             <version>2.1.7</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>2.4.8</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

src/document/cn/apis.js

@@ -960,6 +960,19 @@
  * @apiSuccess {String} last_update_date 更新时间
  * @apiSuccess {String} error_code 错误代码
  * @apiSuccess {String} error_msg 错误返回的信息描述
+ * @apiSuccess {String} verify_department 验核机构
+ * @apiSuccess {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess {JSON[]} sub_orders 拆单信息(可能返回多个)
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no 商户子订单号
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY 币种代码
+ * @apiSuccess (SUB_JSON) {Double} order_fee 子订单金额
+ * @apiSuccess (SUB_JSON) {Double} transport_fee 子订单物流金额
+ * @apiSuccess (SUB_JSON) {String} verify_department 验核机构
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess (SUB_JSON) {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code 错误代码
+ * @apiSuccess (SUB_JSON) {String} error_msg 错误返回的信息描述
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
@@ -995,6 +1008,19 @@
  * @apiSuccess {String} last_update_date 更新时间
  * @apiSuccess {String} error_code 错误代码
  * @apiSuccess {String} error_msg 错误返回的信息描述
+ * @apiSuccess {String} verify_department 验核机构
+ * @apiSuccess {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess {JSON[]} sub_orders 拆单信息(可能返回多个)
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no 商户子订单号
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY 币种代码
+ * @apiSuccess (SUB_JSON) {Double} order_fee 子订单金额
+ * @apiSuccess (SUB_JSON) {Double} transport_fee 子订单物流金额
+ * @apiSuccess (SUB_JSON) {String} verify_department 验核机构
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess (SUB_JSON) {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code 错误代码
+ * @apiSuccess (SUB_JSON) {String} error_msg 错误返回的信息描述
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
@@ -1021,6 +1047,19 @@
  * @apiSuccess {String} return_msg 错误描述，仅在执行结果不为SUCCESS情况下出现
  * @apiSuccess {String} order_id RoyalPay订单号
  * @apiSuccess {String} partner_order_id 商户订单ID
+ * @apiSuccess {String} verify_department 验核机构
+ * @apiSuccess {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess {JSON[]} sub_orders 拆单信息(可能返回多个)
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no 商户子订单号
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY 币种代码
+ * @apiSuccess (SUB_JSON) {Double} order_fee 子订单金额
+ * @apiSuccess (SUB_JSON) {Double} transport_fee 子订单物流金额
+ * @apiSuccess (SUB_JSON) {String} verify_department 验核机构
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess (SUB_JSON) {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code 错误代码
+ * @apiSuccess (SUB_JSON) {String} error_msg 错误返回的信息描述
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配

src/document/en/apis.js

@@ -978,6 +978,19 @@
  * @apiSuccess {String} last_update_date Update Time
  * @apiSuccess {String} error_code Error Code
  * @apiSuccess {String} error_msg Error Description
+ * @apiSuccess {String} verify_department Verify Department
+ * @apiSuccess {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess {JSON[]} sub_orders sub_order Child orders
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no  Child order ID
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY Currency
+ * @apiSuccess (SUB_JSON) {Double} order_fee Child Order Amount
+ * @apiSuccess (SUB_JSON) {Double} transport_fee Child Order Logistics Amount
+ * @apiSuccess (SUB_JSON) {String} verify_department Verify Department
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess (SUB_JSON) {String} report_status 0:PROCCESSING,1:SUBMITED,2:FAIL,3:SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code Error Code
+ * @apiSuccess (SUB_JSON) {String} error_msg Error Description
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
@@ -1013,6 +1026,19 @@
  * @apiSuccess {String} last_update_date Update Time
  * @apiSuccess {String} error_code Error Code
  * @apiSuccess {String} error_msg Error Description
+ * @apiSuccess {String} verify_department Verify Department
+ * @apiSuccess {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess {JSON[]} sub_orders sub_order Child orders
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no  Child order ID
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY Currency
+ * @apiSuccess (SUB_JSON) {Double} order_fee Child Order Amount
+ * @apiSuccess (SUB_JSON) {Double} transport_fee Child Order Logistics Amount
+ * @apiSuccess (SUB_JSON) {String} verify_department Verify Department
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess (SUB_JSON) {String} report_status 0:PROCCESSING,1:SUBMITED,2:FAIL,3:SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code Error Code
+ * @apiSuccess (SUB_JSON) {String} error_msg Error Description
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
@@ -1039,6 +1065,19 @@
  * @apiSuccess {String} return_msg Error Description
  * @apiSuccess {String} order_id RoyalPay Order ID
  * @apiSuccess {String} partner_order_id Partner Order ID
+ * @apiSuccess {String} verify_department Verify Department
+ * @apiSuccess {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess {JSON[]} sub_orders sub_order Child orders
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no  Child order ID
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY Currency
+ * @apiSuccess (SUB_JSON) {Double} order_fee Child Order Amount
+ * @apiSuccess (SUB_JSON) {Double} transport_fee Child Order Logistics Amount
+ * @apiSuccess (SUB_JSON) {String} verify_department Verify Department
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess (SUB_JSON) {String} report_status 0:PROCCESSING,1:SUBMITED,2:FAIL,3:SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code Error Code
+ * @apiSuccess (SUB_JSON) {String} error_msg Error Description
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner

src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java

@@ -57,12 +57,12 @@ public class CustomServiceImpl implements CustomService {
         if (report != null) {
             throw new BadRequestException("report record exist");
         }
-        CustomReport customReport = new CustomReport(UUID.randomUUID().toString(),addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
+        CustomReport customReport = new CustomReport(UUID.randomUUID().toString(), addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
                 addCustomVO.getCustom());
         customReport.addExtMchCustom(addCustomVO.getMch_ext_custom_id(), addCustomVO.getMch_ext_custom_name());
         if (!CollectionUtils.isEmpty(addCustomVO.getSubOrders())) {
             addCustomVO.getSubOrders().forEach(p -> {
-                customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee")));
+                customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee")), p.getString("sub_order_no"));
             });
         }
         JSONObject result = customSupport.saveCustom(customReport);

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

@@ -142,7 +142,7 @@
                 <if test="text_type=='all'">
                     and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
                     #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
-                    #{name_pattern} or c.contact_email=#{search_text})
+                    #{name_pattern} or c.contact_email=#{search_text} or c.address = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and c.client_moniker=#{search_text}
@@ -162,6 +162,12 @@
                 <if test="text_type=='remark'">
                     and c.remark like #{name_pattern}
                 </if>
+                <if test="text_type=='email'">
+                    and c.contact_email like #{name_pattern}
+                </if>
+                <if test="text_type=='address'">
+                    and c.address like #{name_pattern}
+                </if>
             </if>
             <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in
@@ -317,7 +323,7 @@
                 <if test="text_type=='all'">
                     and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
                     #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
-                    #{name_pattern} or c.contact_email=#{search_text})
+                    #{name_pattern} or c.contact_email=#{search_text} or c.address = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and c.client_moniker=#{search_text}
@@ -337,6 +343,12 @@
                 <if test="text_type=='remark'">
                     and c.remark like #{name_pattern}
                 </if>
+                <if test="text_type=='email'">
+                    and c.contact_email like #{name_pattern}
+                </if>
+                <if test="text_type=='address'">
+                    and c.address like #{name_pattern}
+                </if>
             </if>
             <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in

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

@@ -84,6 +84,8 @@
                                                     <option value="company_name">Company Name</option>
                                                     <option value="business_name">Business Name</option>
                                                     <option value="remark">Remark</option>
+                                                    <option value="email">Email</option>
+                                                    <option value="address">Address</option>
                                                 </select>
                                             </label>
                                             <div class="col-xs-8 col-sm-4">

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

@@ -83,6 +83,8 @@
                                                     <option value="company_name">Company Name</option>
                                                     <option value="business_name">Business Name</option>
                                                     <option value="remark">Remark</option>
+                                                    <option value="email">Email</option>
+                                                    <option value="address">Address</option>
                                                 </select>
                                             </label>
                                             <div class="col-xs-8 col-sm-4">