fix bug

admin/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.6.3
+#Created by Apache Maven 3.8.6
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-admin

admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,11 +1,11 @@
-com\mofangchuxing\aska\admin\AdminApplication.class
-com\mofangchuxing\aska\admin\controller\SysUserController.class
-com\mofangchuxing\aska\admin\controller\FinancialController.class
-com\mofangchuxing\aska\admin\controller\ChannelController.class
-com\mofangchuxing\aska\admin\controller\AdminBaseController.class
-com\mofangchuxing\aska\admin\controller\RetailMngController.class
-com\mofangchuxing\aska\admin\controller\RetailController.class
-com\mofangchuxing\aska\admin\controller\AccountController.class
-com\mofangchuxing\aska\admin\config\WebConfig.class
-com\mofangchuxing\aska\admin\Intercepter\RequestInterceptor.class
-com\mofangchuxing\aska\admin\controller\ChannelMngController.class
+com/mofangchuxing/aska/admin/controller/FinancialController.class
+com/mofangchuxing/aska/admin/Intercepter/RequestInterceptor.class
+com/mofangchuxing/aska/admin/controller/ChannelMngController.class
+com/mofangchuxing/aska/admin/controller/RetailController.class
+com/mofangchuxing/aska/admin/controller/AccountController.class
+com/mofangchuxing/aska/admin/config/WebConfig.class
+com/mofangchuxing/aska/admin/controller/ChannelController.class
+com/mofangchuxing/aska/admin/controller/SysUserController.class
+com/mofangchuxing/aska/admin/controller/AdminBaseController.class
+com/mofangchuxing/aska/admin/AdminApplication.class
+com/mofangchuxing/aska/admin/controller/RetailMngController.class

admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,11 +1,11 @@
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\SysUserController.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\AdminApplication.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\ChannelMngController.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\Intercepter\RequestInterceptor.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\RetailMngController.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\config\WebConfig.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\AdminBaseController.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\RetailController.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\AccountController.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\ChannelController.java
-H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\FinancialController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/config/WebConfig.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/AdminApplication.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/SysUserController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/AdminBaseController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/Intercepter/RequestInterceptor.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/FinancialController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailMngController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelMngController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/AccountController.java

dao/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.6.3
+#Created by Apache Maven 3.8.6
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-dao

dao/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,23 +1,23 @@
-com\mofangchuxing\aska\dao\domain\AskaChannels.class
-com\mofangchuxing\aska\dao\mapper\AskaCashrequestMapper.class
-com\mofangchuxing\aska\dao\config\SqlConfig.class
-com\mofangchuxing\aska\dao\mapper\AskaSplitrecordMapper.class
-com\mofangchuxing\aska\dao\domain\AskaSplitrecord.class
-com\mofangchuxing\aska\dao\domain\AskaChannelnos.class
-com\mofangchuxing\aska\dao\domain\AskaChannelcouponnos.class
-com\mofangchuxing\aska\dao\mapper\AskaRetailsMapper.class
-com\mofangchuxing\aska\dao\mapper\AskaChannelcouponnosMapper.class
-com\mofangchuxing\aska\dao\mapper\RefundOrderMapper.class
-com\mofangchuxing\aska\dao\mapper\NotifyRecordMapper.class
-com\mofangchuxing\aska\dao\domain\AskaCashrequest.class
-com\mofangchuxing\aska\dao\domain\AskaAccounts.class
-com\mofangchuxing\aska\dao\mapper\PayRequestMapper.class
-com\mofangchuxing\aska\dao\mapper\SysMenuMapper.class
-com\mofangchuxing\aska\dao\domain\PayRequest.class
-com\mofangchuxing\aska\dao\domain\SysMenu.class
-com\mofangchuxing\aska\dao\mapper\AskaAccountsMapper.class
-com\mofangchuxing\aska\dao\mapper\AskaChannelnosMapper.class
-com\mofangchuxing\aska\dao\domain\RefundOrder.class
-com\mofangchuxing\aska\dao\domain\NotifyRecord.class
-com\mofangchuxing\aska\dao\domain\AskaRetails.class
-com\mofangchuxing\aska\dao\mapper\AskaChannelsMapper.class
+com/mofangchuxing/aska/dao/mapper/SysMenuMapper.class
+com/mofangchuxing/aska/dao/domain/NotifyRecord.class
+com/mofangchuxing/aska/dao/mapper/AskaAccountsMapper.class
+com/mofangchuxing/aska/dao/domain/AskaRetails.class
+com/mofangchuxing/aska/dao/mapper/NotifyRecordMapper.class
+com/mofangchuxing/aska/dao/domain/AskaAccounts.class
+com/mofangchuxing/aska/dao/domain/AskaChannelnos.class
+com/mofangchuxing/aska/dao/mapper/AskaCashrequestMapper.class
+com/mofangchuxing/aska/dao/mapper/PayRequestMapper.class
+com/mofangchuxing/aska/dao/domain/PayRequest.class
+com/mofangchuxing/aska/dao/mapper/AskaRetailsMapper.class
+com/mofangchuxing/aska/dao/domain/RefundOrder.class
+com/mofangchuxing/aska/dao/domain/AskaChannels.class
+com/mofangchuxing/aska/dao/config/SqlConfig.class
+com/mofangchuxing/aska/dao/mapper/AskaSplitrecordMapper.class
+com/mofangchuxing/aska/dao/domain/AskaSplitrecord.class
+com/mofangchuxing/aska/dao/mapper/RefundOrderMapper.class
+com/mofangchuxing/aska/dao/mapper/AskaChannelcouponnosMapper.class
+com/mofangchuxing/aska/dao/domain/SysMenu.class
+com/mofangchuxing/aska/dao/mapper/AskaChannelsMapper.class
+com/mofangchuxing/aska/dao/domain/AskaCashrequest.class
+com/mofangchuxing/aska/dao/domain/AskaChannelcouponnos.class
+com/mofangchuxing/aska/dao/mapper/AskaChannelnosMapper.class

dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,23 +1,23 @@
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaChannelsMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\PayRequestMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaCashrequest.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\NotifyRecord.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\PayRequest.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\NotifyRecordMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\config\SqlConfig.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaChannelnosMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaRetailsMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\RefundOrder.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\SysMenu.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaAccountsMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaSplitrecord.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaChannelcouponnosMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaChannelnos.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaSplitrecordMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\RefundOrderMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaCashrequestMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaChannelcouponnos.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaChannels.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\SysMenuMapper.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaAccounts.java
-H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaRetails.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/config/SqlConfig.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/PayRequest.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/SysMenuMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelsMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaCashrequest.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/SysMenu.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/PayRequestMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaChannelcouponnos.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaSplitrecordMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaAccountsMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaCashrequestMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelnosMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaRetailsMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/RefundOrder.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaChannelnos.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/NotifyRecord.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelcouponnosMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaRetails.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaChannels.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaAccounts.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaSplitrecord.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/RefundOrderMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/NotifyRecordMapper.java

domain/src/main/java/com/mofangchuxing/aska/domain/enums/ResultEnum.java

@@ -12,6 +12,7 @@ public enum ResultEnum {
     CANNOT_REFUND_ERROR(205, "订单状态错误，无法退款", "订单状态错误，无法退款"),
     AMOUNT_ERROR(206, "金额不匹配，无法退款", "金额不匹配，无法退款"),
     ORDER_PAID_ERROR(207, "订单已支付过", "订单已支付过"),
+    NO_RETAIL_ERROR(208, "门店不存在", "门店不存在"),
     UNKNOWN_ERROR(-1, "程序出错了，联系客服吧", "未知异常错误"),
     PARAMS_ERROR(-2, "参数错误", "参数错误"),
     ;

domain/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.6.3
+#Created by Apache Maven 3.8.6
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-domain

domain/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,31 +1,31 @@
-com\mofangchuxing\aska\domain\R.class
-com\mofangchuxing\aska\domain\enums\PayStatusEnum.class
-com\mofangchuxing\aska\domain\vo\WeiXinPayScoreServiceResourceDTO.class
-com\mofangchuxing\aska\domain\dto\AccountDto.class
-com\mofangchuxing\aska\domain\enums\RecordTypeEnum.class
-com\mofangchuxing\aska\domain\dto\ChannelCouponDto.class
-com\mofangchuxing\aska\domain\vo\AskaRetailsVo.class
-com\mofangchuxing\aska\domain\dto\BaseDto.class
-com\mofangchuxing\aska\domain\vo\AskaChannelsVo.class
-com\mofangchuxing\aska\domain\dto\WeiXinPayScoreServiceResourceDTO.class
-com\mofangchuxing\aska\domain\dto\LoginDto.class
-com\mofangchuxing\aska\domain\entity\PlainCertificateItem.class
-com\mofangchuxing\aska\domain\enums\DelayTypeEnum.class
-com\mofangchuxing\aska\domain\dto\ChannelNoDto.class
-com\mofangchuxing\aska\domain\dto\RetailDto.class
-com\mofangchuxing\aska\domain\enums\ClientTypeEnum.class
-com\mofangchuxing\aska\domain\PayRequestDto.class
-com\mofangchuxing\aska\domain\ResponseResult.class
-com\mofangchuxing\aska\domain\dto\OrderDto.class
-com\mofangchuxing\aska\domain\vo\WeiXinPlatformCredentialVO.class
-com\mofangchuxing\aska\domain\entity\SysMenuEntity$SysMenuEntityBuilder.class
-com\mofangchuxing\aska\domain\dto\ChannelDto.class
-com\mofangchuxing\aska\domain\BizException.class
-com\mofangchuxing\aska\domain\Constant$MenuType.class
-com\mofangchuxing\aska\domain\enums\ResultEnum.class
-com\mofangchuxing\aska\domain\Constant.class
-com\mofangchuxing\aska\domain\utils\PageUtils.class
-com\mofangchuxing\aska\domain\enums\ItemTypeEnum.class
-com\mofangchuxing\aska\domain\entity\SysMenuEntity.class
-com\mofangchuxing\aska\domain\vo\PayRequestVo.class
-com\mofangchuxing\aska\domain\DelayObjectWrapper.class
+com/mofangchuxing/aska/domain/dto/BaseDto.class
+com/mofangchuxing/aska/domain/dto/RetailDto.class
+com/mofangchuxing/aska/domain/entity/SysMenuEntity.class
+com/mofangchuxing/aska/domain/utils/PageUtils.class
+com/mofangchuxing/aska/domain/dto/LoginDto.class
+com/mofangchuxing/aska/domain/ResponseResult.class
+com/mofangchuxing/aska/domain/enums/PayStatusEnum.class
+com/mofangchuxing/aska/domain/vo/AskaChannelsVo.class
+com/mofangchuxing/aska/domain/Constant$MenuType.class
+com/mofangchuxing/aska/domain/dto/ChannelNoDto.class
+com/mofangchuxing/aska/domain/vo/PayRequestVo.class
+com/mofangchuxing/aska/domain/dto/AccountDto.class
+com/mofangchuxing/aska/domain/entity/SysMenuEntity$SysMenuEntityBuilder.class
+com/mofangchuxing/aska/domain/dto/ChannelDto.class
+com/mofangchuxing/aska/domain/vo/WeiXinPayScoreServiceResourceDTO.class
+com/mofangchuxing/aska/domain/enums/ResultEnum.class
+com/mofangchuxing/aska/domain/DelayObjectWrapper.class
+com/mofangchuxing/aska/domain/R.class
+com/mofangchuxing/aska/domain/dto/WeiXinPayScoreServiceResourceDTO.class
+com/mofangchuxing/aska/domain/dto/OrderDto.class
+com/mofangchuxing/aska/domain/enums/ClientTypeEnum.class
+com/mofangchuxing/aska/domain/enums/RecordTypeEnum.class
+com/mofangchuxing/aska/domain/vo/AskaRetailsVo.class
+com/mofangchuxing/aska/domain/enums/ItemTypeEnum.class
+com/mofangchuxing/aska/domain/enums/DelayTypeEnum.class
+com/mofangchuxing/aska/domain/dto/ChannelCouponDto.class
+com/mofangchuxing/aska/domain/PayRequestDto.class
+com/mofangchuxing/aska/domain/vo/WeiXinPlatformCredentialVO.class
+com/mofangchuxing/aska/domain/Constant.class
+com/mofangchuxing/aska/domain/entity/PlainCertificateItem.class
+com/mofangchuxing/aska/domain/BizException.class

domain/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,29 +1,29 @@
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\ChannelNoDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\ChannelCouponDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\WeiXinPayScoreServiceResourceDTO.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\WeiXinPlatformCredentialVO.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\RetailDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\LoginDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\ResultEnum.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\ResponseResult.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\entity\PlainCertificateItem.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\R.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\BaseDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\PayRequestDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\DelayTypeEnum.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\PayRequestVo.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\PayStatusEnum.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\OrderDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\AccountDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\DelayObjectWrapper.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\WeiXinPayScoreServiceResourceDTO.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\utils\PageUtils.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\BizException.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\Constant.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\ItemTypeEnum.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\entity\SysMenuEntity.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\ChannelDto.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\ClientTypeEnum.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\AskaChannelsVo.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\RecordTypeEnum.java
-H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\AskaRetailsVo.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/OrderDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/PayStatusEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/R.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/WeiXinPayScoreServiceResourceDTO.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/PayRequestVo.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ResultEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/PayRequestDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelCouponDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaChannelsVo.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/entity/PlainCertificateItem.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/entity/SysMenuEntity.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/RecordTypeEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/ResponseResult.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/DelayTypeEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/WeiXinPayScoreServiceResourceDTO.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/DelayObjectWrapper.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/BizException.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/Constant.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/AccountDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ClientTypeEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/BaseDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaRetailsVo.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/WeiXinPlatformCredentialVO.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/RetailDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/utils/PageUtils.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ItemTypeEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelNoDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/LoginDto.java

main/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.6.3
+#Created by Apache Maven 3.8.6
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-main

main/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,6 +1,6 @@
-com\mofangchuxing\aska\handler\GlobalExceptionHandler.class
-com\mofangchuxing\aska\Interceptor\RequestInterceptor.class
-com\mofangchuxing\aska\Application.class
-com\mofangchuxing\aska\ApplicationRunner.class
-com\mofangchuxing\aska\config\WebConfig.class
-com\mofangchuxing\aska\controller\AskaController.class
+com/mofangchuxing/aska/handler/GlobalExceptionHandler.class
+com/mofangchuxing/aska/config/WebConfig.class
+com/mofangchuxing/aska/Interceptor/RequestInterceptor.class
+com/mofangchuxing/aska/Application.class
+com/mofangchuxing/aska/controller/AskaController.class
+com/mofangchuxing/aska/ApplicationRunner.class

main/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,6 +1,6 @@
-H:\work\aska\main\src\main\java\com\mofangchuxing\aska\ApplicationRunner.java
-H:\work\aska\main\src\main\java\com\mofangchuxing\aska\handler\GlobalExceptionHandler.java
-H:\work\aska\main\src\main\java\com\mofangchuxing\aska\Interceptor\RequestInterceptor.java
-H:\work\aska\main\src\main\java\com\mofangchuxing\aska\config\WebConfig.java
-H:\work\aska\main\src\main\java\com\mofangchuxing\aska\controller\AskaController.java
-H:\work\aska\main\src\main\java\com\mofangchuxing\aska\Application.java
+/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/handler/GlobalExceptionHandler.java
+/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/Interceptor/RequestInterceptor.java
+/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/controller/AskaController.java
+/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/Application.java
+/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/ApplicationRunner.java
+/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/config/WebConfig.java

service/src/main/java/com/mofangchuxing/aska/service/impl/PayServiceImpl.java

@@ -4,9 +4,11 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos;
+import com.mofangchuxing.aska.dao.domain.AskaRetails;
 import com.mofangchuxing.aska.dao.domain.PayRequest;
 import com.mofangchuxing.aska.dao.domain.RefundOrder;
 import com.mofangchuxing.aska.dao.mapper.AskaChannelcouponnosMapper;
+import com.mofangchuxing.aska.dao.mapper.AskaRetailsMapper;
 import com.mofangchuxing.aska.dao.mapper.PayRequestMapper;
 import com.mofangchuxing.aska.dao.mapper.RefundOrderMapper;
 import com.mofangchuxing.aska.domain.*;
@@ -61,6 +63,8 @@ public class PayServiceImpl implements PayService {
     private ProfitSharingService profitSharingService;
     @Resource
     private AskaChannelcouponnosMapper askaChannelcouponnosMapper;
+    @Resource
+    private AskaRetailsMapper askaRetailsMapper;
 
     @Override
     public ResponseResult prePay(PayRequestDto payRequestDto, Integer itemType) {

service/src/main/java/com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.java

@@ -72,7 +72,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
 
     @Override
     public void addProfitReceivers(String clientType, String accountType, String mchId, String name) throws IllegalBlockSizeException, IOException {
-
+        mchId = mchId.trim();
         String url = "https://api.mch.weixin.qq.com/v3/profitsharing/receivers/add";
         Map<String, Object> param = new HashMap<>();
         if (clientType.equals(ClientTypeEnum.app.getType())) {
@@ -82,6 +82,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         }
         if ("merchant".equals(accountType)) {
             param.put("type", "MERCHANT_ID");
+            name = name.trim();
             param.put("name", wxPayV3Utils.rsaEncryptOAEP(name));
         }else {
             param.put("type", "PERSONAL_OPENID");
@@ -91,7 +92,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         param.put("custom_relation", "加盟商");
         try {
             JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
-            log.info("测试添加分账 result = {}", jsonObject.toJSONString());
+            log.info("添加分账 result = {}", jsonObject.toJSONString());
         }catch (Exception e){
 
         }
@@ -125,7 +126,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         Map<String, Object> retailReceiver = new HashMap<>();
         if (askaRetails != null) {
             retailReceiver = getReceiverMap(askaRetails.getAccountType(),
-                    askaRetails.getAccount(), askaRetails.getTripartite(), payMoney, askaRetails.getTripvalue(), askaRetails.getAccountName(), "分账给门店-" + askaRetails.getName());
+                    askaRetails.getAccount().trim(), askaRetails.getTripartite(), payMoney, askaRetails.getTripvalue(), askaRetails.getAccountName().trim(), "分账给门店-" + askaRetails.getName());
             askaSplitrecord.setRetailId(askaRetails.getId());
             askaSplitrecord.setRetailName(askaRetails.getName());
             retailAmount = Integer.parseInt(retailReceiver.get("amount").toString());
@@ -146,7 +147,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         if (askaChannelcouponnos != null) {
             AskaChannels askaChannels = askaChannelsMapper.selectByPrimaryKey(askaChannelcouponnos.getChannelId().longValue());
             channelReceiver = getReceiverMap(askaChannels.getAccountType(),
-                    askaChannels.getAccount(),askaChannels.getTripartite(), payMoney, askaChannels.getTripvalue(), askaChannels.getAccountName(), "分账给渠道-"+askaChannels.getName());
+                    askaChannels.getAccount().trim(),askaChannels.getTripartite(), payMoney, askaChannels.getTripvalue(), askaChannels.getAccountName().trim(), "分账给渠道-"+askaChannels.getName());
             askaSplitrecord.setChannelName(askaChannels.getName());
             askaSplitrecord.setChannelId(askaChannels.getId());
             channelAmount = Integer.parseInt(channelReceiver.get("amount").toString());
@@ -185,14 +186,14 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         if (receivers.size() > 0) {
             try {
                 JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
-                log.info("测试分账 result = {}", jsonObject.toJSONString());
+                log.info("分账 result = {}", jsonObject.toJSONString());
                 if ("PROCESSING".equals(jsonObject.getString("state")) || "FINISHED".equals(jsonObject.getString("state"))) {
                     //分账成功
                 }else {
                     handleSplitFailed(askaSplitrecord);
                 }
             } catch (Exception e) {
-                log.info("测试分账 exception = {}", e.getMessage());
+                log.info("分账 exception = {}", e.getMessage());
                 handleSplitFailed(askaSplitrecord);
             }
         }
@@ -373,13 +374,19 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         param.put("out_order_no", pOrderSn);
         String orderNo = "R" + pOrderSn;
         param.put("out_return_no", orderNo);
+        account = account.trim();
         param.put("return_mchid", account);
         param.put("amount", amount);
         param.put("description", "用户退款");
-        JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
-        log.info("测试分账退款 result = {}", jsonObject.toJSONString());
-        if ("PROCESSING".equals(jsonObject.getString("result")) || "SUCCESS".equals(jsonObject.getString("result"))){
-            return true;
+        try {
+            JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
+            log.info("分账退款 result = {}", jsonObject.toJSONString());
+            if ("PROCESSING".equals(jsonObject.getString("result")) || "SUCCESS".equals(jsonObject.getString("result"))){
+                return true;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return false;
         }
         return false;
     }

service/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.6.3
+#Created by Apache Maven 3.8.6
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-service

service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,28 +1,28 @@
-com\mofangchuxing\aska\service\config\RedisConfig.class
-com\mofangchuxing\aska\service\common\MD5Util.class
-com\mofangchuxing\aska\service\common\GenerateCodeUtil$Mythread.class
-com\mofangchuxing\aska\service\config\WxPayV3Config.class
-com\mofangchuxing\aska\service\common\PayCommonUtil.class
-com\mofangchuxing\aska\service\common\XMLUtil.class
-com\mofangchuxing\aska\service\CouponService.class
-com\mofangchuxing\aska\service\impl\PayServiceImpl.class
-com\mofangchuxing\aska\service\ChannelService.class
-com\mofangchuxing\aska\service\common\DelayNotifyComponent$1.class
-com\mofangchuxing\aska\service\impl\OrderServiceImpl.class
-com\mofangchuxing\aska\service\impl\UserServiceImpl.class
-com\mofangchuxing\aska\service\utils\WxPayV3Utils.class
-com\mofangchuxing\aska\service\RetailService.class
-com\mofangchuxing\aska\service\PayService.class
-com\mofangchuxing\aska\service\impl\ProfitSharingServiceImpl.class
-com\mofangchuxing\aska\service\ProfitSharingService.class
-com\mofangchuxing\aska\service\utils\PropertyCopyUtils.class
-com\mofangchuxing\aska\service\common\GenerateCodeUtil.class
-com\mofangchuxing\aska\service\common\ClientCustomSSL.class
-com\mofangchuxing\aska\service\common\DelayNotifyComponent.class
-com\mofangchuxing\aska\service\impl\RetailServiceImpl.class
-com\mofangchuxing\aska\service\common\MyX509TrustManager.class
-com\mofangchuxing\aska\service\UserService.class
-com\mofangchuxing\aska\service\OrderService.class
-com\mofangchuxing\aska\service\config\RedissonConfig.class
-com\mofangchuxing\aska\service\impl\ChannelServiceImpl.class
-com\mofangchuxing\aska\service\impl\CouponServiceImpl.class
+com/mofangchuxing/aska/service/config/RedissonConfig.class
+com/mofangchuxing/aska/service/impl/PayServiceImpl.class
+com/mofangchuxing/aska/service/impl/CouponServiceImpl.class
+com/mofangchuxing/aska/service/common/ClientCustomSSL.class
+com/mofangchuxing/aska/service/config/RedisConfig.class
+com/mofangchuxing/aska/service/common/XMLUtil.class
+com/mofangchuxing/aska/service/CouponService.class
+com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.class
+com/mofangchuxing/aska/service/impl/RetailServiceImpl.class
+com/mofangchuxing/aska/service/common/PayCommonUtil.class
+com/mofangchuxing/aska/service/common/MyX509TrustManager.class
+com/mofangchuxing/aska/service/PayService.class
+com/mofangchuxing/aska/service/config/WxPayV3Config.class
+com/mofangchuxing/aska/service/impl/OrderServiceImpl.class
+com/mofangchuxing/aska/service/common/GenerateCodeUtil$Mythread.class
+com/mofangchuxing/aska/service/OrderService.class
+com/mofangchuxing/aska/service/RetailService.class
+com/mofangchuxing/aska/service/impl/ChannelServiceImpl.class
+com/mofangchuxing/aska/service/common/MD5Util.class
+com/mofangchuxing/aska/service/impl/UserServiceImpl.class
+com/mofangchuxing/aska/service/utils/PropertyCopyUtils.class
+com/mofangchuxing/aska/service/common/DelayNotifyComponent.class
+com/mofangchuxing/aska/service/ProfitSharingService.class
+com/mofangchuxing/aska/service/UserService.class
+com/mofangchuxing/aska/service/common/GenerateCodeUtil.class
+com/mofangchuxing/aska/service/ChannelService.class
+com/mofangchuxing/aska/service/utils/WxPayV3Utils.class
+com/mofangchuxing/aska/service/common/DelayNotifyComponent$1.class

service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,26 +1,26 @@
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\utils\WxPayV3Utils.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\ProfitSharingServiceImpl.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\utils\PropertyCopyUtils.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\CouponService.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\OrderService.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\ClientCustomSSL.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\XMLUtil.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\MD5Util.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\ChannelServiceImpl.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\PayServiceImpl.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\config\RedissonConfig.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\CouponServiceImpl.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\GenerateCodeUtil.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\RetailService.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\UserServiceImpl.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\ProfitSharingService.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\ChannelService.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\config\WxPayV3Config.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\PayCommonUtil.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\OrderServiceImpl.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\MyX509TrustManager.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\config\RedisConfig.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\DelayNotifyComponent.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\RetailServiceImpl.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\UserService.java
-H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\PayService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/RetailService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/XMLUtil.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/CouponServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/UserServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/OrderService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/PayCommonUtil.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ChannelService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/UserService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedisConfig.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedissonConfig.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ProfitSharingService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/OrderServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/RetailServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/MD5Util.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/ClientCustomSSL.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/WxPayV3Config.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/GenerateCodeUtil.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/PayServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/utils/PropertyCopyUtils.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/CouponService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/utils/WxPayV3Utils.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/DelayNotifyComponent.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/PayService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/MyX509TrustManager.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/ChannelServiceImpl.java