diff --git a/src/main/java/au/com/royalpay/payment/manage/custom/beans/AddCustomVO.java b/src/main/java/au/com/royalpay/payment/manage/custom/beans/AddCustomVO.java index cc0bfc36f..0f3e12fa3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/custom/beans/AddCustomVO.java +++ b/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 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() { diff --git a/src/main/java/au/com/royalpay/payment/manage/custom/core/CustomService.java b/src/main/java/au/com/royalpay/payment/manage/custom/core/CustomService.java index e0bcff181..00de7944b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/custom/core/CustomService.java +++ b/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 subOrders); + void add(AddCustomVO addCustomVO); boolean check(int client_id, String channel); @@ -21,4 +23,6 @@ public interface CustomService { List channelCustomConfigs(String channel); void resend(String report_id); + + JSONObject getCustomResult(String report_id); } 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 d21e86bf9..da030ffec 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 @@ -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 subOrders) { - JSONObject report = customReportsMapper.findOne(orderId); - if(report!=null){ + 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"))); }); } @@ -98,11 +101,16 @@ public class CustomServiceImpl implements CustomService { @Override public void resend(String report_id) { JSONObject report = customReportsMapper.findOne(report_id); - if(report.getIntValue("report_status")!=2){ + if (report.getIntValue("report_status") != 2) { throw new BadRequestException("order can't report"); } customSupport.sendCustom(report_id); } + @Override + public JSONObject getCustomResult(String report_id) { + return customSupport.queryCustomResult(report_id); + } + } diff --git a/src/main/java/au/com/royalpay/payment/manage/custom/web/CustomController.java b/src/main/java/au/com/royalpay/payment/manage/custom/web/CustomController.java index 797ba3722..ba5f3925a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/custom/web/CustomController.java +++ b/src/main/java/au/com/royalpay/payment/manage/custom/web/CustomController.java @@ -28,32 +28,37 @@ public class CustomController { @Resource private CustomService customService; - @RequestMapping(value = "/{report_id}",method = RequestMethod.GET) + @RequestMapping(value = "/{report_id}", method = RequestMethod.GET) public JSONObject findOne(@PathVariable String report_id) { return customService.findOneWithDetail(report_id); } - @RequestMapping(value = "/query",method = RequestMethod.GET) - public JSONObject queryWithTran(@ModelAttribute(CommonConsts.PARTNER_STATUS)JSONObject partner, QueryCustomVo queryCustomVo) { + @RequestMapping(value = "/query", method = RequestMethod.GET) + public JSONObject queryWithTran(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, QueryCustomVo queryCustomVo) { JSONObject param = queryCustomVo.toParam(); - param.put("client_id",partner.getIntValue("client_id")); - return customService.query(param,queryCustomVo.getPage(),queryCustomVo.getLimit()); + param.put("client_id", partner.getIntValue("client_id")); + return customService.query(param, queryCustomVo.getPage(), queryCustomVo.getLimit()); } - @RequestMapping(value = "",method = RequestMethod.POST) + @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) + @RequestMapping(value = "/channelCustom", method = RequestMethod.GET) public List channelCustomConfigs(@RequestParam String channel) { return customService.channelCustomConfigs(channel); } - @RequestMapping(value = "/{report_id}/resend",method = RequestMethod.POST) + @RequestMapping(value = "/{report_id}/resend", method = RequestMethod.POST) public void resend(@PathVariable String report_id) { customService.resend(report_id); } + @RequestMapping(value = "/{report_id}/customResult", method = RequestMethod.GET) + public void getCustomResult(@PathVariable String report_id) { + customService.getCustomResult(report_id); + } + } diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 845c76876..ca6b5b381 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/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")); - row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("client_moniker")); + 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")); diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java index 10b8d003c..18a98a6d7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java +++ b/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(); diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java index 13d61c09e..7f1f4ba40 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java +++ b/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 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 ef9a4a2ff..24bfc3a90 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 @@ -168,7 +168,7 @@ +
- +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +