From fd1ef72dac2a44a6d41b224ce328f3790ad9b940 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 27 Feb 2020 11:27:25 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E8=B7=A8=E5=A2=83=E5=95=86=E5=9F=8ERP?=
 =?UTF-8?q?=E4=BB=98=E8=B4=B9=E6=89=A3=E6=AC=BE=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=89=A3=E6=AC=BE=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../core/impl/RServicesApplyServiceImpl.java  | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ab656a9ea..3928a659a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.63</version>
+    <version>1.3.64</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java
index 85e3afa83..0abb14f85 100644
--- a/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java
@@ -1,6 +1,7 @@
 package au.com.royalpay.payment.manage.rservices.core.impl;
 
 import au.com.royalpay.payment.core.TransactionService;
+import au.com.royalpay.payment.core.mappers.PmtOrderMapper;
 import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientIncrementalMapper;
@@ -64,6 +65,8 @@ public class RServicesApplyServiceImpl implements RServicesApplyService {
     private MailService mailService;
     @Resource
     private ClientIncrementalMapper clientIncrementalMapper;
+    @Resource
+    private PmtOrderMapper pmtOrderMapper;
 
     @Override
     public JSONObject getServicesApply(RServicesApplyQuery applyQuery) {
@@ -157,6 +160,28 @@ public class RServicesApplyServiceImpl implements RServicesApplyService {
         transaction.put("remark", applyInfo.getString("service_code") + ":" + applyInfo.getString("title"));
         transaction.put("system_generate", 1);
         transactionService.saveTransaction(transaction);
+        JSONObject order = new JSONObject();
+        order.put("order_id", orderId);
+        order.put("org_id", client.getIntValue("org_id"));
+        order.put("client_id", applyInfo.getIntValue("client_id"));
+        order.put("transaction_date", new Date());
+        order.put("order_description", applyInfo.getString("title"));
+        order.put("order_detail", applyInfo.getString("title"));
+        order.put("currency", "AUD");
+        order.put("display_amount", applyInfo.getBigDecimal("amount"));
+        order.put("total_amount", applyInfo.getBigDecimal("amount"));
+        order.put("customer_payment_amount", applyInfo.getBigDecimal("amount"));
+        order.put("refund_amount", applyInfo.getBigDecimal("amount"));
+        order.put("customer_ip", "0.0.0.0");
+        order.put("surcharge_rate", "0");
+        order.put("create_time", new Date());
+        order.put("expire_time", new Date());
+        order.put("confirm_time", new Date());
+        order.put("gateway", 0);
+        order.put("status", 7);
+        order.put("channel", "System");
+        pmtOrderMapper.save(order);
+
         sendNotify(applyInfo, client);
     }