diff --git a/pom.xml b/pom.xml index c27205241..3a2a40de0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ au.com.royalpay.payment payment-parent - 1.1.3 + 1.1.4 4.0.0 manage - 1.2.36 + 1.2.39 UTF-8 @@ -142,6 +142,11 @@ itext 2.1.7 + + org.codehaus.groovy + groovy-all + 2.4.8 + org.apache.poi poi diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index b7c8ae2ff..fb38635bd 100644 --- a/src/document/cn/apis.js +++ b/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 订单号与商户不匹配 diff --git a/src/document/en/apis.js b/src/document/en/apis.js index 5597c2ea1..11108a57c 100644 --- a/src/document/en/apis.js +++ b/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 diff --git a/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java index 96a4b83f3..2b00aba51 100644 --- a/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java +++ b/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); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index d662f1615..14649d122 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -142,7 +142,7 @@ 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}) and c.client_moniker=#{search_text} @@ -162,6 +162,12 @@ and c.remark like #{name_pattern} + + and c.contact_email like #{name_pattern} + + + and c.address like #{name_pattern} + and c.org_id=#{org_id} and c.org_id in @@ -317,7 +323,7 @@ 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}) and c.client_moniker=#{search_text} @@ -337,6 +343,12 @@ and c.remark like #{name_pattern} + + and c.contact_email like #{name_pattern} + + + and c.address like #{name_pattern} + and c.org_id=#{org_id} and c.org_id in diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html index 747b83900..18d6bfe7a 100644 --- a/src/main/ui/static/payment/partner/templates/partner_compliance.html +++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html @@ -84,6 +84,8 @@ + +
diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html index b33cea5ee..7681d526b 100644 --- a/src/main/ui/static/payment/partner/templates/partners.html +++ b/src/main/ui/static/payment/partner/templates/partners.html @@ -83,6 +83,8 @@ + +