From 533f47400957e9bdaf55fe4ce5f178ecbfaa3e91 Mon Sep 17 00:00:00 2001 From: quantulr <35954003+quantulr@users.noreply.github.com> Date: Sat, 18 May 2024 17:09:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 167 ++++++- .../java/com/wisdo/mmining/api/BannerApi.java | 48 +- .../java/com/wisdo/mmining/api/GoodsApi.java | 74 ++- .../java/com/wisdo/mmining/api/OrderApi.java | 30 +- .../java/com/wisdo/mmining/api/PayApi.java | 203 ++++---- .../java/com/wisdo/mmining/api/UserApi.java | 459 +++++++++--------- .../java/com/wisdo/mmining/api/WechatApi.java | 47 +- .../wisdo/mmining/api/dto/AfterSalesDto.java | 12 + .../com/wisdo/mmining/api/dto/AmountDto.java | 1 - .../wisdo/mmining/api/dto/IntegralDto.java | 1 - .../mmining/controller/BannerController.java | 37 +- .../mmining/controller/BlukController.java | 71 ++- .../mmining/controller/CompanyController.java | 55 ++- .../mmining/controller/DeptController.java | 70 +-- .../controller/DiscountController.java | 26 +- .../controller/FeedbackController.java | 30 +- .../mmining/controller/FreightController.java | 22 +- .../mmining/controller/GoodsController.java | 330 ++++++------- .../controller/GoodsTypeController.java | 87 ++-- .../controller/IntegralRolesController.java | 13 +- .../mmining/controller/JoinController.java | 16 +- .../controller/OperationLogController.java | 12 +- .../mmining/controller/OrderController.java | 47 +- .../mmining/controller/PackageController.java | 30 +- .../controller/PermissionController.java | 29 +- .../mmining/controller/ProfitsController.java | 11 +- .../mmining/controller/RoleController.java | 45 +- .../controller/RolePermissionController.java | 5 +- .../mmining/controller/StoresController.java | 29 +- .../mmining/controller/SysController.java | 77 +-- .../mmining/controller/UploadController.java | 2 +- .../mmining/controller/UserController.java | 64 ++- .../mmining/controller/VipController.java | 35 +- .../mmining/controller/VolumeController.java | 26 +- .../mmining/controller/WelFareController.java | 75 ++- .../controller/WelfareCustomController.java | 39 +- .../controller/WisdUserController.java | 203 ++++---- .../controller/WithdrawalController.java | 66 +-- .../mmining/controller/WxUserController.java | 64 ++- .../dto/DeliveryRefundMoneyDto.java | 12 + .../controller/dto/RefundRemarkesDto.java | 11 + .../wisdo/mmining/controller/vo/BlukVo.java | 3 +- .../java/com/wisdo/mmining/entity/City.java | 2 +- .../wisdo/mmining/entity/ExceptionLog.java | 20 +- .../wisdo/mmining/entity/OperationLog.java | 20 +- .../com/wisdo/mmining/entity/Permission.java | 68 +-- .../java/com/wisdo/mmining/entity/Role.java | 58 ++- .../wisdo/mmining/entity/RolePermission.java | 16 +- .../java/com/wisdo/mmining/entity/User.java | 30 +- .../com/wisdo/mmining/entity/WisdAbout.java | 20 +- .../com/wisdo/mmining/entity/WisdBack.java | 20 +- .../com/wisdo/mmining/entity/WisdBanner.java | 18 +- .../com/wisdo/mmining/entity/WisdBill.java | 20 +- .../com/wisdo/mmining/entity/WisdBulk.java | 22 +- .../wisdo/mmining/entity/WisdCashVolume.java | 26 +- .../com/wisdo/mmining/entity/WisdCompany.java | 22 +- .../wisdo/mmining/entity/WisdContract.java | 32 +- .../com/wisdo/mmining/entity/WisdDept.java | 22 +- .../wisdo/mmining/entity/WisdFeedback.java | 22 +- .../com/wisdo/mmining/entity/WisdFreight.java | 22 +- .../com/wisdo/mmining/entity/WisdGoods.java | 18 +- .../wisdo/mmining/entity/WisdGoodsSpec.java | 22 +- .../wisdo/mmining/entity/WisdGoodsType.java | 20 +- .../wisdo/mmining/entity/WisdIntegral.java | 22 +- .../mmining/entity/WisdIntegrlRoles.java | 20 +- .../com/wisdo/mmining/entity/WisdJoin.java | 24 +- .../wisdo/mmining/entity/WisdOrderDetail.java | 24 +- .../com/wisdo/mmining/entity/WisdPackage.java | 22 +- .../com/wisdo/mmining/entity/WisdProfits.java | 22 +- .../wisdo/mmining/entity/WisdSettlement.java | 21 +- .../com/wisdo/mmining/entity/WisdStores.java | 22 +- .../com/wisdo/mmining/entity/WisdUser.java | 18 +- .../wisdo/mmining/entity/WisdUserAddress.java | 20 +- .../wisdo/mmining/entity/WisdUserCart.java | 22 +- .../wisdo/mmining/entity/WisdUserPackage.java | 22 +- .../mmining/entity/WisdUserPayrecord.java | 22 +- .../wisdo/mmining/entity/WisdUserVolume.java | 22 +- .../com/wisdo/mmining/entity/WisdVip.java | 22 +- .../com/wisdo/mmining/entity/WisdWelfare.java | 22 +- .../wisdo/mmining/entity/WisdWithdrawal.java | 20 +- .../com/wisdo/mmining/entity/WisdWxuser.java | 18 +- .../com/wisdo/mmining/mapper/BackMapper.java | 1 - .../wisdo/mmining/mapper/ContractMapper.java | 2 +- .../com/wisdo/mmining/mapper/OrderMapper.java | 1 + .../mmining/mapper/PermissionMapper.java | 18 +- .../com/wisdo/mmining/mapper/RoleMapper.java | 18 +- .../mmining/mapper/RolePermissionMapper.java | 4 +- .../com/wisdo/mmining/mapper/UserMapper.java | 11 +- .../mmining/mapper/WithdrawalMapper.java | 2 +- .../wisdo/mmining/service/BannerService.java | 2 + .../mmining/service/CashVolumeService.java | 10 +- .../wisdo/mmining/service/CompanyService.java | 2 + .../mmining/service/ContractService.java | 2 + .../wisdo/mmining/service/DeptService.java | 6 +- .../mmining/service/FeedBackService.java | 3 +- .../wisdo/mmining/service/GoodsService.java | 37 +- .../mmining/service/GoodsSpecService.java | 3 +- .../mmining/service/GoodsTypeService.java | 3 + .../wisdo/mmining/service/JoinService.java | 3 +- .../mmining/service/OperationLogService.java | 7 +- .../mmining/service/OrderDetailService.java | 1 + .../wisdo/mmining/service/OrderService.java | 8 +- .../wisdo/mmining/service/PackageService.java | 10 +- .../mmining/service/PermissionService.java | 23 +- .../service/RolePermissionService.java | 4 +- .../wisdo/mmining/service/RoleService.java | 23 +- .../wisdo/mmining/service/StoresService.java | 1 + .../wisdo/mmining/service/UserService.java | 30 +- .../com/wisdo/mmining/service/VipService.java | 3 + .../wisdo/mmining/service/WelfareService.java | 1 + .../mmining/service/WisdUserService.java | 9 +- .../mmining/service/WithdrawalService.java | 3 +- .../wisdo/mmining/service/WxuserService.java | 2 + .../service/impl/BannerServiceImpl.java | 8 +- .../mmining/service/impl/BillServiceImpl.java | 14 +- .../mmining/service/impl/BlukServiceImpl.java | 1 - .../service/impl/CashVolumeServiceImpl.java | 110 +++-- .../service/impl/CompanyServiceImpl.java | 6 +- .../service/impl/ContractServiceImpl.java | 39 +- .../mmining/service/impl/DeptServiceImpl.java | 23 +- .../service/impl/FeedBackServiceImpl.java | 10 +- .../service/impl/GoodsServiceImpl.java | 13 +- .../service/impl/GoodsSpecServiceImpl.java | 21 +- .../service/impl/GoodsTypeServiceImpl.java | 32 +- .../mmining/service/impl/JoinServiceImpl.java | 6 +- .../service/impl/OperationLogServiceImpl.java | 4 +- .../service/impl/OrderDetailServiceImpl.java | 4 +- .../service/impl/OrderServiceImpl.java | 15 +- .../service/impl/PackageServiceImpl.java | 51 +- .../service/impl/PermissionServiceImpl.java | 12 +- .../service/impl/ProfitsServiceImpl.java | 74 +-- .../impl/RolePermissionServiceImpl.java | 2 +- .../mmining/service/impl/RoleServiceImpl.java | 32 +- .../service/impl/SettlementServiceImpl.java | 2 +- .../service/impl/StoresServiceImpl.java | 8 +- .../service/impl/UserPackageServiceImpl.java | 16 +- .../mmining/service/impl/UserServiceImpl.java | 24 +- .../mmining/service/impl/VipServiceImpl.java | 24 +- .../service/impl/WelfareServiceImpl.java | 4 +- .../service/impl/WisdUserServiceImpl.java | 132 ++--- .../service/impl/WithdrawalServiceImpl.java | 12 +- .../service/impl/WxuserServiceImpl.java | 69 ++- .../wisdo/mmining/utils/CreateStrUtil.java | 2 +- .../com/wisdo/mmining/utils/DistanceUtil.java | 2 + .../com/wisdo/mmining/utils/HttpClients.java | 30 +- .../com/wisdo/mmining/utils/HttpUtil.java | 6 +- .../com/wisdo/mmining/utils/HttpUtils.java | 51 +- .../wisdo/mmining/utils/LogisticsUtil.java | 2 +- .../java/com/wisdo/mmining/utils/PayUtil.java | 40 +- .../com/wisdo/mmining/utils/PhoneUtils.java | 4 +- .../com/wisdo/mmining/utils/PkPerson.java | 2 - .../com/wisdo/mmining/utils/QRCodeUtil.java | 52 +- .../com/wisdo/mmining/utils/RSAUtils.java | 83 ++-- .../com/wisdo/mmining/utils/RankQueue.java | 2 +- .../java/com/wisdo/mmining/utils/SmsSend.java | 8 +- .../java/com/wisdo/mmining/utils/Tools.java | 9 +- .../com/wisdo/mmining/utils/WxBase64.java | 34 +- .../com/wisdo/mmining/utils/WxConfig.java | 8 +- .../com/wisdo/mmining/utils/WxPayUtil.java | 6 +- .../java/com/wisdo/mmining/utils/WxUtil.java | 9 +- .../wisdo/mmining/utils/smsUtils/SmsSend.java | 6 +- .../mmining/utils/smsUtils/SmsSenderUtil.java | 64 +-- .../utils/smsUtils/SmsSingleSender.java | 203 ++++---- .../utils/smsUtils/SmsSingleSenderResult.java | 22 +- .../view/pages/order/order_refund_list.jsp | 6 +- .../pages/order/order_refund_logistics.jsp | 171 ++++++- .../view/pages/order/order_refund_remarke.jsp | 119 ++++- 167 files changed, 2975 insertions(+), 2576 deletions(-) create mode 100644 src/main/java/com/wisdo/mmining/api/dto/AfterSalesDto.java create mode 100644 src/main/java/com/wisdo/mmining/controller/dto/DeliveryRefundMoneyDto.java create mode 100644 src/main/java/com/wisdo/mmining/controller/dto/RefundRemarkesDto.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b34203c..373742c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,14 +5,172 @@ + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +