Merge remote-tracking branch 'origin/master'

src/main/java/au/com/royalpay/payment/manage/custom/beans/AddCustomVO.java

@@ -4,7 +4,6 @@ package au.com.royalpay.payment.manage.custom.beans;
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.List;
-
 /**
  * @author kira
  * @date 2018/7/27
@@ -12,19 +11,13 @@ import java.util.List;
 public class AddCustomVO {
     private String order_id;
     private String custom;
-    private String mch_custom_no;
-    private boolean has_sub;
+    private String mch_custom_id;
     private String mch_custom_name;
+    private String mch_ext_custom_id;
+    private String mch_ext_custom_name;
+    private boolean has_sub;
     private List<JSONObject> subOrders;
 
-    public String getMch_custom_name() {
-        return mch_custom_name;
-    }
-
-    public void setMch_custom_name(String mch_custom_name) {
-        this.mch_custom_name = mch_custom_name;
-    }
-
     public String getOrder_id() {
         return order_id;
     }
@@ -41,12 +34,36 @@ public class AddCustomVO {
         this.custom = custom;
     }
 
-    public String getMch_custom_no() {
-        return mch_custom_no;
+    public String getMch_custom_id() {
+        return mch_custom_id;
+    }
+
+    public void setMch_custom_id(String mch_custom_id) {
+        this.mch_custom_id = mch_custom_id;
+    }
+
+    public String getMch_custom_name() {
+        return mch_custom_name;
+    }
+
+    public void setMch_custom_name(String mch_custom_name) {
+        this.mch_custom_name = mch_custom_name;
+    }
+
+    public String getMch_ext_custom_id() {
+        return mch_ext_custom_id;
+    }
+
+    public void setMch_ext_custom_id(String mch_ext_custom_id) {
+        this.mch_ext_custom_id = mch_ext_custom_id;
+    }
+
+    public String getMch_ext_custom_name() {
+        return mch_ext_custom_name;
     }
 
-    public void setMch_custom_no(String mch_custom_no) {
-        this.mch_custom_no = mch_custom_no;
+    public void setMch_ext_custom_name(String mch_ext_custom_name) {
+        this.mch_ext_custom_name = mch_ext_custom_name;
     }
 
     public boolean isHas_sub() {

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

@@ -1,5 +1,7 @@
 package au.com.royalpay.payment.manage.custom.core;
 
+import au.com.royalpay.payment.manage.custom.beans.AddCustomVO;
+
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.List;
@@ -12,7 +14,7 @@ public interface CustomService {
 
     JSONObject findOneWithDetail(String report_id);
 
-    void add(String orderId, String mchCustomId, String custom, String mchCustomName, List<JSONObject> subOrders);
+    void add(AddCustomVO addCustomVO);
 
     boolean check(int client_id, String channel);
 
@@ -21,4 +23,6 @@ public interface CustomService {
     List<JSONObject> channelCustomConfigs(String channel);
 
     void resend(String report_id);
+
+    JSONObject getCustomResult(String report_id);
 }

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

@@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.custom.core.impl;
 import au.com.royalpay.payment.core.CustomSupport;
 import au.com.royalpay.payment.core.beans.CustomReport;
 import au.com.royalpay.payment.core.beans.OrderStatus;
+import au.com.royalpay.payment.manage.custom.beans.AddCustomVO;
 import au.com.royalpay.payment.manage.custom.core.CustomService;
 import au.com.royalpay.payment.manage.mappers.custom.CustomReportDetailsMapper;
 import au.com.royalpay.payment.manage.mappers.custom.CustomReportsMapper;
@@ -49,14 +50,16 @@ public class CustomServiceImpl implements CustomService {
     }
 
     @Override
-    public void add(String orderId, String mchCustomId, String custom, String mchCustomName, List<JSONObject> subOrders) {
-        JSONObject report = customReportsMapper.findOne(orderId);
+    public void add(AddCustomVO addCustomVO) {
+        JSONObject report = customReportsMapper.findOne(addCustomVO.getOrder_id());
         if (report != null) {
             throw new BadRequestException("report record exist");
         }
-        CustomReport customReport = new CustomReport(orderId, mchCustomId, mchCustomName, custom);
-        if (!CollectionUtils.isEmpty(subOrders)) {
-            subOrders.forEach(p -> {
+        CustomReport customReport = new CustomReport(addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
+                addCustomVO.getCustom());
+        customReport.addExtMchCustom(addCustomVO.getMch_custom_id(), addCustomVO.getMch_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")));
             });
         }
@@ -105,4 +108,9 @@ public class CustomServiceImpl implements CustomService {
 
     }
 
+    @Override
+    public JSONObject getCustomResult(String report_id) {
+        return customSupport.queryCustomResult(report_id);
+    }
+
 }

src/main/java/au/com/royalpay/payment/manage/custom/web/CustomController.java

@@ -43,7 +43,7 @@ public class CustomController {
     @RequestMapping(value = "", method = RequestMethod.POST)
     @ResponseBody
     public void add(@RequestBody AddCustomVO addCustomVO) {
-        customService.add(addCustomVO.getOrder_id(),addCustomVO.getMch_custom_no(),addCustomVO.getCustom(),addCustomVO.getMch_custom_name(),addCustomVO.getSubOrders());
+        customService.add(addCustomVO);
     }
 
     @RequestMapping(value = "/channelCustom", method = RequestMethod.GET)
@@ -56,4 +56,9 @@ public class CustomController {
         customService.resend(report_id);
     }
 
+    @RequestMapping(value = "/{report_id}/customResult", method = RequestMethod.GET)
+    public void getCustomResult(@PathVariable String report_id) {
+        customService.getCustomResult(report_id);
+    }
+
 }

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java

@@ -48,7 +48,11 @@ public class AliforexcelServiceImpl implements AliforexcelService {
                 row = sheet.createRow(++rowNum);
                 row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("company_name"));
                 row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("short_name"));
+                if (!"".equals(partner.getString("ali_sub_merchant_id"))) {
+                    row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("ali_sub_merchant_id"));
+                }else {
                     row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("client_moniker"));
+                }
                 row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("alipayindustry"));
                 row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("address")+","+partner.getString("suburb") + "," + partner.getString("state") + "," + partner.getString("postcode"));
                 row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("business_hours"));

src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java

@@ -9,8 +9,8 @@ import au.com.royalpay.payment.manage.merchants.entity.impls.SwitchPermissionMod
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
 import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
-
 import au.com.royalpay.payment.tools.scheduler.SynchronizedScheduler;
+
 import com.alibaba.fastjson.JSONObject;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -55,7 +54,6 @@ public class PostponeClientTask {
     private ClientModifySupport clientModifySupport;
 
     @Scheduled(cron = "0 30 8 * * ?")
-    @Transactional
     public void postponeClient() {
         synchronizedScheduler.executeProcess("manage_task:postPoneClient", 120_000, () -> {
             Date now = new Date();

src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java

@@ -221,7 +221,7 @@ public class RefundServiceImpl implements RefundService, ApplicationEventPublish
             operator.put("operator_id", partnerAccount.getString("account_id"));
             operator.put("operator", partnerAccount.getString("display_name"));
         } else {
-            operator.put("operator_id", manager.getIntValue("manager_id"));
+            operator.put("operator_id", manager.getString("manager_id"));
             operator.put("operator", manager.getString("display_name"));
         }
         boolean requireAudit = type == OperatorType.PARTNER && PartnerRole.getRole(partnerAccount.getIntValue("role")) == PartnerRole.CASHIER

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

@@ -168,7 +168,7 @@
     </select>
     <select id="passPartners" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        company_name,short_name,client_moniker,alipayindustry,address,suburb,state,postcode,business_hours,company_phone,merchant_introduction
+        company_name,short_name,client_moniker,ali_sub_merchant_id,alipayindustry,address,suburb,state,postcode,business_hours,company_phone,merchant_introduction
         from sys_clients
         <where>
             (approve_result=1 or (approve_result=2 and (source=1 or source=2)))

src/main/ui/static/activity/encourage/templates/encourage_detail.html

@@ -9,7 +9,7 @@
     </section>
     <section class="content">
         <div class="box box-primary">
-            <div class="box-header">Parameters <a role="button" title="Edit" ng-click="modifyEvent()"><i class="fa fa-edit"></i></a></div>
+            <div class="box-header">Parameters <a role="button" ng-if="('1'|withRole)" title="Edit" ng-click="modifyEvent()"><i class="fa fa-edit"></i></a></div>
             <div class="box-body">
                 <div class="row">
                     <div class="col-xs-4 col-sm-3">From:{{event.parameters.from_date|limitTo:10}}</div>

src/main/ui/static/payment/custom/custom.js

@@ -104,7 +104,7 @@
             if($scope.custom.custom==''){
                 alert('请输入海关名称');
             }
-            if($scope.custom.mchCustomId==''){
+            if($scope.custom.mch_custom_id==''){
                 alert('请输入备案号');
             }
             $scope.custom.subOrders = $scope.subOrders;

src/main/ui/static/payment/custom/templates/custom_add.html

@@ -18,20 +18,36 @@
                     </div>
                 </div>
 
+
                 <div class="form-group">
-                    <label class="control-label col-sm-4" for="mch_custom_no">Customs No</label>
+                    <label class="control-label col-sm-4" for="mch_custom_id">Local Customs No</label>
                     <div class="col-sm-6">
-                        <input class="form-control" ng-model="custom.mch_custom_no"  id="mch_custom_no" type="text">
+                        <input class="form-control" ng-model="custom.mch_custom_id"  id="mch_custom_id" type="text">
                     </div>
                 </div>
 
                 <div class="form-group">
-                    <label class="control-label col-sm-4" for="mch_custom_name">Merchant Custom Record Name</label>
+                    <label class="control-label col-sm-4" for="mch_custom_name">Local Merchant Custom Record Name</label>
                     <div class="col-sm-6">
                         <input class="form-control" ng-model="custom.mch_custom_name"  id="mch_custom_name" type="text">
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label class="control-label col-sm-4" for="mch_ext_custom_id">General Customs No</label>
+                    <div class="col-sm-6">
+                        <input class="form-control" ng-model="custom.mch_ext_custom_id"  id="mch_ext_custom_id" type="text">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="control-label col-sm-4" for="mch_ext_custom_name">General Merchant Custom Record Name</label>
+                    <div class="col-sm-6">
+                        <input class="form-control" ng-model="custom.mch_ext_custom_name"  id="mch_ext_custom_name" type="text">
+                    </div>
+                </div>
+
+
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="has_sub">Split</label>
                     <div class="col-sm-6">