From 99893846b1990d19933387e3ba6e1d6d6f5bf1de Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 7 Mar 2019 18:13:11 +0800 Subject: [PATCH 01/19] tmp commit --- .../web/RetailValidationController.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java index 5194f557a..b7bda0c8c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java @@ -7,6 +7,8 @@ import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.device.DeviceSupport; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.http.HttpUtils; +import au.com.royalpay.payment.tools.locale.LocaleSupport; +import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.code.kaptcha.Producer; @@ -42,6 +44,11 @@ public class RetailValidationController { return deviceSupport.register(devType, registeration); } + @RequestMapping(value = "/devices/{devType}/manage/register", method = RequestMethod.POST) + public JSONObject manageRegister(@RequestBody String registeration, @PathVariable String devType) { + return deviceSupport.register(devType, registeration); + } + @RequestMapping(value = "/sign_in_check", method = RequestMethod.POST) public JSONObject signIn(@RequestBody @Valid RetailLoginInfo loginInfo, Errors errors) { HttpUtils.handleValidErrors(errors); @@ -64,6 +71,31 @@ public class RetailValidationController { return client; } + @RequestMapping(value = "/manage/sign_in_check", method = RequestMethod.POST) + public JSONObject manageSignIn(@RequestBody @Valid RetailLoginInfo loginInfo, Errors errors) { + HttpUtils.handleValidErrors(errors); + String codeValue = signInStatusManager.getVerifyCode(loginInfo.getCaptchaKey()); + if (codeValue == null) { + throw new BadRequestException("Verification code has expired"); + } + if (!codeValue.equals(loginInfo.getVerifyCode())) { + throw new BadRequestException("Verification code is not correct"); + } else { + signInStatusManager.deleteVerifyCodeKey(loginInfo.getCaptchaKey()); + } + String signKey = signInStatusManager.managerSignIn(loginInfo.toLoginInfo()); + JSONObject manager = signInStatusManager.getCurrentManager(signKey); + manager = JSON.parseObject(manager.toJSONString()); + if (!ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) { + throw new BadRequestException(LocaleSupport.localeMessage("error.login.password")); + } +// if (loginInfo.getDevId() != null) { +// deviceSupport.validDeviceWithClient(manager, loginInfo.getDevId()); +// } + manager.put("sign_key", signKey); + return manager; + } + @RequestMapping(value = "/wechat_app_signin", method = RequestMethod.POST) public JSONObject partnerWechatAppSignIn(@RequestBody JSONObject data) { JSONObject res = signInStatusManager.partnerWechatAppSignIn(data.getString("code")); From 4b2416c8ef44da23908aef63926cc850b6a5fe3f Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 8 Mar 2019 11:49:36 +0800 Subject: [PATCH 02/19] =?UTF-8?q?commit=20=E7=99=BB=E5=BD=95=E3=80=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appclient/core/ManageAppService.java | 9 +++++++ .../core/impls/ManageAppServiceImp.java | 21 +++++++++++++++ .../appclient/web/ManageAppController.java | 26 +++++++++++++++++++ .../web/RetailValidationController.java | 5 +++- 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java new file mode 100644 index 000000000..05e8b1477 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -0,0 +1,9 @@ +package au.com.royalpay.payment.manage.appclient.core; + +import com.alibaba.fastjson.JSONObject; + +public interface ManageAppService { + + void updateDevToken(JSONObject device, String devToken); + +} diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java new file mode 100644 index 000000000..b3d1372c1 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -0,0 +1,21 @@ +package au.com.royalpay.payment.manage.appclient.core.impls; + +import au.com.royalpay.payment.manage.appclient.core.ManageAppService; +import au.com.royalpay.payment.tools.device.DeviceSupport; +import au.com.royalpay.payment.tools.device.ManageDeviceSupport; +import com.alibaba.fastjson.JSONObject; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ManageAppServiceImp implements ManageAppService { + + @Resource + private ManageDeviceSupport manageDeviceSupport; + + @Override + public void updateDevToken(JSONObject device, String devToken) { + manageDeviceSupport.updateDeviceMessageToken(device, devToken); + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java new file mode 100644 index 000000000..bd895de5b --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -0,0 +1,26 @@ +package au.com.royalpay.payment.manage.appclient.web; + +import au.com.royalpay.payment.manage.appclient.core.ManageAppService; +import au.com.royalpay.payment.tools.CommonConsts; +import au.com.royalpay.payment.tools.device.ManageDeviceSupport; +import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/api/v1.0/manage/app") +public class ManageAppController { + Logger logger = LoggerFactory.getLogger(getClass()); + + @Resource + private ManageAppService manageAppService; + + @RequestMapping(value = "/token", method = RequestMethod.PUT) + public void updateDevToken(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) { + manageAppService.updateDevToken(device, token.getString("devToken")); + + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java index b7bda0c8c..b4f4bf3e5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java @@ -5,6 +5,7 @@ import au.com.royalpay.payment.manage.appclient.core.RetailAppService; import au.com.royalpay.payment.manage.signin.core.SignInStatusManager; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.device.DeviceSupport; +import au.com.royalpay.payment.tools.device.ManageDeviceSupport; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.http.HttpUtils; import au.com.royalpay.payment.tools.locale.LocaleSupport; @@ -37,6 +38,8 @@ public class RetailValidationController { @Resource private DeviceSupport deviceSupport; @Resource + private ManageDeviceSupport manageDeviceSupport; + @Resource private RetailAppService retailAppService; @RequestMapping(value = "/devices/{devType}/register", method = RequestMethod.POST) @@ -46,7 +49,7 @@ public class RetailValidationController { @RequestMapping(value = "/devices/{devType}/manage/register", method = RequestMethod.POST) public JSONObject manageRegister(@RequestBody String registeration, @PathVariable String devType) { - return deviceSupport.register(devType, registeration); + return manageDeviceSupport.register(devType, registeration); } @RequestMapping(value = "/sign_in_check", method = RequestMethod.POST) From cff2f0d16d80d039a2a987c1d9e2dbcb5a2a1996 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 8 Mar 2019 18:02:21 +0800 Subject: [PATCH 03/19] add getReferrerList --- .../manage/appclient/core/ManageAppService.java | 4 ++++ .../appclient/core/impls/ManageAppServiceImp.java | 12 ++++++++++++ .../manage/appclient/web/ManageAppController.java | 7 ++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index 05e8b1477..c8b001d75 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -2,8 +2,12 @@ package au.com.royalpay.payment.manage.appclient.core; import com.alibaba.fastjson.JSONObject; +import java.util.List; + public interface ManageAppService { void updateDevToken(JSONObject device, String devToken); + List getReferrerList(JSONObject device); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index b3d1372c1..7a1cd2098 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -1,21 +1,33 @@ package au.com.royalpay.payment.manage.appclient.core.impls; import au.com.royalpay.payment.manage.appclient.core.ManageAppService; +import au.com.royalpay.payment.manage.mappers.system.OrgMapper; import au.com.royalpay.payment.tools.device.DeviceSupport; import au.com.royalpay.payment.tools.device.ManageDeviceSupport; import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; @Service public class ManageAppServiceImp implements ManageAppService { @Resource private ManageDeviceSupport manageDeviceSupport; + @Resource + private OrgMapper orgMapper; @Override public void updateDevToken(JSONObject device, String devToken) { manageDeviceSupport.updateDeviceMessageToken(device, devToken); } + + @Override + public List getReferrerList(JSONObject device) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + return orgMapper.listOrgs(1,new PageBounds()); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index bd895de5b..f4606143d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; @RestController @RequestMapping("/api/v1.0/manage/app") @@ -18,9 +19,13 @@ public class ManageAppController { @Resource private ManageAppService manageAppService; - @RequestMapping(value = "/token", method = RequestMethod.PUT) + @RequestMapping(value = "/token", method = RequestMethod.PUT) public void updateDevToken(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) { manageAppService.updateDevToken(device, token.getString("devToken")); + } + @RequestMapping(value = "/referrer", method = RequestMethod.GET) + public List getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) { + return manageAppService.getReferrerList(device); } } From f9b40885618932786646184a45a70874ff7860dd Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 11 Mar 2019 15:19:51 +0800 Subject: [PATCH 04/19] =?UTF-8?q?add=20=E7=99=BB=E5=87=BA=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E3=80=81=E5=95=86=E6=88=B7?= =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E3=80=81=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E5=95=86=E6=88=B7=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appclient/core/ManageAppService.java | 17 ++++ .../core/impls/ManageAppServiceImp.java | 80 +++++++++++++++++++ .../appclient/web/ManageAppController.java | 53 +++++++++++- .../system/ManageDeviceTokenMapper.java | 25 ++++++ .../system/ManageDeviceTokenMapper.xml | 9 +++ 5 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java create mode 100644 src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index c8b001d75..8a32cb867 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -1,5 +1,8 @@ package au.com.royalpay.payment.manage.appclient.core; +import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo; +import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; +import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean; import com.alibaba.fastjson.JSONObject; import java.util.List; @@ -8,6 +11,20 @@ public interface ManageAppService { void updateDevToken(JSONObject device, String devToken); + void updateDevTokenStatus(String devId, int status); + + JSONObject getDevTokenByDevId(String dev_id); + + void sign_out(JSONObject device); + + void changeAccountPassword(JSONObject device, ChangePwdBean change, String manager_id); + List getReferrerList(JSONObject device); + JSONObject registerClient(JSONObject device, ClientRegisterInfo registery); + + List listPartners(JSONObject device, PartnerQuery query); + + JSONObject clientDetail(JSONObject device, String clientMoniker); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index 7a1cd2098..db2c72541 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -1,11 +1,22 @@ package au.com.royalpay.payment.manage.appclient.core.impls; import au.com.royalpay.payment.manage.appclient.core.ManageAppService; +import au.com.royalpay.payment.manage.mappers.system.ManageDeviceTokenMapper; +import au.com.royalpay.payment.manage.mappers.system.ManagerMapper; import au.com.royalpay.payment.manage.mappers.system.OrgMapper; +import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo; +import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; +import au.com.royalpay.payment.manage.merchants.core.ClientManager; +import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean; +import au.com.royalpay.payment.manage.signin.core.ManagerAccountsService; +import au.com.royalpay.payment.manage.signin.core.SignInAccountService; import au.com.royalpay.payment.tools.device.DeviceSupport; import au.com.royalpay.payment.tools.device.ManageDeviceSupport; +import au.com.royalpay.payment.tools.device.support.DeviceRegister; +import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -18,16 +29,85 @@ public class ManageAppServiceImp implements ManageAppService { private ManageDeviceSupport manageDeviceSupport; @Resource private OrgMapper orgMapper; + @Resource + private ManagerMapper managerMapper; + @Resource + private ClientManager clientManager; + @Resource + private SignInAccountService signInAccountService; + @Resource + private ManageDeviceTokenMapper manageDeviceTokenMapper; + @Override public void updateDevToken(JSONObject device, String devToken) { manageDeviceSupport.updateDeviceMessageToken(device, devToken); } + @Override + public void sign_out(JSONObject device) { + String clientType = device.getString("client_type"); + DeviceRegister register = manageDeviceSupport.findRegister(clientType); + register.manageSignout(device); + } + + @Override + public void changeAccountPassword(JSONObject device, ChangePwdBean change, String manager_id) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + // JSONObject client = signInAccountService.getClient(account_id); + if (!manager_id.equals(device.getString("manager_id"))) { + throw new ForbiddenException("You have no permission"); + } + signInAccountService.changeManagerPassword(device, change); + updateDevTokenStatus(device.getString("dev_id"), 0); + } + @Override public List getReferrerList(JSONObject device) { String clientType = device.getString("client_type"); manageDeviceSupport.findRegister(clientType); return orgMapper.listOrgs(1,new PageBounds()); } + + @Override + public JSONObject registerClient(JSONObject device, ClientRegisterInfo registery) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + return clientManager.registerClient(null, registery, manager); + } + + @Override + public List listPartners(JSONObject device, PartnerQuery query) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + return clientManager.listPartners( manager, query); + } + + @Override + public JSONObject clientDetail(JSONObject device, String clientMoniker) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + return clientManager.clientDetail(manager, clientMoniker); + } + + @Override + public void updateDevTokenStatus(String devId, int status) { + JSONObject devTokenObj = getDevTokenByDevId(devId); + if (devTokenObj != null) { + devTokenObj.put("is_valid", status); + manageDeviceTokenMapper.update(devTokenObj); + } + } + + @Override + @Cacheable(value = ":dev_message_token:", key = "#dev_id") + public JSONObject getDevTokenByDevId(String dev_id) { + return manageDeviceTokenMapper.findByDevId(dev_id); + } + + } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index f4606143d..350644e4a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -1,16 +1,26 @@ package au.com.royalpay.payment.manage.appclient.web; import au.com.royalpay.payment.manage.appclient.core.ManageAppService; +import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo; +import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; +import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; +import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean; import au.com.royalpay.payment.tools.CommonConsts; -import au.com.royalpay.payment.tools.device.ManageDeviceSupport; +import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient; +import au.com.royalpay.payment.tools.http.HttpUtils; +import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; + @RestController @RequestMapping("/api/v1.0/manage/app") public class ManageAppController { @@ -18,14 +28,53 @@ public class ManageAppController { @Resource private ManageAppService manageAppService; + @Resource + private AttachmentClient attachmentClient; @RequestMapping(value = "/token", method = RequestMethod.PUT) public void updateDevToken(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) { manageAppService.updateDevToken(device, token.getString("devToken")); } + @RequestMapping(value = "/sign_out", method = RequestMethod.PUT) + public void signOut(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + manageAppService.sign_out(device); + } + + @RequestMapping(value = "/manager_password/{manager_id}", method = RequestMethod.PUT) + public void changePassword(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @PathVariable String manager_id, + @RequestBody @Valid ChangePwdBean change, Errors errors) { + HttpUtils.handleValidErrors(errors); + manageAppService.changeAccountPassword(device, change, manager_id); + } + @RequestMapping(value = "/referrer", method = RequestMethod.GET) public List getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) { - return manageAppService.getReferrerList(device); + return manageAppService.getReferrerList(device); + } + + @RequestMapping(value = "/attachment/files", method = RequestMethod.POST) + public JSONObject uploadImage(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestParam MultipartFile file) throws Exception { + return attachmentClient.uploadFile(file, false); } + + @RequestMapping(value = "/merchant/register", method = RequestMethod.POST) + public JSONObject registerPartner(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody @Valid ClientRegisterInfo registery, + Errors errors){ + HttpUtils.handleValidErrors(errors); + return manageAppService.registerClient(device, registery); + } + + @RequestMapping(value = "/merchants", method = RequestMethod.GET) + public List listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, PartnerQuery query) { + return manageAppService.listPartners(device, query); + } + + @RequestMapping(value = "/merchant/{clientMoniker}/detail", method = RequestMethod.GET) + public JSONObject getClientByMoniker(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + return manageAppService.clientDetail(device, clientMoniker); + } + + + } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java new file mode 100644 index 000000000..7a758ad85 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java @@ -0,0 +1,25 @@ +package au.com.royalpay.payment.manage.mappers.system; + +import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; +import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; +import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.alibaba.fastjson.JSONObject; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Created by yixian on 2016-09-12. + */ +@AutoMapper(tablename = "sys_manage_devices_token", pkName = "dev_token_id") +public interface ManageDeviceTokenMapper { + + JSONObject findByDevId(@Param("dev_id") String devDevId); + + @AutoSql(type = SqlType.UPDATE) + void update(JSONObject devInfo); + + @AutoSql(type = SqlType.INSERT) + void save(JSONObject devTokenInfo); + +} diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml new file mode 100644 index 000000000..df785f3e7 --- /dev/null +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file From b84e75478f97c31c7d28e2507f3f5f3dc7d68f3a Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 11 Mar 2019 16:08:19 +0800 Subject: [PATCH 05/19] fix redis key --- .../manage/appclient/core/impls/ManageAppServiceImp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index db2c72541..a7e236816 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -83,7 +83,7 @@ public class ManageAppServiceImp implements ManageAppService { String clientType = device.getString("client_type"); manageDeviceSupport.findRegister(clientType); JSONObject manager = managerMapper.findById(device.getString("manager_id")); - return clientManager.listPartners( manager, query); + return clientManager.listPartners(manager, query); } @Override @@ -104,7 +104,7 @@ public class ManageAppServiceImp implements ManageAppService { } @Override - @Cacheable(value = ":dev_message_token:", key = "#dev_id") + @Cacheable(value = ":manage_dev_message_token:", key = "#dev_id") public JSONObject getDevTokenByDevId(String dev_id) { return manageDeviceTokenMapper.findByDevId(dev_id); } From 7733d8b59d786e78d35079db58586518e5053332 Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 11 Mar 2019 17:02:52 +0800 Subject: [PATCH 06/19] commit get version --- .../appclient/core/ManageAppService.java | 2 ++ .../core/impls/ManageAppServiceImp.java | 31 +++++++++++++++++++ .../appclient/web/ManageAppController.java | 5 +++ .../templates/org_commission_info.html | 1 - 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index 8a32cb867..b3da8834b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -27,4 +27,6 @@ public interface ManageAppService { JSONObject clientDetail(JSONObject device, String clientMoniker); + JSONObject getNewVersion(JSONObject device); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index a7e236816..9eefe8d1c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -13,6 +13,7 @@ import au.com.royalpay.payment.manage.signin.core.SignInAccountService; import au.com.royalpay.payment.tools.device.DeviceSupport; import au.com.royalpay.payment.tools.device.ManageDeviceSupport; import au.com.royalpay.payment.tools.device.support.DeviceRegister; +import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; @@ -109,5 +110,35 @@ public class ManageAppServiceImp implements ManageAppService { return manageDeviceTokenMapper.findByDevId(dev_id); } + @Override + public JSONObject getNewVersion(JSONObject device) { + String version = device.getString("version"); + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + String newAppVersion = PlatformEnvironment.getEnv().getNewVersion(clientType); + Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType); + String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType); + int update_type = 0;// 0:不更新 1：更新 2：强制更新 + String[] oldVersion = version.split("\\."); + String[] newVersion = newAppVersion.split("\\."); + JSONObject res = new JSONObject(); + res.put("update_content", updateContent); + for (int i = 0; i < newVersion.length; i++) { + if (Integer.valueOf(newVersion[i]) > Integer.valueOf(oldVersion[i])) { + update_type = 1; + if (isUpdate) { + update_type = 2; + } + res.put("update_type", update_type); + return res; + } else if (Integer.valueOf(newVersion[i]) < Integer.valueOf(oldVersion[i])) { + res.put("update_type", update_type); + return res; + } + } + res.put("update_type", update_type); + return res; + } + } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index 350644e4a..b3166184d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -75,6 +75,11 @@ public class ManageAppController { return manageAppService.clientDetail(device, clientMoniker); } + @RequestMapping(value = "/version", method = RequestMethod.GET) + public JSONObject getAppVersion(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + return manageAppService.getNewVersion(device); + } + } diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_info.html b/src/main/ui/static/config/orgcommission/templates/org_commission_info.html index 166c0790b..2370ed76b 100644 --- a/src/main/ui/static/config/orgcommission/templates/org_commission_info.html +++ b/src/main/ui/static/config/orgcommission/templates/org_commission_info.html @@ -24,7 +24,6 @@

补充说明

    -
  • 退款成功的订单不计入合伙人提成内
  • 当本月有合伙人手续费存在欠款时，无法下载汇款文件
From 4b7dbaaaab90e56a6fda722175c6f6883b7ead1a Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 12 Mar 2019 15:44:56 +0800 Subject: [PATCH 07/19] commit commons --- .../appclient/core/ManageAppService.java | 4 + .../core/impls/ManageAppServiceImp.java | 84 +++++++++++++++++++ .../appclient/web/ManageAppController.java | 11 +++ .../FinancialPartnerCommissionMapper.java | 2 + .../manage/mappers/system/ClientMapper.java | 3 + .../manage/merchants/core/ClientManager.java | 1 + .../FinancialPartnerCommissionMapper.xml | 8 ++ .../manage/mappers/system/ClientMapper.xml | 11 +++ 8 files changed, 124 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index b3da8834b..acdbe48d8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -23,10 +23,14 @@ public interface ManageAppService { JSONObject registerClient(JSONObject device, ClientRegisterInfo registery); + void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info); + List listPartners(JSONObject device, PartnerQuery query); JSONObject clientDetail(JSONObject device, String clientMoniker); JSONObject getNewVersion(JSONObject device); + JSONObject getCommons(JSONObject device); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index 9eefe8d1c..f4f21a3cd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -1,6 +1,10 @@ package au.com.royalpay.payment.manage.appclient.core.impls; import au.com.royalpay.payment.manage.appclient.core.ManageAppService; +import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeLogMapper; +import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeRecordMapper; +import au.com.royalpay.payment.manage.mappers.financial.FinancialPartnerCommissionMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.manage.mappers.system.ManageDeviceTokenMapper; import au.com.royalpay.payment.manage.mappers.system.ManagerMapper; import au.com.royalpay.payment.manage.mappers.system.OrgMapper; @@ -17,10 +21,14 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.Date; import java.util.List; @Service @@ -35,9 +43,17 @@ public class ManageAppServiceImp implements ManageAppService { @Resource private ClientManager clientManager; @Resource + private ClientMapper clientMapper; + @Resource private SignInAccountService signInAccountService; @Resource private ManageDeviceTokenMapper manageDeviceTokenMapper; + @Resource + private FinancialBDPrizeRecordMapper financialBDPrizeRecordMapper; + @Resource + private FinancialBDPrizeLogMapper financialBDPrizeLogMapper; + @Resource + private FinancialPartnerCommissionMapper financialPartnerCommissionMapper; @Override @@ -79,6 +95,14 @@ public class ManageAppServiceImp implements ManageAppService { return clientManager.registerClient(null, registery, manager); } + @Override + public void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + clientManager.updateClientRegisterInfo(manager, clientMoniker, info); + } + @Override public List listPartners(JSONObject device, PartnerQuery query) { String clientType = device.getString("client_type"); @@ -140,5 +164,65 @@ public class ManageAppServiceImp implements ManageAppService { return res; } + @Override + public JSONObject getCommons(JSONObject device) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + JSONObject countBdClients = clientMapper.countBdApproveClients(manager.getString("manager_id")); + + if (countBdClients == null) { + countBdClients = new JSONObject(); + countBdClients.put("approving", 0); + countBdClients.put("pass", 0); + countBdClients.put("this_months_pass", 0); + } + JSONObject result; + + switch (manager.getIntValue("org_id")) { + case 1: + result = bdCommons(manager); + break; + default: + result = orgCommons(manager); + break; + } + result.putAll(countBdClients); + return result; + } + private JSONObject bdCommons(JSONObject manager) { + Calendar monthCal = Calendar.getInstance(); + monthCal.setTime(new Date()); + monthCal.set(Calendar.MONTH, (monthCal.get(Calendar.MONTH) - 1)); + Date date = monthCal.getTime(); + JSONObject totalDetail = new JSONObject(); + totalDetail.put("date", DateFormatUtils.format(date, "yyyy-MM")); + totalDetail.put("total_amount", BigDecimal.ZERO); + totalDetail.put("total_prize", BigDecimal.ZERO); + totalDetail.put("total_donation", BigDecimal.ZERO); + totalDetail.put("send_prize", BigDecimal.ZERO); + totalDetail.put("hold_prize", BigDecimal.ZERO); + totalDetail.put("last_punish", BigDecimal.ZERO); + + JSONObject report = financialBDPrizeRecordMapper.getReport(DateFormatUtils.format(date, "yyyy-MM")); + if (report != null) { + totalDetail.putAll(financialBDPrizeLogMapper.findByReportAndBDTotal(report.getString("record_id"), manager.getString("manager_id"))); + } + return totalDetail; + } + + private JSONObject orgCommons(JSONObject manager) { + Calendar monthCal = Calendar.getInstance(); + monthCal.setTime(new Date()); + monthCal.set(Calendar.MONTH, (monthCal.get(Calendar.MONTH) - 1)); + JSONObject total = financialPartnerCommissionMapper.findTotalByOrg(monthCal.get(Calendar.YEAR), monthCal.get(Calendar.MONTH)+1, manager.getString("org_id")); + if (total == null) { + total = new JSONObject(); + total.put("total_amount", BigDecimal.ZERO); + total.put("org_prize", BigDecimal.ZERO); + } + total.put("date", DateFormatUtils.format(monthCal.getTime(), "yyyy-MM")); + return total; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index b3166184d..28daa8408 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -65,6 +65,12 @@ public class ManageAppController { return manageAppService.registerClient(device, registery); } + @RequestMapping(value = "/merchant/{clientMoniker}/update", method = RequestMethod.PUT) + public void updatePartnerInfo(@PathVariable String clientMoniker, @RequestBody ClientRegisterInfo info, + @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + manageAppService.updateClientRegisterInfo(device, clientMoniker, info); + } + @RequestMapping(value = "/merchants", method = RequestMethod.GET) public List listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, PartnerQuery query) { return manageAppService.listPartners(device, query); @@ -80,6 +86,11 @@ public class ManageAppController { return manageAppService.getNewVersion(device); } + @RequestMapping(value = "/commons", method = RequestMethod.GET) + public JSONObject getCommons(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + return manageAppService.getCommons(device); + } + } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java index 2004bb911..350e37486 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java @@ -44,4 +44,6 @@ public interface FinancialPartnerCommissionMapper { PageList getClientExtractRecord(@Param("org_id") int orgId, PageBounds pageBounds); + JSONObject findTotalByOrg(@Param("year") int year, @Param("month") int month, @Param("org_id") String orgId); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index 4e48045ce..63e40acb3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -110,4 +110,7 @@ public interface ClientMapper { List findByrpayNotNull(); + JSONObject countBdApproveClients(@Param("manager_id") String manager_id); + + } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 76e4bf096..259370b90 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -16,6 +16,7 @@ import au.com.royalpay.payment.tools.merchants.beans.UpdateSurchargeDTO; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import org.apache.ibatis.annotations.Param; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml index fbb3c3829..fcbe3278b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml @@ -81,4 +81,12 @@ ORDER BY c.year DESC,c.month DESC + + \ No newline at end of file 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 f4e4a3aa8..520101f71 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 @@ -444,4 +444,15 @@ + + \ No newline at end of file From cc46f27ee01dd48a7e1c9baac5f792acfa168a1e Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 13 Mar 2019 18:25:59 +0800 Subject: [PATCH 08/19] =?UTF-8?q?add=20org=20prize=20&&=20bd=20kpi?= =?UTF-8?q?=E3=80=81rates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appclient/core/ManageAppService.java | 6 ++++ .../core/impls/ManageAppServiceImp.java | 31 +++++++++++++++++++ .../appclient/web/ManageAppController.java | 19 ++++++++++-- .../financial/FinancialBDConfigMapper.java | 2 ++ .../FinancialPartnerCommissionMapper.java | 2 ++ .../financial/FinancialBDConfigMapper.xml | 18 +++++++++++ .../FinancialPartnerCommissionMapper.xml | 6 ++++ 7 files changed, 81 insertions(+), 3 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index acdbe48d8..bcb07f1d4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -33,4 +33,10 @@ public interface ManageAppService { JSONObject getCommons(JSONObject device); + List getOrgPrizeList(JSONObject device); + + List getBdConfigRates(JSONObject device); + + JSONObject getBdConfigKpi(JSONObject device); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index f4f21a3cd..4fc8f2730 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.appclient.core.impls; import au.com.royalpay.payment.manage.appclient.core.ManageAppService; +import au.com.royalpay.payment.manage.bdprize.core.BDPrizeService; +import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper; import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeLogMapper; import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeRecordMapper; import au.com.royalpay.payment.manage.mappers.financial.FinancialPartnerCommissionMapper; @@ -22,6 +24,7 @@ import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -54,6 +57,10 @@ public class ManageAppServiceImp implements ManageAppService { private FinancialBDPrizeLogMapper financialBDPrizeLogMapper; @Resource private FinancialPartnerCommissionMapper financialPartnerCommissionMapper; + @Resource + private BDPrizeService bdPrizeService; + @Resource + private FinancialBDConfigMapper financialBDConfigMapper; @Override @@ -225,4 +232,28 @@ public class ManageAppServiceImp implements ManageAppService { total.put("date", DateFormatUtils.format(monthCal.getTime(), "yyyy-MM")); return total; } + + @Override + public List getOrgPrizeList(JSONObject device) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + List getOrgPrizeList = financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id")); + return getOrgPrizeList; + } + + @Override + public List getBdConfigRates(JSONObject device) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + return bdPrizeService.getRateConfig(); + } + + @Override + public JSONObject getBdConfigKpi(JSONObject device) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + return financialBDConfigMapper.getBDConfigById(manager.getString("manager_id")); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index 28daa8408..433d4098b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -7,6 +7,7 @@ import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient; +import au.com.royalpay.payment.tools.device.manageadvise.AppClientController; import au.com.royalpay.payment.tools.http.HttpUtils; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; @@ -21,7 +22,7 @@ import javax.validation.Valid; import java.util.List; -@RestController +@AppClientController @RequestMapping("/api/v1.0/manage/app") public class ManageAppController { Logger logger = LoggerFactory.getLogger(getClass()); @@ -49,7 +50,7 @@ public class ManageAppController { } @RequestMapping(value = "/referrer", method = RequestMethod.GET) - public List getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) { + public List getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { return manageAppService.getReferrerList(device); } @@ -60,7 +61,7 @@ public class ManageAppController { @RequestMapping(value = "/merchant/register", method = RequestMethod.POST) public JSONObject registerPartner(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody @Valid ClientRegisterInfo registery, - Errors errors){ + Errors errors) { HttpUtils.handleValidErrors(errors); return manageAppService.registerClient(device, registery); } @@ -91,6 +92,18 @@ public class ManageAppController { return manageAppService.getCommons(device); } + @RequestMapping(value = "/org_prize/list", method = RequestMethod.GET) + public List getOrgPrizeList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + return manageAppService.getOrgPrizeList(device); + } + @RequestMapping(value = "/bd/rates", method = RequestMethod.GET) + public List getBdConfigRates(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + return manageAppService.getBdConfigRates(device); + } + @RequestMapping(value = "/bd/kpi", method = RequestMethod.GET) + public JSONObject getBdConfigKpi(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + return manageAppService.getBdConfigKpi(device); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java index ff541b62a..8b4c76832 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java @@ -26,6 +26,8 @@ public interface FinancialBDConfigMapper { List listBDConfig(); + JSONObject getBDConfigById(@Param("manager_id") String manager_id); + List listGroupBds(@Param("bd_group") String bd_group); BigDecimal getGroupAmount(@Param("bd_group") String bd_group, @Param("record_id") String record_id, @Param("channel") String channel); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java index 350e37486..a912023a3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java @@ -24,6 +24,8 @@ public interface FinancialPartnerCommissionMapper { @AutoSql(type = SqlType.UPDATE) void update(JSONObject commission); + List getOrgPrizeList(@Param("org_id") String orgId); + List listAvailableMonths(@Param("year") int year); List listWithOrgInfo(@Param("year") int year, @Param("month") int month); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml index 563654312..f403c4064 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml @@ -18,6 +18,24 @@ ]]> + + + SELECT * + FROM financial_partner_commission + WHERE org_id = #{org_id} + ORDER BY `year` DESC,`month` DESC + + + + + -

- eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00

- - -
- -
- -
-
-
- -
- -
-
-
- +
+
- -

eg:https://www.baidu.com

+ +
+

Required + Field

+
-
- - - -
-
Contact Information
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + ng-class="{'has-error':partnerForm.client_pay_desc.$invalid && partnerForm.client_pay_desc.$dirty}"> +
- -
+ +

+ 例如：线下场景：门店（立牌、POS）、收银系统（选择品牌名称【ipos、银豹、aupos、其他】）、无门店

+

Required Field

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

-
- - +
+
-
-
-
+
- +
+
Alipay Information  (Optional) +
+
+
+
+ +
+ +

+ eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00

- -
-

Required - Field

-

Less - Than 20 Characters

+
+
+ +
+
-
- -
-

Less - Than 2 Characters

+
+ +
+
-
- -
-

Required - Field

-

Less - Than 11 Characters

+
+ +
+ +

eg:https://www.baidu.com

-
- -
- +
+
+ +
+
Contact Information
+
+
+
+ +
+ +
+

Required + Field

+

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

+
+
+
+
+ + + +
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 20 Characters

+
+
+
+ +
+

Less + Than 2 Characters

+
+
+
+ +
+

Required + Field

+

Less + Than 11 Characters

+
+
-
-

Required - Field

-

Less Than 50 - Characters(including symbols and spaces)

+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
-
- -
-
Address Information
-
-
-
- -
+ +
+
Address Information
+
+
+
+ +
-
-

Less - Than 200 - Characters(including symbols and spaces)

-

Required - Field

+
+

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

+

Required + Field

+
-
-
- -
- -
-

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

-

Required - Field

+
+ +
+ +
+

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

+

Required + Field

+
+ + + + + + + + +
- - - - - - - - -
-
-
- -
- -
-

Less - Than 10 - Characters(including symbols and spaces)

-

Required - Field

+
+ +
+ +
+

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

+

Required + Field

+
-
-
- -
- - - - - - - -
-

Required - Field

-
+
+ +
+ + + + + + + +
+

Required + Field

+
+
-
-
- -
- -
-

Less - Than 20 - Characters(including symbols and spaces)

-

Required - Field

+
+ +
+ +
+

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

+

Required + Field

+
+ + + + + + + + +
- - - - - - - - -
-
-
- -
- +
+ +
+ +
-
-
-
Location - - -
-
-
- +
+
Location + + +
+
+
+ +
-
- +
--> -
-
Industry
-
-
- -
- -
-

Required - Field

+
+
+ Industry +
+
+
+ +
+ +
+

Required + Field

+
-
-
- -
- -
-

Required - Field

+
+ +
+ +
+

Required + Field

+
-
-
- -
- -
-

Required - Field

+
+ +
+ +
+

Required + Field

+
-
-
- -
- -
-

Required - Field

+
+ +
+ +
+

Required + Field

+
-
-
+
-
- -
- +
+ +
+ +
-
-
+
+
@@ -130,16 +134,22 @@
- - + +
-
- 制作临时合同 +
- - + +
@@ -235,7 +251,8 @@
  • Partner Accounts
    • -
  • +
  • Subpartners
  • @@ -257,7 +274,8 @@ Settlement
    • -
  • +
  • Surcharge Account
    • @@ -298,7 +316,8 @@ ) - (已禁用) + (已禁用)

    @@ -307,7 +326,8 @@

    -

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

    @@ -318,7 +338,8 @@

    -

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

    @@ -333,13 +354,14 @@
    -
    -

    -

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

    -
    +
    +

    +

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

    +
    @@ -348,7 +370,8 @@

    -

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

    @@ -399,7 +422,7 @@
    2:  @@ -470,7 +493,8 @@ End Date BD Name Proportion - Operation + + Operation @@ -501,9 +525,568 @@
    +
    +
    Merchant Payment Scenario
    +
    +
    +
    + +
    +

    +

    +
    +
    + +
    +

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +
    Alipay Information  (Optional) +
    +
    +
    +
    + +
    + +

    + eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00

    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +

    eg:https://www.baidu.com

    +
    +
    +
    +
    +
    + +
    +
    Contact Information
    +
    +
    +
    + +
    + +
    +

    Required + Field

    +

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

    +
    +
    +
    +
    + + + +
    +
    +
    +
    + +
    + +
    +

    Required + Field

    +

    Less + Than 20 Characters

    +
    +
    +
    + +
    +

    Less + Than 2 Characters

    +
    +
    +
    + +
    +

    Required + Field

    +

    Less + Than 11 Characters

    +
    +
    +
    +
    + +
    + +
    +
    +

    Required + Field

    +

    Less Than 50 + Characters(including symbols and spaces)

    +
    +
    +
    +
    +
    + +
    +
    Address Information
    +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    + + + + + + + + + +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    +
    +
    +
    + +
    + + + + + + + +
    +

    Required + Field

    +
    + +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    + + + + + + + + + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    Location + + +
    +
    +
    + +
    +
    +
    + + + +
    +
    + Industry +
    +
    +
    + +
    + +
    +

    Required + Field

    +
    +
    +
    + +
    + +
    + +
    +

    Required + Field

    +
    +
    +
    + + +
    + +
    + +
    +

    Required + Field

    +
    +
    +
    + +
    + +
    + +
    +

    Required + Field

    +
    +
    + +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    -
    Alipay Information  (Optional)
    +
    Alipay Information  (Optional) +
    @@ -561,13 +1144,16 @@

    - Resend Email - - + +

    @@ -751,7 +1337,7 @@
    -

    +

    {{partner.alipayindustry|partner_alipay_industry}}    ({{partner.alipayindustry}})

    @@ -763,7 +1349,7 @@
    -

    +

    {{partner.hfindustry| partner_hf_industry}}    ({{partner.hfindustry}})

    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 c9dd152d5..f5525f892 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -362,6 +362,596 @@
    +
    +
    Merchant Payment Scenario
    +
    +
    +
    + +
    + +
    +

    Required + Field

    +
    +
    +
    +
    + +
    + +

    + 例如：线下场景：门店（立牌、POS）、收银系统（选择品牌名称【ipos、银豹、aupos、其他】）、无门店

    +
    +

    Required + Field

    +

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

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +
    Alipay Information  (Optional)
    +
    +
    +
    + +
    + +

    + eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00

    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +

    eg:https://www.baidu.com

    +
    +
    +
    +
    +
    + +
    +
    Contact Information
    +
    +
    +
    + +
    + +
    +

    Required + Field

    +

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

    +
    +
    +
    +
    + + + +
    +
    +
    +
    + +
    + +
    +

    Required + Field

    +

    Less + Than 20 Characters

    +
    +
    +
    + +
    +

    Less + Than 2 Characters

    +
    +
    +
    + +
    +

    Required + Field

    +

    Less + Than 11 Characters

    +
    +
    +
    +
    + +
    + +
    +
    +

    Required + Field

    +

    Less Than 50 + Characters(including symbols and spaces)

    +
    +
    +
    +
    +
    + +
    +
    Address Information
    +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    + + + + + + + + + +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    +
    +
    +
    + +
    + + + + + + + +
    +

    Required + Field

    +
    + +
    +
    +
    + +
    + +
    +

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

    +

    Required + Field

    +
    + + + + + + + + + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    Location + + +
    +
    +
    + +
    +
    +
    + + + +
    +
    + Industry +
    +
    +
    + +
    + +
    +

    Required + Field

    +
    +
    +
    + +
    + +
    + +
    +

    Required + Field

    +
    +
    +
    + + +
    + +
    + +
    +

    Required + Field

    +
    +
    +
    + +
    + +
    + +
    +

    Required + Field

    +
    +
    + +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    Alipay Information   (Optional)
    From f80f532c018cb74af83c353a476142621dc70c11 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 26 Mar 2019 15:29:53 +0800 Subject: [PATCH 15/19] fix --- .../core/impls/ManageAppServiceImp.java | 2 -- .../templates/app/bd_prize_rules.html | 7 +++--- .../bdprize/templates/bd_prize_root.html | 22 +++++++++---------- .../templates/client_partner_detail.html | 21 ++++++++++++++++++ 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index 2d9c56cf0..4ed05b032 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -363,7 +363,6 @@ public class ManageAppServiceImp implements ManageAppService { @Override public List getBdPrizeList(JSONObject device) { - //todo 获取BD提成列表 String clientType = device.getString("client_type"); manageDeviceSupport.findRegister(clientType); JSONObject manager = managerMapper.findById(device.getString("manager_id")); @@ -376,7 +375,6 @@ public class ManageAppServiceImp implements ManageAppService { @Override public String getPrizeRulesUrl(JSONObject device) { - //todo 获取BD提成列表 String clientType = device.getString("client_type"); manageDeviceSupport.findRegister(clientType); JSONObject manager = managerMapper.findById(device.getString("manager_id")); diff --git a/src/main/resources/templates/app/bd_prize_rules.html b/src/main/resources/templates/app/bd_prize_rules.html index 31e8d1270..7885015b4 100755 --- a/src/main/resources/templates/app/bd_prize_rules.html +++ b/src/main/resources/templates/app/bd_prize_rules.html @@ -41,7 +41,6 @@
    -
    提成规则

    BD分级提成费率速查表

    @@ -79,9 +78,9 @@

    补充说明

    • 按月度发放
      • -
    • 每月发放总提成额度的 80%，剩余 20%按照“年度考评分数比例”于每年年底即 12 月 25 日圣诞前发放
      • -
    • 提前离职者，20%提成不予发放
      • -
    • 年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放 20%的占比部分，扣下部分如果第二年考评超出一定评分 110%可以补发；同样，如果年度考评分数超过 100 分按照同比例发放
      • +
    • 每月发放总提成额度的60%，剩余40%按照“年度考评分数比例”于每年年底即12 月25 日圣诞前发放
      • +
    • 提前离职者，40%提成不予发放
      • +
    • 年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放40%的占比部分，扣下部分如果第二年考评超出一定评分110%可以补发；同样，如果年度考评分数超过100 分按照同比例发放
    • 商户开通后连续 1 个月未产生流水的，上交主管，由主管重新分配
    • 连续 2 个月不产生流水的商户，由销管部统一收回，重新分配
    • 分配后的商户流水客户专员只能占一半
      • diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html index 9603ee070..dc4b7f769 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html @@ -12,14 +12,14 @@
      -
      - -
      - + + + + + + + + @@ -153,9 +153,9 @@

      补充说明

      • 按月度发放
        • -
      • 每月发放总提成额度的 80%，剩余 20%按照“年度考评分数比例”于每年年底即 12 月 25 日圣诞前发放
        • -
      • 提前离职者，20%提成不予发放
        • -
      • 年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放 20%的占比部分，扣下部分如果第二年考评超出一定评分 110%可以补发；同样，如果年度考评分数超过 100 分按照同比例发放
        • +
      • 每月发放总提成额度的60%，剩余40%按照“年度考评分数比例”于每年年底即12 月25 日圣诞前发放
        • +
      • 提前离职者，40%提成不予发放
        • +
      • 年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放40%的占比部分，扣下部分如果第二年考评超出一定评分110%可以补发；同样，如果年度考评分数超过100 分按照同比例发放
      • 商户开通后连续 1 个月未产生流水的，上交主管，由主管重新分配
      • 连续 2 个月不产生流水的商户，由销管部统一收回，重新分配
      • 分配后的商户流水客户专员只能占一半
        • diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 315dd19b2..0e1ccad1a 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -176,6 +176,27 @@
      +
      +
      Merchant Payment Scenario
      +
      +
      +
      + +
      +

      +

      +
      +
      + +
      +

      +
      +
      +
      +
      +
      Alipay Information   (Optional)
      From 72c7ae90f69cdea0592287b181e7dc7475cdc4fc Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 28 Mar 2019 09:33:56 +0800 Subject: [PATCH 16/19] tmp commit --- .../appclient/core/ManageAppService.java | 10 ++++- .../core/impls/ManageAppServiceImp.java | 44 +++++++++++++++++-- .../appclient/web/ManageAppController.java | 23 +++++++++- .../FinancialPartnerCommissionMapper.xml | 3 +- .../templates/app/bd_prize_rules.html | 2 +- .../templates/app/org_prize_rules.html | 2 +- 6 files changed, 76 insertions(+), 8 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index a45b7110c..74f24e9d8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -5,6 +5,7 @@ import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo; import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo; import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo; import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; +import au.com.royalpay.payment.manage.product.beans.ProductBean; import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean; import com.alibaba.fastjson.JSONObject; @@ -64,6 +65,13 @@ public interface ManageAppService { List getBdPrizeList(JSONObject device); - String getPrizeRulesUrl(JSONObject device); + JSONObject getPrizeRulesUrl(JSONObject device); + JSONObject listProduct(JSONObject device, ProductBean productBean); + + void saveProduct(JSONObject device, ProductBean productBean); + + void updateProduct(JSONObject device, ProductBean productBean); + + void deleteProduct(JSONObject device, String commodity_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index 4ed05b032..30a5b6ce1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -16,6 +16,8 @@ import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo; import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo; import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; import au.com.royalpay.payment.manage.merchants.core.ClientManager; +import au.com.royalpay.payment.manage.product.beans.ProductBean; +import au.com.royalpay.payment.manage.product.core.ClientProduct; import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean; import au.com.royalpay.payment.manage.signin.core.ManagerAccountsService; import au.com.royalpay.payment.manage.signin.core.SignInAccountService; @@ -63,6 +65,8 @@ public class ManageAppServiceImp implements ManageAppService { private BDPrizeService bdPrizeService; @Resource private FinancialBDConfigMapper financialBDConfigMapper; + @Resource + private ClientProduct clientProduct; @Override @@ -374,14 +378,48 @@ public class ManageAppServiceImp implements ManageAppService { } @Override - public String getPrizeRulesUrl(JSONObject device) { + public JSONObject getPrizeRulesUrl(JSONObject device) { String clientType = device.getString("client_type"); manageDeviceSupport.findRegister(clientType); JSONObject manager = managerMapper.findById(device.getString("manager_id")); + JSONObject result = new JSONObject(); if (manager.getIntValue("org_id") == 1) { - return "http://192.168.0.49:9002/app/rules/bd"; + result.put("url", "http://192.168.0.49:9002/app/rules/bd"); } else { - return "http://192.168.0.49:9002/app/rules/org"; + result.put("url", "http://192.168.0.49:9002/app/rules/org"); } + return result; + } + + @Override + public JSONObject listProduct(JSONObject device, ProductBean productBean) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + return clientProduct.listAllProduct(manager, productBean); + } + + @Override + public void saveProduct(JSONObject device, ProductBean productBean) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + clientProduct.saveProduct(manager, productBean); + } + + @Override + public void updateProduct(JSONObject device, ProductBean productBean) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + clientProduct.updateProduct(manager, productBean); + } + + @Override + public void deleteProduct(JSONObject device, String commodity_id) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + clientProduct.deleteProduct(manager, commodity_id); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index 83adccb81..0b32209ab 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -7,6 +7,7 @@ import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo; import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo; import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; +import au.com.royalpay.payment.manage.product.beans.ProductBean; import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient; @@ -169,8 +170,28 @@ public class ManageAppController { } @RequestMapping(value = "/prize/rules", method = RequestMethod.GET) - public String getPrizeRulesUrl(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + public JSONObject getPrizeRulesUrl(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { return manageAppService.getPrizeRulesUrl(device); } + @RequestMapping(value = "/product/list", method = RequestMethod.GET) + public JSONObject listProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) { + return manageAppService.listProduct(device, productBean); + } + + @RequestMapping(value = "/product/save", method = RequestMethod.POST) + public void saveProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) { + manageAppService.saveProduct(device, productBean); + } + + @RequestMapping(value = "/product/update", method = RequestMethod.PUT) + public void updateProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) { + manageAppService.updateProduct(device, productBean); + } + + @RequestMapping(value = "/product/delete/{commodity_id}", method = RequestMethod.PUT) + public void deleteProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @PathVariable String commodity_id) { + manageAppService.deleteProduct(device, commodity_id); + } + } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml index 3856b6efc..52746ba49 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml @@ -2,7 +2,8 @@ SELECT SUM(gross_amount) total_amount, - SUM(org_charge) org_prize + SUM(org_charge) total_prize FROM financial_partner_commission WHERE org_id=#{org_id} AND year=#{year} AND month=#{month} From d5c5aa22089f555394e68f6385c3e8193a259951 Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 1 Apr 2019 10:30:00 +0800 Subject: [PATCH 18/19] tmp commit --- .../manage/appclient/core/ManageAppService.java | 2 ++ .../appclient/core/impls/ManageAppServiceImp.java | 10 +++++++++- .../manage/appclient/web/ManageAppController.java | 6 ++++++ .../manage/merchants/beans/ClientRegisterInfo.java | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index 74f24e9d8..515113723 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -31,6 +31,8 @@ public interface ManageAppService { void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info); + void disableClientRegisterInfo(JSONObject device, String clientMoniker); + JSONObject listPartners(JSONObject device, AppMerchantBean query); JSONObject clientDetail(JSONObject device, String clientMoniker); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index 1c5fc06da..24b2f674f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -116,6 +116,14 @@ public class ManageAppServiceImp implements ManageAppService { clientManager.updateClientRegisterInfo(manager, clientMoniker, info); } + @Override + public void disableClientRegisterInfo(JSONObject device, String clientMoniker) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + clientManager.disableClient(clientMoniker,manager); + } + @Override public JSONObject listPartners(JSONObject device, AppMerchantBean query) { String clientType = device.getString("client_type"); @@ -133,9 +141,9 @@ public class ManageAppServiceImp implements ManageAppService { break; case 3: query.setCompleted_contract(true); + query.setBd_upload_material(true); break; case 4: - query.setBd_upload_material(true); break; case 5: query.setApply_to_back(true); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index 8d0727102..6ceb58eac 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -80,6 +80,12 @@ public class ManageAppController { manageAppService.updateClientRegisterInfo(device, clientMoniker, info); } + @RequestMapping(value = "/merchant/{clientMoniker}/delete", method = RequestMethod.PUT) + public void disablePartnerInfo(@PathVariable String clientMoniker, + @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + manageAppService.disableClientRegisterInfo(device, clientMoniker); + } + @RequestMapping(value = "/merchants", method = RequestMethod.GET) public JSONObject listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, AppMerchantBean query) { return manageAppService.listPartners(device, query); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index 8084f0237..cb493a8a4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -76,7 +76,9 @@ public class ClientRegisterInfo { private String merchant_video_url; @JSONField(name = "store_name") private String storeName; + @NotEmpty(message = "error.payment.valid.param_missing") private String client_pay_type; + @NotEmpty(message = "error.payment.valid.param_missing") private String client_pay_desc; public JSONObject insertObject() { From 09db19f7eeb74e2e56987e4c554676be75fe5b20 Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 1 Apr 2019 16:13:22 +0800 Subject: [PATCH 19/19] tmp commit --- src/main/ui/manage.html | 2 +- src/main/ui/static/menu/templates/main_menu.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index b151003f5..38d1a8ee3 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -474,7 +474,7 @@ margin-bottom: 10%;"/>
    • - 手续费账户月度统计 + 后付费收款
    • diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index ae2eb3c27..cccf149df 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -339,7 +339,7 @@
      - 手续费账户月度统计 + 后付费收款