From b4544295a80ce01c6cec83468bba260770a45040 Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 11 Jan 2019 10:30:47 +0800 Subject: [PATCH 01/46] pom ver --- .../manage/system/core/impl/TradeSecureServiceHanyinImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java index d686ddf7d..18bd9dc9f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java @@ -74,7 +74,7 @@ public class TradeSecureServiceHanyinImpl implements TradeSecureService { logger.debug("mk dir:{}", dir); command.mkdir(dir); } - String dest = dir + file.filename(); + String dest = dir + "/" + file.filename(); logger.debug("find dir, start uploading file:{}", dest); command.put(new ByteArrayInputStream(file.content()), dest); } catch (IOException | JSchException | SftpException e) { From 2272e5146b65e7b8299a781c7b28410f6c6c251c Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 11 Jan 2019 15:42:42 +0800 Subject: [PATCH 02/46] add store_name --- .../partner/templates/add_partner.html | 28 +++++++++++++++++-- .../templates/apply_rpay_sub_merchant_id.html | 25 +++++++++++++---- .../templates/apply_wx_sub_merchant_id.html | 10 +++---- .../partner/templates/partner_edit.html | 22 +++++++++++++-- 4 files changed, 69 insertions(+), 16 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index 89a606210..f604935cf 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -77,16 +77,16 @@ + maxlength="50">

short name for WeChat payment display and partner name

+ ng-if="partnerForm.short_name.$dirty">

Required Field

Less - Than 15 + Than 50 Characters(including symbols and spaces)

@@ -107,6 +107,28 @@ +
+ +
+ +

store name for WeChat payment display + and partner + name

+
+

Required + Field

+

Less + Than 15 + Characters(including symbols and spaces)

+
+
+
+ + + + + + + + + + + + +
- + ng-class="{'has-error':subForm.merchant_storename.$invalid && subForm.merchant_storename.$dirty}"> +
- -
+ +

Required Field

-

Length is more than 15

+

Length is more than 50

diff --git a/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html index 58b227e73..66a9105bc 100644 --- a/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html +++ b/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html @@ -39,12 +39,12 @@
- + ng-class="{'has-error':subForm.merchant_storename.$invalid && subForm.merchant_storename.$dirty}"> +
- -
+ +

Required Field

Length is more than 50

diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index 3c21c5fe7..8acf92830 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -62,13 +62,13 @@
+ id="short-name-input" required maxlength="50">

short name for WeChat payment display and partner name

Required Field

-

Less Than 15 +

Less Than 50 Characters(including symbols and spaces)

@@ -86,6 +86,24 @@
+
+ +
+ +

short name for WeChat payment display and partner + name

+
+

Required Field

+

Less Than 15 + Characters(including symbols and spaces)

+
+
+
+
From 7f28b588f07cd8239fc52d67622ac0622dd47a10 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 11 Jan 2019 15:52:29 +0800 Subject: [PATCH 03/46] add store_name --- .../static/payment/partner/templates/partner_detail.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index b363e245e..91a66c91b 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -326,6 +326,14 @@

+
+

+

+ 注意:（微信渠道可能不合规） +

+
+
From 422891997a73d90c8b2a9aabf2c14c02d1441417 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 11 Jan 2019 16:22:07 +0800 Subject: [PATCH 04/46] add store_name --- .../merchants/beans/SubMerchantIdApply.java | 12 +++++----- .../core/impls/ClientManagerImpl.java | 2 +- .../partner/templates/add_partner.html | 2 +- .../templates/apply_rpay_sub_merchant_id.html | 2 +- .../templates/apply_wx_sub_merchant_id.html | 2 +- .../partner/templates/partner_detail.html | 3 +++ .../partner/templates/partner_edit.html | 23 ++++++++++++++++--- 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java index 4d1a843a4..5929151c5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java @@ -22,8 +22,8 @@ public class SubMerchantIdApply { private String merchant_id; @NotBlank(message = "error.payment.valid.param_missing") @Length(max = 20) - @JSONField(name = "short_name") - private String merchant_shortname; + @JSONField(name = "store_name") + private String merchant_storename; @NotBlank(message = "error.payment.valid.param_missing") @Length(max = 20) @JSONField(name = "company_phone") @@ -51,8 +51,8 @@ public class SubMerchantIdApply { if(StringUtils.isNotEmpty(merchant_name)){ params.put("merchant_name",merchant_name); } - if(StringUtils.isNotEmpty(merchant_shortname)){ - params.put("merchant_shortname",merchant_shortname); + if(StringUtils.isNotEmpty(merchant_storename)){ + params.put("merchant_shortname",merchant_storename); } if(StringUtils.isNotEmpty(office_phone)){ params.put("office_phone",office_phone); @@ -101,11 +101,11 @@ public class SubMerchantIdApply { } public String getMerchant_shortname() { - return this.merchant_shortname; + return this.merchant_storename; } public void setMerchant_shortname(String merchant_shortname) { - this.merchant_shortname = merchant_shortname; + this.merchant_storename = merchant_shortname; } public String getOffice_phone() { diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index e891f3789..a2a5ff480 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -3763,7 +3763,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid yeepayConfig.put("industry",merchantInfo.getString("industry")); yeepayConfig.put("business_content",merchantInfo.getString("business_content")); yeepayConfig.put("business_licence",merchantInfo.getString("business_licence")); - yeePayClientConfigMapper.update(yeepayConfig); +// yeePayClientConfigMapper.update(yeepayConfig); yeepayConfig.put("company_website",merchantInfo.getString("company_website")); yeepayConfig.put("abn",merchantInfo.getString("abn")); yeepayConfig.put("mode","UPDATE"); diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index f604935cf..bddcbe312 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -109,7 +109,7 @@
-
- -
+
- -

store name for WeChat payment display and partner - name

-
-

Required Field

-

Less Than 15 - Characters(including symbols and spaces)

-
+ +

store name for WeChat payment display and partner + name

+
+
From a0e26003824411a03b55508248700a5178885eb4 Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 14 Jan 2019 17:52:23 +0800 Subject: [PATCH 08/46] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20store=5Fname=20?= =?UTF-8?q?=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/templates/add_partner.html | 2 +- .../partner/templates/partner_edit.html | 49 +++++++++++++------ 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index 94b38db5c..f901be34f 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -113,7 +113,7 @@

store name for WeChat payment display and partner diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index 65ff255ae..40df13166 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -86,14 +86,22 @@

-
- +
+
- -

store name for WeChat payment display and partner - name

+ +

store name for WeChat payment display and partner name

+
+

Less + Than 15 + Characters(including symbols and spaces)

+
@@ -146,15 +154,24 @@
-
- -
- -

store name for WeChat payment display and partner - name

-
+ +
+ +
+ +

store name for WeChat payment display and partner name

+
+

Less + Than 15 + Characters(including symbols and spaces)

+
+
From 8b306885bc1e65fba67d343bee6c497da0b4abd5 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 15 Jan 2019 10:27:29 +0800 Subject: [PATCH 09/46] =?UTF-8?q?temp=20=E6=B3=A8=E9=87=8A=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=94=9F=E6=88=90=E5=90=88=E4=BC=99=E4=BA=BA=E6=8F=90?= =?UTF-8?q?=E6=88=90=20=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../citypartner/core/impls/CityPartnerPrizeServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java index fb8a28025..1cfed3e39 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java @@ -390,9 +390,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { int month = monthCal.get(Calendar.MONTH) + 1; List list = financialPartnerCommissionMapper.list(year, month); - if (list!=null &&list.size() > 0) { - throw new ServerErrorException("请不要重复生成合伙人记录"); - } +// if (list!=null &&list.size() > 0) { +// throw new ServerErrorException("请不要重复生成合伙人记录"); +// } financialPartnerCommissionDetailMapper.clearData(year, month, 1); financialPartnerCommissionMapper.clearData(year, month, 1); From 070c2f7586276ca6da3e8072b9856f1a1addfcc5 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 15 Jan 2019 10:54:48 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=AF=8F=E6=9C=88=E4=B8=80=E5=8F=B7?= =?UTF-8?q?0=E7=82=B915=E5=88=86=E7=94=9F=E6=88=90=E5=90=88=E4=BC=99?= =?UTF-8?q?=E4=BA=BA=E6=8F=90=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impls/CityPartnerPrizeServiceImpl.java | 6 +-- .../manage/task/OrgCommissionTask.java | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/task/OrgCommissionTask.java diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java index 1cfed3e39..fb8a28025 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java @@ -390,9 +390,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { int month = monthCal.get(Calendar.MONTH) + 1; List list = financialPartnerCommissionMapper.list(year, month); -// if (list!=null &&list.size() > 0) { -// throw new ServerErrorException("请不要重复生成合伙人记录"); -// } + if (list!=null &&list.size() > 0) { + throw new ServerErrorException("请不要重复生成合伙人记录"); + } financialPartnerCommissionDetailMapper.clearData(year, month, 1); financialPartnerCommissionMapper.clearData(year, month, 1); diff --git a/src/main/java/au/com/royalpay/payment/manage/task/OrgCommissionTask.java b/src/main/java/au/com/royalpay/payment/manage/task/OrgCommissionTask.java new file mode 100644 index 000000000..614ef9212 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/task/OrgCommissionTask.java @@ -0,0 +1,37 @@ +package au.com.royalpay.payment.manage.task; + +import au.com.royalpay.payment.manage.citypartner.core.CityPartnerPrizeService; +import au.com.royalpay.payment.tools.scheduler.SynchronizedScheduler; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Calendar; +import java.util.Date; + +@Component +@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true") +public class OrgCommissionTask { + + @Resource + private SynchronizedScheduler synchronizedScheduler; + @Resource + private CityPartnerPrizeService cityPartnerPrizeService; + + @Scheduled(cron = "0 15 0 1 * ?") + public void generateOrgCommission() { + Calendar monthCal = Calendar.getInstance(); + monthCal.setTime(new Date()); + int year = monthCal.get(Calendar.YEAR); + int month = monthCal.get(Calendar.MONTH); + if (month == 0) { + year = year - 1; + month = 12; + } + String monthStr = year + "-" + month; + cityPartnerPrizeService.generate(monthStr); + } +} + + From cc10219ebf5a569991894f20d8f18f3330e99aea Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 15 Jan 2019 11:24:52 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=20store=5Fname=20=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/templates/add_partner.html | 15 ++++++++-- .../partner/templates/partner_edit.html | 28 +++++++++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index f901be34f..1492bb698 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -107,17 +107,26 @@ -
-