From ef82f22fc3676dbe6ed4cf3c8735e7bcd0ceb7db Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 18 Sep 2019 10:25:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A1=86=E6=9E=B6][=E5=8D=87=E7=BA=A7]:mybati?= =?UTF-8?q?s=E5=8D=87=E7=BA=A7=E5=88=B0mybatis-plus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/UserApplication.java | 2 +- .../iformall/config/MyBatisConfiguration.java | 6 +- .../controller/app/WxAppinfoController.java | 4 +- .../controller/car/WxCarController.java | 2 +- .../WxPropertyContractController.java | 4 +- .../contract/WxRentContractController.java | 4 +- .../market/WxCouponChannelController.java | 2 +- .../market/WxCouponSendController.java | 10 +- .../controller/mem/BillDailyAsyncTask.java | 3 +- .../controller/mem/ImportTemplateTask.java | 5 +- .../src/main/resources/application-dev.yml | 1 - .../src/main/resources/application.yml | 24 +-- .../main/java/com/iformall/BApplication.java | 2 +- .../src/main/resources/application.yml | 23 +-- .../main/java/com/iformall/CApplication.java | 2 +- .../controller/WxCouponController.java | 2 - .../src/main/resources/application.yml | 23 +-- .../com/iformall/CallbackApplication.java | 2 +- .../src/main/resources/application.yml | 25 ++-- .../com/iformall/ConsumerApplication.java | 2 +- .../java/com/iformall/mq/MqBaseConsumer.java | 6 +- .../src/main/resources/application.yml | 23 +-- .../java/com/iformall/PosApplication.java | 2 +- .../iformall/service/impl/PosServiceImpl.java | 39 ++--- .../src/main/resources/application.yml | 23 +-- .../com/iformall/ScheduleApplication.java | 2 +- .../iformall/schedule/ActivitySchedule.java | 7 +- .../iformall/schedule/ChartDataSchedule.java | 19 +-- .../schedule/CouponExpiringSchedule.java | 2 +- .../schedule/CouponOrderExpiringSchedule.java | 9 +- .../iformall/schedule/CouponSendSchedule.java | 2 +- .../iformall/schedule/MsgSendingSchedule.java | 4 +- .../schedule/OrderExpiringSchedule.java | 32 ++-- .../schedule/PowerBillAutoBuildSchedule.java | 11 +- .../schedule/WeChatAccessTokenSchedule.java | 2 +- .../src/main/resources/application.yml | 23 +-- .../com/iformall/common/CommonMapper.java | 7 +- .../domain/dto/KwMerchantMeterDataDto.java | 6 - .../domain/dto/KwMerchantMeterDto.java | 4 - .../iformall/domain/dto/KwMeterDataDto.java | 7 - .../dto/MarkingCouponDataReportDto.java | 12 +- .../domain/dto/WxCUserBasicInfoDto.java | 36 +++-- .../domain/dto/WxCUserBasicInfoFilterDto.java | 4 - .../domain/dto/WxCouponChannelDto.java | 4 +- .../com/iformall/domain/po/BaseEntity.java | 18 ++- .../java/com/iformall/domain/po/KwBox.java | 18 +-- .../iformall/domain/po/KwBoxCmdHistory.java | 12 +- .../iformall/domain/po/KwMerchantMeter.java | 12 +- .../java/com/iformall/domain/po/KwMeter.java | 24 ++- .../com/iformall/domain/po/KwMeterData.java | 13 +- .../iformall/domain/po/MallPermission.java | 37 +++-- .../com/iformall/domain/po/MallResource.java | 17 +-- .../java/com/iformall/domain/po/MallRole.java | 18 +-- .../domain/po/MallRolePermission.java | 15 +- .../com/iformall/domain/po/MallSaleType.java | 14 +- .../iformall/domain/po/MallUserAction.java | 13 +- .../com/iformall/domain/po/MallUserInfo.java | 33 ++--- .../com/iformall/domain/po/MallUserRole.java | 16 +- .../com/iformall/domain/po/PosActionLog.java | 17 +-- .../domain/po/PosCouponOrderVerify.java | 15 +- .../com/iformall/domain/po/PosMallConfig.java | 16 +- .../java/com/iformall/domain/po/PosOrder.java | 17 +-- .../com/iformall/domain/po/PosPayOrder.java | 18 +-- .../com/iformall/domain/po/PushLimit.java | 10 +- .../com/iformall/domain/po/SysMonitor.java | 14 +- .../com/iformall/domain/po/ThDevInfo.java | 17 +-- .../com/iformall/domain/po/WxActivity.java | 24 ++- .../iformall/domain/po/WxActivityJoin.java | 14 +- .../com/iformall/domain/po/WxAdminLog.java | 12 +- .../com/iformall/domain/po/WxAppinfo.java | 15 +- .../iformall/domain/po/WxAuthorizerInfo.java | 11 +- .../java/com/iformall/domain/po/WxBLog.java | 15 +- .../com/iformall/domain/po/WxBillAction.java | 20 +-- .../com/iformall/domain/po/WxBillDaily.java | 24 ++- .../com/iformall/domain/po/WxBillDeposit.java | 15 +- .../com/iformall/domain/po/WxBillOther.java | 35 ++--- .../domain/po/WxBillOtherDeposit.java | 33 ++--- .../iformall/domain/po/WxBillProperty.java | 44 +++--- .../domain/po/WxBillPropertyDeposit.java | 14 +- .../com/iformall/domain/po/WxBillRent.java | 47 +++--- .../com/iformall/domain/po/WxBillSettle.java | 40 +++-- .../iformall/domain/po/WxBillSettleBill.java | 21 ++- .../domain/po/WxBillSettleRecord.java | 13 +- .../java/com/iformall/domain/po/WxBrand.java | 15 +- .../com/iformall/domain/po/WxBusiness.java | 24 ++- .../java/com/iformall/domain/po/WxCLog.java | 13 +- .../java/com/iformall/domain/po/WxCUser.java | 30 ++-- .../iformall/domain/po/WxCUserBasicInfo.java | 28 ++-- .../com/iformall/domain/po/WxCUserCar.java | 13 +- .../com/iformall/domain/po/WxCUserFromB.java | 15 +- .../com/iformall/domain/po/WxCUserTags.java | 15 +- .../com/iformall/domain/po/WxCampaign.java | 16 +- .../com/iformall/domain/po/WxCarCmdLog.java | 13 +- .../iformall/domain/po/WxCarPayRecord.java | 16 +- .../com/iformall/domain/po/WxCardInfo.java | 19 +-- .../com/iformall/domain/po/WxCardSpend.java | 36 ++--- .../domain/po/WxCardTransferInfo.java | 29 +--- .../com/iformall/domain/po/WxChannel.java | 11 +- .../iformall/domain/po/WxChartDataEntity.java | 6 +- .../domain/po/WxComponentVerifyTicket.java | 15 +- .../java/com/iformall/domain/po/WxCoupon.java | 82 +++++------ .../iformall/domain/po/WxCouponActionLog.java | 15 +- .../com/iformall/domain/po/WxCouponCar.java | 16 +- .../iformall/domain/po/WxCouponChannel.java | 31 ++-- .../iformall/domain/po/WxCouponInject.java | 20 ++- .../iformall/domain/po/WxCouponMerchant.java | 13 +- .../com/iformall/domain/po/WxCouponOrder.java | 29 ++-- .../com/iformall/domain/po/WxCouponSend.java | 38 ++--- .../domain/po/WxCouponSendConfig.java | 16 +- .../com/iformall/domain/po/WxCouponType.java | 16 +- .../iformall/domain/po/WxCreditHistory.java | 24 ++- .../iformall/domain/po/WxDataRuleTarget.java | 14 +- .../domain/po/WxDateAmountRecord.java | 15 +- .../java/com/iformall/domain/po/WxDevice.java | 14 +- .../com/iformall/domain/po/WxFlowConfig.java | 14 +- .../com/iformall/domain/po/WxFlowModel.java | 14 +- .../com/iformall/domain/po/WxFlowRecord.java | 20 +-- .../java/com/iformall/domain/po/WxGame.java | 30 ++-- .../iformall/domain/po/WxGameActionLog.java | 15 +- .../iformall/domain/po/WxGameTemplate.java | 16 +- .../java/com/iformall/domain/po/WxGroup.java | 14 +- .../com/iformall/domain/po/WxLevelConfig.java | 21 +-- .../iformall/domain/po/WxLevelMerchant.java | 13 +- .../java/com/iformall/domain/po/WxMall.java | 20 +-- .../com/iformall/domain/po/WxMallApply.java | 14 +- .../iformall/domain/po/WxMallBuilding.java | 14 +- .../com/iformall/domain/po/WxMallFloor.java | 13 +- .../com/iformall/domain/po/WxMerchant.java | 61 ++++---- .../iformall/domain/po/WxMerchantBUser.java | 12 +- .../iformall/domain/po/WxMerchantCorp.java | 14 +- .../domain/po/WxMerchantPowerBillConfig.java | 12 +- .../iformall/domain/po/WxMerchantShop.java | 16 +- .../iformall/domain/po/WxMerchantSubsidy.java | 28 ++-- .../com/iformall/domain/po/WxMerchantTax.java | 13 +- .../domain/po/WxMerchantTradeDaily.java | 24 ++- .../com/iformall/domain/po/WxMsgCallback.java | 15 +- .../com/iformall/domain/po/WxMsgConfig.java | 15 +- .../com/iformall/domain/po/WxMsgLimit.java | 18 +-- .../com/iformall/domain/po/WxMsgModel.java | 14 +- .../iformall/domain/po/WxMsgSignature.java | 13 +- .../domain/po/WxMsgValidationcode.java | 17 +-- .../domain/po/WxMsgValidationcodeModel.java | 14 +- .../java/com/iformall/domain/po/WxOrder.java | 24 ++- .../com/iformall/domain/po/WxOrderGroup.java | 11 +- .../com/iformall/domain/po/WxOrderPress.java | 15 +- .../java/com/iformall/domain/po/WxPark.java | 15 +- .../com/iformall/domain/po/WxPayAccount.java | 14 +- .../iformall/domain/po/WxPayAccountBill.java | 14 +- .../com/iformall/domain/po/WxPayBill.java | 15 +- .../com/iformall/domain/po/WxPayOrder.java | 15 +- .../domain/po/WxPowerBillAutoConfig.java | 11 +- .../com/iformall/domain/po/WxPrepayment.java | 14 +- .../domain/po/WxPrepaymentHistory.java | 13 +- .../domain/po/WxProfitSharingOrder.java | 14 +- .../domain/po/WxProfitSharingReceiver.java | 18 +-- .../domain/po/WxProfitSharingResult.java | 15 +- .../domain/po/WxPropertyContract.java | 25 ++-- .../com/iformall/domain/po/WxQuestion.java | 16 +- .../iformall/domain/po/WxQuestionConfig.java | 14 +- .../com/iformall/domain/po/WxQuestionLog.java | 13 +- .../com/iformall/domain/po/WxRefundOrder.java | 14 +- .../iformall/domain/po/WxRentContract.java | 48 +++--- .../iformall/domain/po/WxScoreHistory.java | 19 +-- .../com/iformall/domain/po/WxScoreRules.java | 30 ++-- .../com/iformall/domain/po/WxScreenAd.java | 17 +-- .../java/com/iformall/domain/po/WxShop.java | 27 ++-- .../com/iformall/domain/po/WxSubBusiness.java | 16 +- .../com/iformall/domain/po/WxSubsidy.java | 13 +- .../java/com/iformall/domain/po/WxTags.java | 19 +-- .../com/iformall/domain/po/WxTagsGroup.java | 14 +- .../com/iformall/domain/po/WxTagsType.java | 14 +- .../com/iformall/domain/po/WxTemplateMsg.java | 16 +- .../java/com/iformall/domain/po/WxTopic.java | 27 ++-- .../com/iformall/domain/po/WxUserChannel.java | 20 +-- .../iformall/domain/po/WxUserDataRule.java | 11 +- .../com/iformall/domain/po/WxUserVisit.java | 14 +- .../domain/po/WxWeappAuditStatus.java | 11 +- .../iformall/domain/po/WxWeappBasicSet.java | 13 +- .../iformall/domain/po/WxWeappCodeStatus.java | 10 +- .../com/iformall/domain/po/WxWeappExtSet.java | 16 +- .../domain/po/WxWeappReleaseStatus.java | 11 +- .../com/iformall/domain/po/WxWiWideInfo.java | 13 +- .../com/iformall/domain/po/msg/BaseMsg.java | 18 +-- .../com/iformall/domain/po/msg/WxMsg.java | 12 +- .../iformall/domain/po/msg/WxMsgRecord.java | 6 +- .../iformall/domain/vo/CUserBaseInfoT.java | 6 +- .../iformall/domain/vo/CUserTagNewIdVo.java | 5 +- .../iformall/domain/vo/MallUserActionVo.java | 6 +- .../com/iformall/domain/vo/WxBillAll.java | 41 +++--- .../com/iformall/domain/vo/WxBillAllVo.java | 4 +- .../com/iformall/domain/vo/WxCardCVo.java | 6 +- .../java/com/iformall/domain/vo/WxCardVo.java | 16 +- .../com/iformall/domain/vo/WxCouponCVo.java | 14 +- .../com/iformall/domain/vo/WxCouponCarVo.java | 8 +- .../iformall/domain/vo/WxCouponChannelVo.java | 14 +- .../iformall/domain/vo/WxCouponOrderBVo.java | 33 ++--- .../iformall/domain/vo/WxCouponOrderCVo.java | 15 +- .../iformall/domain/vo/WxCouponSendVo.java | 5 - .../iformall/domain/vo/WxCouponStatisVo.java | 28 ++-- .../domain/vo/WxCreditHistoryNewIdVo.java | 6 +- .../domain/vo/WxLevelMerchantCVo.java | 7 +- .../domain/vo/WxMerchantTradeDailyVo.java | 20 +-- .../com/iformall/domain/vo/WxMerchantVo.java | 2 - .../iformall/domain/vo/WxOrderCouponVo.java | 4 +- .../iformall/domain/vo/WxOrderQueryVo.java | 6 +- .../vo/WxProfitSharingOrderQueryVo.java | 9 +- .../domain/vo/WxRentPropertyContractVo.java | 4 - .../domain/vo/WxScoreHistoryNewIdVo.java | 5 +- .../iformall/mapper/MallUserInfoMapper.java | 2 +- .../iformall/mapper/WxBillPropertyMapper.java | 4 +- .../com/iformall/mapper/WxBillRentMapper.java | 4 +- .../iformall/mapper/WxFlowModelMapper.java | 2 - .../iformall/mapper/WxMsgRecordMapper.java | 4 +- .../java/com/iformall/mq/MqBaseProducer.java | 1 - .../mq/impl/RabbitMqMessageProducer.java | 4 +- .../mq/impl/RocketMqMessageProducer.java | 8 +- .../service/WxBillPropertyService.java | 2 - .../iformall/service/WxBillRentService.java | 11 +- .../iformall/service/WxBillSettleService.java | 1 - .../com/iformall/service/WxBrandService.java | 4 +- .../impl/MallPermissionServiceImpl.java | 8 +- .../service/impl/MallResourceServiceImpl.java | 8 +- .../impl/MallRolePermissionServiceImpl.java | 8 +- .../service/impl/MallRoleServiceImpl.java | 11 +- .../impl/MallUserActionServiceImpl.java | 10 +- .../service/impl/MallUserInfoServiceImpl.java | 34 ++--- .../service/impl/MallUserRoleServiceImpl.java | 17 +-- .../service/impl/PosActionLogServiceImpl.java | 8 +- .../impl/PosCouponOrderVerifyServiceImpl.java | 8 +- .../impl/PosMallConfigServiceImpl.java | 8 +- .../service/impl/PosOrderServiceImpl.java | 8 +- .../service/impl/PosPayOrderServiceImpl.java | 8 +- .../service/impl/PushLimitServiceImpl.java | 4 +- .../service/impl/SysMonitorServiceImpl.java | 8 +- .../service/impl/ThDevInfoServiceImpl.java | 13 +- .../impl/WxActivityJoinServiceImpl.java | 35 ++--- .../service/impl/WxActivityServiceImpl.java | 29 ++-- .../service/impl/WxAdminLogServiceImpl.java | 20 +-- .../service/impl/WxAppinfoServiceImpl.java | 29 +--- .../impl/WxAuthorizerInfoServiceImpl.java | 31 ++-- .../service/impl/WxBLogServiceImpl.java | 8 +- .../service/impl/WxBillActionServiceImpl.java | 4 +- .../service/impl/WxBillAllServiceImpl.java | 137 +++++++++--------- .../service/impl/WxBillDailyServiceImpl.java | 19 +-- .../impl/WxBillDepositServiceImpl.java | 20 +-- .../impl/WxBillOtherDepositServiceImpl.java | 28 ++-- .../service/impl/WxBillOtherServiceImpl.java | 20 ++- .../WxBillPropertyDepositServiceImpl.java | 20 +-- .../impl/WxBillPropertyServiceImpl.java | 23 ++- .../service/impl/WxBillRentServiceImpl.java | 31 ++-- .../impl/WxBillSettleRecordServiceImpl.java | 8 +- .../service/impl/WxBillSettleServiceImpl.java | 68 +++++---- .../service/impl/WxBrandServiceImpl.java | 11 +- .../service/impl/WxBusinessServiceImpl.java | 15 +- .../service/impl/WxCLogServiceImpl.java | 8 +- .../impl/WxCUserBasicInfoServiceImpl.java | 25 ++-- .../service/impl/WxCUserCarServiceImpl.java | 18 ++- .../service/impl/WxCUserFromBServiceImpl.java | 10 +- .../service/impl/WxCUserServiceImpl.java | 22 +-- .../service/impl/WxCUserTagsServiceImpl.java | 22 +-- .../service/impl/WxCUserTokenServiceImpl.java | 4 +- .../service/impl/WxCampaignServiceImpl.java | 32 ++-- .../service/impl/WxCarCmdLogServiceImpl.java | 8 +- .../impl/WxCarPayRecordServiceImpl.java | 4 +- .../service/impl/WxCardInfoServiceImpl.java | 8 +- .../service/impl/WxCardSpendServiceImpl.java | 81 ++++++----- .../service/impl/WxChannelServiceImpl.java | 8 +- .../WxComponentVerifyTicketServiceImpl.java | 13 +- .../impl/WxCouponActionLogServiceImpl.java | 8 +- .../service/impl/WxCouponCarServiceImpl.java | 8 +- .../impl/WxCouponChannelServiceImpl.java | 8 +- .../impl/WxCouponInjectServiceImpl.java | 12 +- .../impl/WxCouponOrderServiceImpl.java | 55 +++---- .../impl/WxCouponSendConfigServiceImpl.java | 10 +- .../service/impl/WxCouponSendServiceImpl.java | 26 ++-- .../service/impl/WxCouponServiceImpl.java | 26 ++-- .../service/impl/WxCouponTypeServiceImpl.java | 8 +- .../impl/WxCreditHistoryServiceImpl.java | 38 ++--- .../impl/WxDataRuleTargetServiceImpl.java | 2 +- .../impl/WxDateAmountRecordServiceImpl.java | 12 +- .../service/impl/WxDeviceServiceImpl.java | 8 +- .../service/impl/WxFlowRecordServiceImpl.java | 4 +- .../service/impl/WxFlowServiceImpl.java | 34 ++--- .../service/impl/WxGameServiceImpl.java | 40 ++--- .../impl/WxGameTemplateServiceImpl.java | 8 +- .../service/impl/WxGroupServiceImpl.java | 8 +- .../impl/WxLevelConfigServiceImpl.java | 19 +-- .../service/impl/WxMallApplyServiceImpl.java | 10 +- .../impl/WxMallBuildingServiceImpl.java | 14 +- .../service/impl/WxMallFloorServiceImpl.java | 8 +- .../service/impl/WxMallServiceImpl.java | 8 +- .../impl/WxMerchantBUserServiceImpl.java | 10 +- .../WxMerchantPowerBillConfigServiceImpl.java | 13 +- .../service/impl/WxMerchantServiceImpl.java | 65 +++++---- .../impl/WxMerchantShopServiceImpl.java | 8 +- .../impl/WxMerchantSubsidyServiceImpl.java | 8 +- .../impl/WxMerchantTradeDailyServiceImpl.java | 12 +- .../impl/WxMsgCallbackServiceImpl.java | 18 +-- .../service/impl/WxMsgConfigServiceImpl.java | 15 +- .../service/impl/WxMsgLimitServiceImpl.java | 2 +- .../service/impl/WxMsgModelServiceImpl.java | 12 +- .../service/impl/WxMsgRecordServiceImpl.java | 2 +- .../service/impl/WxMsgServiceImpl.java | 16 +- .../impl/WxMsgSignatureServiceImpl.java | 8 +- .../WxMsgValidationcodeModelServiceImpl.java | 14 +- .../impl/WxMsgValidationcodeServiceImpl.java | 18 ++- .../service/impl/WxOrderGroupServiceImpl.java | 38 ++--- .../service/impl/WxOrderPressServiceImpl.java | 35 +++-- .../service/impl/WxOrderServiceImpl.java | 77 +++++----- .../service/impl/WxParkServiceImpl.java | 8 +- .../impl/WxPayAccountBillServiceImpl.java | 11 +- .../service/impl/WxPayAccountServiceImpl.java | 8 +- .../service/impl/WxPayBillServiceImpl.java | 56 +++---- .../service/impl/WxPayOrderServiceImpl.java | 105 +++++++------- .../WxPowerBillAutoConfigServiceImpl.java | 7 +- .../service/impl/WxPrepaymentServiceImpl.java | 8 +- .../impl/WxProfitSharingOrderServiceImpl.java | 73 +++++----- .../WxProfitSharingReceiverServiceImpl.java | 35 ++--- .../WxProfitSharingResultServiceImpl.java | 8 +- .../impl/WxPropertyContractServiceImpl.java | 47 +++--- .../service/impl/WxQuestionServiceImpl.java | 16 +- .../impl/WxRefundOrderServiceImpl.java | 93 ++++++------ .../impl/WxRentContractServiceImpl.java | 61 ++++---- .../WxRentPropertyContractServiceImpl.java | 5 +- .../impl/WxScoreHistoryServiceImpl.java | 8 +- .../service/impl/WxScoreRulesServiceImpl.java | 20 +-- .../service/impl/WxScreenAdServiceImpl.java | 10 +- .../service/impl/WxShopServiceImpl.java | 26 ++-- .../impl/WxSubBusinessServiceImpl.java | 2 +- .../service/impl/WxSubsidyServiceImpl.java | 24 +-- .../service/impl/WxTagsGroupServiceImpl.java | 8 +- .../service/impl/WxTagsServiceImpl.java | 8 +- .../service/impl/WxTagsTypeServiceImpl.java | 8 +- .../impl/WxTemplateMsgServiceImpl.java | 14 +- .../service/impl/WxTopicServiceImpl.java | 14 +- .../impl/WxUserChannelServiceImpl.java | 8 +- .../impl/WxUserDataRuleServiceImpl.java | 9 +- .../service/impl/WxUserVisitServiceImpl.java | 8 +- .../iformall/service/kw/KwMeterService.java | 2 - .../kw/impl/KwBoxCmdHistoryServiceImpl.java | 8 +- .../service/kw/impl/KwBoxServiceImpl.java | 8 +- .../kw/impl/KwMerchantMeterServiceImpl.java | 7 +- .../kw/impl/KwMeterDataServiceImpl.java | 10 +- .../service/kw/impl/KwMeterServiceImpl.java | 13 +- .../msg/impl/SendCallBackSmsServiceImpl.java | 8 +- .../msg/impl/SendMpMsgServiceImpl.java | 9 +- .../msg/impl/SendSmartAppMsgServiceImpl.java | 10 +- .../service/msg/impl/SendSmsServiceImpl.java | 2 +- .../impl/SendWeappUniformMsgServiceImpl.java | 10 +- .../sys/impl/MallSaleTypeServiceImpl.java | 8 +- .../java/com/iformall/utils/DateUtils.java | 2 - .../resources/mapper/MallUserInfoMapper.xml | 2 +- .../resources/mapper/WxBillPropertyMapper.xml | 2 +- .../resources/mapper/WxBillRentMapper.xml | 2 +- .../resources/mapper/WxFlowModelMapper.xml | 5 - .../resources/mapper/WxMsgRecordMapper.xml | 2 +- .../java/com/iformall/SysApplication.java | 2 +- .../controller/sys/DataInitController.java | 25 ++-- .../controller/sys/SysMenuController.java | 15 +- .../src/main/resources/application.yml | 23 +-- .../com/iformall/SocketServerApplication.java | 3 +- .../java/com/iformall/mq/AmqpMsgConsumer.java | 4 +- .../src/main/resources/application.yml | 23 +-- mybatis-multi-tenancy/pom.xml | 8 +- pom.xml | 53 ++++--- 365 files changed, 2664 insertions(+), 3427 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index 09dac4c9e..8562fc985 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -1,6 +1,7 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; @@ -8,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java index d6e911fae..740c66e99 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -1,15 +1,18 @@ package com.iformall.config; +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.iformall.plugin.MultiTenancy; -import org.apache.ibatis.reflection.MetaObject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; import java.util.Properties; +@EnableTransactionManagement @Configuration public class MyBatisConfiguration { + @Bean public MultiTenancy multiTenancy() { MultiTenancy multiTenancy = new MultiTenancy(); @@ -20,4 +23,5 @@ public class MyBatisConfiguration { multiTenancy.setProperties(properties); return multiTenancy; } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 91d6100dd..237ccc0b2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -60,7 +60,7 @@ public class WxAppinfoController extends BaseController { if(map!=null && map.get("url") !=null) { String url = map.get("url"); merchant.setQrCode(url); - wxMerchantMapper.updateByPrimaryKeySelective(merchant); + wxMerchantMapper.updateById(merchant); } } }); @@ -86,7 +86,7 @@ public class WxAppinfoController extends BaseController { if(map!=null && map.get("url") !=null) { String url = map.get("url"); couponChannel.setQrCode(url); - wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + wxCouponChannelMapper.updateById(couponChannel); } } }); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index 34c4d844e..21477efc9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -259,7 +259,7 @@ public class WxCarController extends BaseController { //投放审批 wc.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); } - wxCouponMapper.updateByPrimaryKeySelective(wc); + wxCouponMapper.updateById(wc); } return new ResultData(coupon.getId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 75e6cadca..a967c151f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -76,7 +76,7 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-更新租赁开始日期") public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); - WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId()); MallUserInfo user = getUser(); propertyContract.setTenantId(user.getTenantId()); propertyContract.setAdjustPeriodHandle(); @@ -194,7 +194,7 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-生成账单列表金额") public ResultData buildBillPriceList(@RequestBody WxPropertyContract wxPropertyContract) throws Exception{ logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); - WxPropertyContract dbRent = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); + WxPropertyContract dbRent = wxPropertyContractMapper.selectById(wxPropertyContract.getId()); dbRent.setPreviewBillRentList(wxPropertyContract.getPreviewBillRentList()); if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ dbRent.setRentalStartDate(dbRent.getStartDate()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index f15388d9f..68a04207e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -116,7 +116,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-生成账单列表金额") public ResultData buildBillPriceList(@RequestBody WxRentContract wxRentContract) throws Exception{ logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); - WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); + WxRentContract dbRent = wxRentContractMapper.selectById(wxRentContract.getId()); dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList()); if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ @@ -154,7 +154,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-更新租赁开始日期") public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); - WxRentContract rentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); + WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index cfa4b8594..5af188862 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -91,7 +91,7 @@ public class WxCouponChannelController extends BaseController { if(map!=null && map.get("url") !=null) { String url = map.get("url"); couponChannel.setQrCode(url); - wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + wxCouponChannelMapper.updateById(couponChannel); } } return resultData; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 581116528..02577c779 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -1,18 +1,15 @@ package com.iformall.controller.market; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumCouponSendStatus; import com.iformall.enums.EnumCouponSendType; import com.iformall.enums.EnumCouponStatus; import com.iformall.exception.MallinkException; @@ -28,7 +25,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotNull; import java.util.Date; import java.util.Objects; @@ -78,7 +74,7 @@ public class WxCouponSendController extends BaseController { }) @SystemControllerLog(description = "注券-添加或更新配置") public ResultData addConfig(Integer beforeDays, Integer sendType) { - if(!Objects.equals(sendType,EnumCouponSendSendType.BIRTHDAY.getCode())) { + if (!Objects.equals(sendType, EnumCouponSendSendType.BIRTHDAY.getCode())) { return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED); } try { @@ -158,9 +154,9 @@ public class WxCouponSendController extends BaseController { return new ResultData(ErrorCode.COUPON_SEND_IS_INVALID); } try { - wxCouponSendService.updateInvalid(wxCouponSend); + wxCouponSendService.updateInvalid(wxCouponSend); } catch (MallinkException e) { - return new ResultData(e.getErrorCode(),e.getMessage()) ; + return new ResultData(e.getErrorCode(), e.getMessage()); } return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java index f376bc360..42c84de62 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxShop; import com.iformall.domain.vo.WxBillDailyVo; @@ -104,7 +105,7 @@ public class BillDailyAsyncTask { shop.setType(vo.getRentShopType()); shop.setStatus(EnumShopStatus.RENT.getCode()); shop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxShop wxShop = wxShopMapper.selectOne(shop); + WxShop wxShop = wxShopMapper.selectOne(new QueryWrapper(shop)); if (wxShop == null) { logger.error("店铺不存在", vo.toString()); fail++; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java index b14de9bab..ad5e23619 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxTags; @@ -96,7 +97,7 @@ public class ImportTemplateTask { wxMerchantQuery.setTenantId(tenantId); wxMerchantQuery.setName(merchantName); wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); - WxMerchant wxMerchant = wxMerchantMapper.selectOne(wxMerchantQuery); + WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); if (wxMerchant != null) { merchantMap.put(merchantName, wxMerchant); } @@ -192,7 +193,7 @@ public class ImportTemplateTask { wxMerchantQuery.setTenantId(tenantId); wxMerchantQuery.setName(merchantName); wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); - WxMerchant wxMerchant = wxMerchantMapper.selectOne(wxMerchantQuery); + WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); if (wxMerchant != null) { merchantMap.put(merchantName, wxMerchant); } diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 8074ce74f..52cee84f5 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -125,6 +125,5 @@ ueditor: logging: level: - tk.mybatis: debug com.iformall: debug path: ./logs/admin \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index c664ff22a..8b01be375 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -49,21 +49,21 @@ spring: baseline-version: 1 -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po +# MybatisPlus +mybatis-plus: mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10000 - + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po -#PageHelper +# PageHelper pagehelper: helperDialect: mysql reasonable: false diff --git a/mallinkBApi/src/main/java/com/iformall/BApplication.java b/mallinkBApi/src/main/java/com/iformall/BApplication.java index 02e6d8ba5..bf9acfdd7 100644 --- a/mallinkBApi/src/main/java/com/iformall/BApplication.java +++ b/mallinkBApi/src/main/java/com/iformall/BApplication.java @@ -1,12 +1,12 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index e9dbbc4ed..bf026d0da 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -22,20 +22,21 @@ spring: retry-another-broker-when-not-store-ok: false retry-times-when-send-failed: 2 -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po +# MybatisPlus +mybatis-plus: mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10 + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po -#PageHelper +# PageHelper pagehelper: helperDialect: mysql reasonable: false diff --git a/mallinkCApi/src/main/java/com/iformall/CApplication.java b/mallinkCApi/src/main/java/com/iformall/CApplication.java index ecbda2fa3..c401d5678 100644 --- a/mallinkCApi/src/main/java/com/iformall/CApplication.java +++ b/mallinkCApi/src/main/java/com/iformall/CApplication.java @@ -1,12 +1,12 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 10b47e864..3d854a99e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -33,7 +33,6 @@ public class WxCouponController extends BaseController { @Autowired private WxCouponChannelService wxCouponChannelService; - @Autowired private WxCouponService couponService; @@ -41,7 +40,6 @@ public class WxCouponController extends BaseController { @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; - @ApiOperation("根据id(couponChannel)查询接口") @GetMapping("/detail") @ApiImplicitParams({ diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index bb166a818..789dba1bc 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -22,20 +22,21 @@ spring: retry-another-broker-when-not-store-ok: false retry-times-when-send-failed: 2 -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po +# MybatisPlus +mybatis-plus: mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10 + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po -#PageHelper +# PageHelper pagehelper: helperDialect: mysql reasonable: false diff --git a/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java b/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java index 83b4f6b96..f0de79cc5 100644 --- a/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java +++ b/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java @@ -1,6 +1,7 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; @@ -8,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkCallback/src/main/resources/application.yml b/mallinkCallback/src/main/resources/application.yml index 08ae707ba..2f18a48f5 100644 --- a/mallinkCallback/src/main/resources/application.yml +++ b/mallinkCallback/src/main/resources/application.yml @@ -41,22 +41,21 @@ spring: proxy-target-class: true auto: true - -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po +# MybatisPlus +mybatis-plus: mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10 - + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po -#PageHelper +# PageHelper pagehelper: helperDialect: mysql reasonable: false diff --git a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java index 89620b07d..69a71f1aa 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java @@ -1,13 +1,13 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index 253a2a270..8f49733a8 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -97,13 +97,13 @@ public class MqBaseConsumer { fmInsideNotifyRefundSuccessMsgService.send(msg); } baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode()); - wxMsgRecordMapper.update(baseMsg); + wxMsgRecordMapper.updateByBaseMsg(baseMsg); }catch (Throwable e){ try { log.error("consum received error: ", e); baseMsg.setStatusMessage(e.getMessage()); baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); - wxMsgRecordMapper.update(baseMsg); + wxMsgRecordMapper.updateByBaseMsg(baseMsg); if(null != baseMsg){ if(baseMsg.getDelayTimeLevel() > 0){ @@ -119,7 +119,7 @@ public class MqBaseConsumer { }else{ baseMsg.setStatusMessage("重试次数超过3次"); baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); - wxMsgRecordMapper.update(baseMsg); + wxMsgRecordMapper.updateByBaseMsg(baseMsg); } } }catch (Throwable e1){ diff --git a/mallinkMQConsumer/src/main/resources/application.yml b/mallinkMQConsumer/src/main/resources/application.yml index a41607ee4..a09ae66b3 100644 --- a/mallinkMQConsumer/src/main/resources/application.yml +++ b/mallinkMQConsumer/src/main/resources/application.yml @@ -39,20 +39,21 @@ spring: virtual-host: / -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po +# MybatisPlus +mybatis-plus: mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10 + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po -#PageHelper +# PageHelper pagehelper: helperDialect: mysql reasonable: false diff --git a/mallinkPosApi/src/main/java/com/iformall/PosApplication.java b/mallinkPosApi/src/main/java/com/iformall/PosApplication.java index c89c4bc2e..23a072ee6 100644 --- a/mallinkPosApi/src/main/java/com/iformall/PosApplication.java +++ b/mallinkPosApi/src/main/java/com/iformall/PosApplication.java @@ -1,12 +1,12 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import tk.mybatis.spring.annotation.MapperScan; /** * @author Stormeye diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 55278c83b..6dbb3bd0a 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; @@ -271,7 +272,7 @@ public class PosServiceImpl implements PosService { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage()); } - WxCouponOrder couponOrder = couponOrderMapper.selectByPrimaryKey(cardId); + WxCouponOrder couponOrder = couponOrderMapper.selectById(cardId); if (couponOrder == null) { throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); } @@ -431,7 +432,7 @@ public class PosServiceImpl implements PosService { throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); } // 5. get coupon - WxCoupon wxCoupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId()); + WxCoupon wxCoupon = couponMapper.selectById(couponOrderCVo.getCouponId()); if (wxCoupon == null) { logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); @@ -570,7 +571,7 @@ public class PosServiceImpl implements PosService { } if (couponSelected) { // 5. get coupon - WxCoupon wxCoupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId()); + WxCoupon wxCoupon = couponMapper.selectById(couponOrderCVo.getCouponId()); if (wxCoupon == null) { logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); @@ -1033,7 +1034,7 @@ public class PosServiceImpl implements PosService { throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); } // 5. 核销后无法反向 - WxCoupon coupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId()); + WxCoupon coupon = couponMapper.selectById(couponOrderCVo.getCouponId()); if (coupon.getSalePrice() > 0 || (coupon.getSubsidyType() > EnumCouponSubsidyType.NO_SUBSIDY.getCode() && coupon.getSubsidyNum() > 0)) { logger.error("券包ID: " + couponOrderIdStr + "核销无法退回"); @@ -2010,7 +2011,7 @@ public class PosServiceImpl implements PosService { /// setPosPaymentType(EnumNeuPosPamentType.MEM_DISCOUNT.getCode()); setPosPayDes("POS会员折扣支付"); }}; - int sqlRow = payOrderMapper.insertSelective(payOrder); + int sqlRow = payOrderMapper.insert(payOrder); if (sqlRow != 1) { logger.error("pay order insert error: " + payOrder.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -2058,7 +2059,7 @@ public class PosServiceImpl implements PosService { setPosPayDes("POS优惠券支付"); setPosPayOrderNo(posPayOrderNo); }}; - int sqlRow = payOrderMapper.insertSelective(payOrder); + int sqlRow = payOrderMapper.insert(payOrder); if (sqlRow != 1) { logger.error("pay order insert error: " + payOrder.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -2069,20 +2070,20 @@ public class PosServiceImpl implements PosService { WxCouponOrder updateCO = new WxCouponOrder(); updateCO.setId(couponOrderId); updateCO.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); - couponOrderMapper.updateByPrimaryKeySelective(updateCO); + couponOrderMapper.updateById(updateCO); } WxCouponOrderCVo couponOrderCVo = couponOrderService.detailCUserVo(posPayOrderNo); if (couponOrderCVo != null) { // 3. 成长值 try { - WxOrder scoreOrder = orderMapper.selectByPrimaryKey(couponOrderCVo.getOrderId()); + WxOrder scoreOrder = orderMapper.selectById(couponOrderCVo.getOrderId()); int point = scoreRulesService.addScore2(EnumScoreType.CONSUMPTION, scoreOrder, couponOrderCVo.getBusinessId()); scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point); } catch (Exception e) { logger.error("交易核销成长值异常:" + e.getMessage()); } - WxCoupon wxCoupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId()); + WxCoupon wxCoupon = couponMapper.selectById(couponOrderCVo.getCouponId()); if (wxCoupon == null) { logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrderCVo.getId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); @@ -2144,7 +2145,7 @@ public class PosServiceImpl implements PosService { setPosPayOrderNo(posPayOrderNo); }}; - int sqlRow = payOrderMapper.insertSelective(payOrder); + int sqlRow = payOrderMapper.insert(payOrder); if (sqlRow != 1) { logger.error("pay order insert error: " + payOrder.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -2206,7 +2207,7 @@ public class PosServiceImpl implements PosService { setPosPayOrderNo(neuPayThirdNo); }}; - int sqlRow = payOrderMapper.insertSelective(payOrder); + int sqlRow = payOrderMapper.insert(payOrder); if (sqlRow != 1) { logger.error("pay order insert error: " + payOrder.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -2215,7 +2216,7 @@ public class PosServiceImpl implements PosService { // 2. 积分, 成长值 // 3. 成长值 try { - WxOrder scoreOrder = orderMapper.selectByPrimaryKey(order.getId()); + WxOrder scoreOrder = orderMapper.selectById(order.getId()); scoreOrder.setPayment(neuPaymentAmount); int point = scoreRulesService.addScore2(EnumScoreType.CONSUMPTION, scoreOrder, merchant.getBusinessId()); scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point); @@ -2257,7 +2258,7 @@ public class PosServiceImpl implements PosService { }}; try { - payOrderQ = payOrderMapper.selectOne(payOrderQ); + payOrderQ = payOrderMapper.selectOne(new QueryWrapper<>(payOrderQ)); } catch (Exception e) { throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); } @@ -2294,7 +2295,7 @@ public class PosServiceImpl implements PosService { }}; refundPayOrder.setPayOrderNo(String.valueOf(payOrderQ.getId())); - int sqlRow = refundOrderMapper.insertSelective(refundPayOrder); + int sqlRow = refundOrderMapper.insert(refundPayOrder); if (sqlRow != 1) { logger.error("refund order insert error: " + refundPayOrder.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -2325,7 +2326,7 @@ public class PosServiceImpl implements PosService { setPosOrderId(posOrderId); }}; try { - orderQ = orderMapper.selectOne(orderQ); + orderQ = orderMapper.selectOne(new QueryWrapper<>(orderQ)); } catch (Exception e) { isExist = false; } @@ -2357,7 +2358,7 @@ public class PosServiceImpl implements PosService { }}; try { - orderMapper.insertSelective(order); + orderMapper.insert(order); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -2387,7 +2388,7 @@ public class PosServiceImpl implements PosService { setPosOrderId(posOrderId); }}; try { - orderQ = orderMapper.selectOne(orderQ); + orderQ = orderMapper.selectOne(new QueryWrapper<>(orderQ)); } catch (Exception e) { throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } @@ -2404,7 +2405,7 @@ public class PosServiceImpl implements PosService { }}; refundQ.setOrderNumber(orderQ.getOrderNumber()); try { - refundQ = orderMapper.selectOne(refundQ); + refundQ = orderMapper.selectOne(new QueryWrapper<>(refundQ)); } catch (Exception e) { } if (refundQ != null) { @@ -2436,7 +2437,7 @@ public class PosServiceImpl implements PosService { order.setOrderNumber(orderQ.getOrderNumber()); try { - orderMapper.insertSelective(order); + orderMapper.insert(order); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); diff --git a/mallinkPosApi/src/main/resources/application.yml b/mallinkPosApi/src/main/resources/application.yml index b698eaa7a..141b375eb 100644 --- a/mallinkPosApi/src/main/resources/application.yml +++ b/mallinkPosApi/src/main/resources/application.yml @@ -22,20 +22,21 @@ spring: retry-another-broker-when-not-store-ok: false retry-times-when-send-failed: 2 -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po +# MybatisPlus +mybatis-plus: mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10 + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po -#PageHelper +# PageHelper pagehelper: helperDialect: mysql reasonable: false diff --git a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java index ebd8a4d91..bc52f3a3e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java +++ b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java @@ -1,13 +1,13 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 624a8a21c..9774b7fba 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -1,5 +1,6 @@ package com.iformall.schedule; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxCampaign; @@ -117,14 +118,14 @@ public class ActivitySchedule { campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); campaign.setType(EnumCampaignType.PAGEPATH.getCode()); campaign.setProduceType(EnumCampaignProductType.ACTIVITY_JOIN.getCode()); - List campaignList = wxCampaignMapper.select(campaign); + List campaignList = wxCampaignMapper.selectList(new QueryWrapper(campaign)); for (WxCampaign wxCampaign : campaignList) { - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxCampaign.getProduceId()); + WxActivity wxActivity = wxActivityMapper.selectById(wxCampaign.getProduceId()); if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { activityList.add(wxActivity); wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); wxCampaign.setUpdateTime(new Date()); - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + wxCampaignMapper.updateById(wxCampaign); } } } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index 728781976..fee8c8d73 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -1,5 +1,6 @@ package com.iformall.schedule; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.IdWorker; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.WxChartDataEntity; @@ -80,38 +81,38 @@ public class ChartDataSchedule { params.put("tenantId", tenantId); wxChartDataEntity.setTenantId(tenantId); wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); - int count = wxChartDataMapper.selectCount(wxChartDataEntity); + int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); carOutData(params, createtime, date, tenantId); } wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); - count = wxChartDataMapper.selectCount(wxChartDataEntity); + count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); carPaidData(params, createtime, date, tenantId); } wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode()); - count = wxChartDataMapper.selectCount(wxChartDataEntity); + count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); carPayFeeData(params, createtime, date, tenantId); } wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); - count = wxChartDataMapper.selectCount(wxChartDataEntity); + count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); carMemberData(params, createtime, date, tenantId); } wxChartDataEntity.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); - count = wxChartDataMapper.selectCount(wxChartDataEntity); + count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("新增停车会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); carNewMemberData(createtime, date, tenantId); } wxChartDataEntity.setType(EnumChartType.CAR_BIND.getCode()); - count = wxChartDataMapper.selectCount(wxChartDataEntity); + count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); carBindData(params, createtime, date, tenantId); @@ -139,7 +140,7 @@ public class ChartDataSchedule { params.put("tenantId", tenantId); wxChartDataEntity.setTenantId(tenantId); wxChartDataEntity.setType(EnumChartType.SALE_COUPON_PRICE.getCode()); - int count = wxChartDataMapper.selectCount(wxChartDataEntity); + int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>"); WxCouponOrder wxCouponOrder = new WxCouponOrder(); @@ -171,7 +172,7 @@ public class ChartDataSchedule { wxChartDataEntity.setTenantId(tenantId); wxChartDataEntity.setType(EnumChartType.MERCHANT_TRADE.getCode()); - int count = wxChartDataMapper.selectCount(wxChartDataEntity); + int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("解单金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); @@ -237,7 +238,7 @@ public class ChartDataSchedule { wxChartDataEntity.setQuerytime(querytime); wxChartDataEntity.setCreatetime(createtime); logger.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>" + wxChartDataEntity.toString()); - wxChartDataMapper.insertSelective(wxChartDataEntity); + wxChartDataMapper.insert(wxChartDataEntity); } } \ No newline at end of file diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index 2152bb852..faf4b1c02 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -93,7 +93,7 @@ public class CouponExpiringSchedule { WxGame record = new WxGame(); record.setId(g.getId()); record.setStatus(EnumGameStatus.STATUS_TAKE_OFFF.getCode()); - wxGameMapper.updateByPrimaryKeySelective(record); + wxGameMapper.updateById(record); } }); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 94f05ade6..5c0d7d346 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -1,5 +1,6 @@ package com.iformall.schedule; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; import com.iformall.enums.*; @@ -98,11 +99,11 @@ public class CouponOrderExpiringSchedule { updateRecord.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode()); //券已过期 } updateRecord.setUpdateDate(new Date()); - wxCouponOrderMapper.updateByPrimaryKeySelective(updateRecord); + wxCouponOrderMapper.updateById(updateRecord); // 库存退回 if(bStockBack) { - WxOrder order = wxOrderMapper.selectByPrimaryKey(co.getOrderId()); + WxOrder order = wxOrderMapper.selectById(co.getOrderId()); if(order != null) { wxOrderService.stockBack(order); } @@ -133,7 +134,7 @@ public class CouponOrderExpiringSchedule { wxPayOrder.setTenantId(co.getTenantId()); wxPayOrder.setOrderId(co.getOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); - wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); + wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); @@ -162,7 +163,7 @@ public class CouponOrderExpiringSchedule { if(bStockBack) { // 库存退回 - WxOrder order = wxOrderMapper.selectByPrimaryKey(co.getOrderId()); + WxOrder order = wxOrderMapper.selectById(co.getOrderId()); if(order != null) { wxOrderService.stockBack(order); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index 2a5c0a9ff..baaa98cd2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -335,7 +335,7 @@ public class CouponSendSchedule { WxCUserBasicInfo toUpdate = new WxCUserBasicInfo(); toUpdate.setId(cu.getId()); toUpdate.setScoreDate(cu.getBirthdate()); - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(toUpdate); + wxCUserBasicInfoMapper.updateById(toUpdate); } catch (Exception e) { logger.error("定时发券:记录积分倍率日期失败 {}", e.getMessage()); continue; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index 358747bbe..a028b5b7a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -86,7 +86,7 @@ public class MsgSendingSchedule { // Integer modelId = null; // Long modelIdParam = wxMsg.getModelId(); // if (modelIdParam != null) { -// WxMsgModel wxMsgModel = wxMsgModelMapper.selectByPrimaryKey(modelIdParam); +// WxMsgModel wxMsgModel = wxMsgModelMapper.selectById(modelIdParam); // modelId = wxMsgModel.getModelId(); // } // String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.NO.getCode().toString(), modelId); @@ -99,7 +99,7 @@ public class MsgSendingSchedule { // wxMsg.setSendstatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); // } // wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); -// wxMsgMapper.updateByPrimaryKeySelective(wxMsg); +// wxMsgMapper.updateById(wxMsg); // logger.info("短信发送结束:" + jsonObjectResult.toJSONString()); // } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 6af580675..fca5200f0 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -1,14 +1,16 @@ package com.iformall.schedule; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxOrder; -import com.iformall.enums.*; +import com.iformall.enums.EnumAppType; +import com.iformall.enums.EnumOrderStatus; +import com.iformall.enums.EnumOrderType; +import com.iformall.enums.EnumRefundStatus; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxOrderGroupMapper; import com.iformall.mapper.WxOrderMapper; -import com.iformall.mq.MqBaseProducer; -import com.iformall.service.WxMsgRecordService; import com.iformall.service.WxOrderGroupService; import com.iformall.service.WxOrderService; import com.iformall.service.WxRefundOrderService; @@ -19,6 +21,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + import java.util.Date; import java.util.HashMap; import java.util.List; @@ -98,9 +101,9 @@ public class OrderExpiringSchedule { // 拼团取消 WxOrder order = new WxOrder(); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); - wxOrderMapper.select(order).stream().forEach(o -> { + wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { - orderGroupExpired(o); + orderGroupExpired((WxOrder) o); } catch (Exception e) { logger.error("拼团取消失败" + e.getMessage()); } @@ -109,9 +112,9 @@ public class OrderExpiringSchedule { //拼团过期 order = new WxOrder(); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()); - wxOrderMapper.select(order).stream().forEach(o -> { + wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { - returnMoney(o); + returnMoney((WxOrder) o); } catch (Exception e) { logger.error("拼团过期退款失败" + e.getMessage()); } @@ -120,9 +123,9 @@ public class OrderExpiringSchedule { //拼团券下架 order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); - wxOrderMapper.select(order).stream().forEach(o -> { + wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { - returnMoney(o); + returnMoney((WxOrder) o); } catch (Exception e) { logger.error("拼团券下架退款失败" + e.getMessage()); } @@ -130,14 +133,15 @@ public class OrderExpiringSchedule { //参团失败 order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); - wxOrderMapper.select(order).stream().forEach(o -> { + wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { - returnMoney(o); + returnMoney((WxOrder) o); } catch (Exception e) { logger.error("参团失败退款失败" + e.getMessage()); } }); + } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @@ -147,7 +151,7 @@ public class OrderExpiringSchedule { updateOrder.setId(order.getId()); updateOrder.setUpdateDate(new Date()); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); - wxOrderMapper.updateByPrimaryKeySelective(updateOrder); + wxOrderMapper.updateById(updateOrder); // 库存退回 wxOrderService.stockBack(order); @@ -166,7 +170,7 @@ public class OrderExpiringSchedule { updateOrder.setTenantId(order.getTenantId()); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()); updateOrder.setUpdateDate(curDate); - wxOrderMapper.updateByPrimaryKeySelective(updateOrder); + wxOrderMapper.updateById(updateOrder); // 库存退回 wxOrderService.stockBack(order); @@ -186,7 +190,7 @@ public class OrderExpiringSchedule { updateOrder.setTenantId(order.getTenantId()); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); updateOrder.setUpdateDate(curDate); - wxOrderMapper.updateByPrimaryKeySelective(updateOrder); + wxOrderMapper.updateById(updateOrder); // 库存退回 wxOrderService.stockBack(order); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 7241c1e13..5a7af6f22 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -2,6 +2,7 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.dto.KwMeterDataDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.KwMeterDataVo; @@ -63,8 +64,8 @@ public class PowerBillAutoBuildSchedule { public void powerBillAutoConfigStart() { logger.info("自动生成电费账单开始...."); int dayOfMonth = LocalDate.now().getDayOfMonth(); - List wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectAll() - .stream().filter(config -> StringUtils.isNotEmpty(config.getUnitPrice()) + List wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectList(new QueryWrapper(null)); + wxPowerBillAutoConfigs = wxPowerBillAutoConfigs.stream().filter(config -> StringUtils.isNotEmpty(config.getUnitPrice()) && StringUtils.isNotEmpty(config.getBuildDay()) && StringUtils.isNotEmpty(config.getReceiveDay())) .collect(Collectors.toList()); @@ -80,7 +81,7 @@ public class PowerBillAutoBuildSchedule { private void merchantPowerBillConfigStart(WxPowerBillAutoConfig wxPowerBillAutoConfig) { WxMerchantPowerBillConfig wxMerchantPowerBillConfig = new WxMerchantPowerBillConfig(); wxMerchantPowerBillConfig.setTenantId(wxPowerBillAutoConfig.getTenantId()); - List wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.select(wxMerchantPowerBillConfig); + List wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.selectList(new QueryWrapper(wxMerchantPowerBillConfig)); for (int i = 0; i < wxMerchantPowerBillConfigs.size(); i++) { buildPowerBill(wxMerchantPowerBillConfigs.get(i), wxPowerBillAutoConfig); } @@ -142,7 +143,7 @@ public class PowerBillAutoBuildSchedule { KwMerchantMeter kwMerchantMeter = new KwMerchantMeter(); kwMerchantMeter.setMerchantId(merchantId); kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); - List merchantMeterList = kwMerchantMeterMapper.select(kwMerchantMeter); + List merchantMeterList = kwMerchantMeterMapper.selectList(new QueryWrapper(kwMerchantMeter)); int usedPower = 0; if (!merchantMeterList.isEmpty()) { int size = merchantMeterList.size(); @@ -208,7 +209,7 @@ public class PowerBillAutoBuildSchedule { WxMerchantShop wxMerchantShop = new WxMerchantShop(); wxMerchantShop.setMerchantId(merchantId); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - List select = wxMerchantShopMapper.select(wxMerchantShop); + List select = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); if (!select.isEmpty()) { return select.get(0).getShopId(); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java index c54cf27c8..fcce0b6bc 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java @@ -51,7 +51,7 @@ public class WeChatAccessTokenSchedule { updateAppInfo.setAccessToken(accessToken); updateAppInfo.setLastTokenTime(new Date()); updateAppInfo.setExpiresIn(7200); - wxAppinfoMapper.updateByPrimaryKeySelective(updateAppInfo); + wxAppinfoMapper.updateById(updateAppInfo); } catch (WxErrorException e) { logger.error(e.getMessage()); } catch (Exception e) { diff --git a/mallinkSchedule/src/main/resources/application.yml b/mallinkSchedule/src/main/resources/application.yml index 96fd41452..5e84567cb 100644 --- a/mallinkSchedule/src/main/resources/application.yml +++ b/mallinkSchedule/src/main/resources/application.yml @@ -39,20 +39,21 @@ spring: virtual-host: / -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po +# MybatisPlus +mybatis-plus: mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10 + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po -#PageHelper +# PageHelper pagehelper: helperDialect: mysql reasonable: false diff --git a/mallinkService/src/main/java/com/iformall/common/CommonMapper.java b/mallinkService/src/main/java/com/iformall/common/CommonMapper.java index cc76bf61c..23980a0f4 100644 --- a/mallinkService/src/main/java/com/iformall/common/CommonMapper.java +++ b/mallinkService/src/main/java/com/iformall/common/CommonMapper.java @@ -1,9 +1,6 @@ package com.iformall.common; -import tk.mybatis.mapper.common.BaseMapper; -import tk.mybatis.mapper.common.IdsMapper; -import tk.mybatis.mapper.common.Marker; -import tk.mybatis.mapper.common.special.InsertListMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.io.Serializable; @@ -12,5 +9,5 @@ import java.io.Serializable; * @date 2017-12-27 */ -public interface CommonMapper extends BaseMapper, IdsMapper, InsertListMapper, Marker { +public interface CommonMapper extends BaseMapper { } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java index 81a5a978e..003a39931 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java @@ -1,14 +1,8 @@ package com.iformall.domain.dto; -import com.iformall.domain.po.BaseEntity; -import com.iformall.domain.po.WxBillProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - /** * @author gongbiao */ diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java index 03f6151cb..d80ee176e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java @@ -4,10 +4,6 @@ import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - /** * @author gongbiao */ diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java index 91d8fb4a3..1c051c88b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java @@ -1,17 +1,10 @@ package com.iformall.domain.dto; import com.iformall.domain.po.BaseEntity; -import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.ArrayList; import java.util.Date; -import java.util.List; /** * @author gongbiao diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 6c96f5fef..79fa8a112 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -1,12 +1,12 @@ package com.iformall.domain.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; import java.util.Date; /** @@ -25,19 +25,19 @@ public class MarkingCouponDataReportDto extends BaseEntity { private String tenantId; private Integer channelType; - @Transient + @TableField(exist = false) @SortColumn(column = "xTime") private String xTime; - @Transient + @TableField(exist = false) @SortColumn(column = "sendCount") private Integer sendCount; - @Transient + @TableField(exist = false) private Integer pv; - @Transient + @TableField(exist = false) private Integer uv; - @Transient + @TableField(exist = false) @SortColumn(column = "xTime") private String xtime; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 3743582f8..e51206e6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -1,15 +1,13 @@ package com.iformall.domain.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; import java.util.List; -import javax.persistence.Id; -import javax.persistence.Transient; /** * 用户查询dto * @author jinguo @@ -24,7 +22,7 @@ public class WxCUserBasicInfoDto extends BaseEntity { */ private static final long serialVersionUID = -1116465873573690766L; - @Id + protected Long id; @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") @@ -39,50 +37,50 @@ public class WxCUserBasicInfoDto extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") private String name; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; - @Transient + @TableField(exist = false) private Integer reportType; - @Transient + @TableField(exist = false) private Date birthStartTime; - @Transient + @TableField(exist = false) private Date birthEndTime; - @Transient + @TableField(exist = false) private Date loginStartTime; - @Transient + @TableField(exist = false) private Date loginEndTime; - @Transient + @TableField(exist = false) private Date verifiedStartTime; - @Transient + @TableField(exist = false) private Date verifiedEndTime; - @Transient + @TableField(exist = false) private Integer levelStartScore; - @Transient + @TableField(exist = false) private Integer levelEndScore; - @Transient + @TableField(exist = false) private Integer sex; - @Transient + @TableField(exist = false) List tagIds; - @Transient + @TableField(exist = false) private String phones; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="1查询导入的数据",name="queryImport") protected Integer queryImport; - @Transient + @TableField(exist = false) protected List filterList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java index 2f5a31278..869159b4d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java @@ -2,11 +2,7 @@ package com.iformall.domain.dto; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Transient; import java.io.Serializable; -import java.util.Date; -import java.util.List; /** * 用户查询dto diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java index 0a5829898..3dc2aad75 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java @@ -1,8 +1,8 @@ package com.iformall.domain.dto; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; -import javax.persistence.Transient; import java.io.Serializable; import java.util.Date; import java.util.Map; @@ -17,7 +17,7 @@ public class WxCouponChannelDto implements Serializable { private Date beginTime; private Date endTime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index 1a3e2ce7b..96270bb2d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -1,11 +1,11 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.common.SortColumn; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.util.ArrayList; @@ -21,22 +21,26 @@ import java.util.List; public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Transient + + @TableField(exist = false) + private List ids; + + @TableField(exist = false) private String sortColumn; - @Transient + @TableField(exist = false) private String sortOrder; - @Transient + @TableField(exist = false) private String sortColumns; - @Transient + @TableField(exist = false) protected String floorForRule; - @Transient + @TableField(exist = false) protected String businessForRule; - @Transient + @TableField(exist = false) protected String[] tempShop; public String getSortColumns() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index 1cc93f370..d282f791d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -1,29 +1,25 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @author gongbiao */ -@Table(name = "kw_box") +@TableName(value = "kw_box") @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) public class KwBox extends BaseEntity { - @Id + protected Long id; - @Transient - protected List ids; + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; @@ -73,10 +69,10 @@ public class KwBox extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "最大目标数量", name = "maxTagNum") private Integer maxTagNum; - @Transient + @TableField(exist = false) private Integer meterCount; - @Transient + @TableField(exist = false) private List meters; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java index a5d5a35a2..cb20ac7c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.ArrayList; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "kw_box_cmd_history") +@TableName(value = "kw_box_cmd_history") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class KwBoxCmdHistory extends BaseEntity { - @Id + protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java index 93a3a0435..c1569815b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java @@ -1,12 +1,11 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -14,16 +13,13 @@ import java.util.List; /** * @author gongbiao */ -@Table(name = "kw_merchant_meter") +@TableName(value = "kw_merchant_meter") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class KwMerchantMeter extends BaseEntity { - @Id - protected Long id; - @Transient - protected List ids; + protected Long id; @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index e351376ea..1a1f7f1ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -1,28 +1,24 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "kw_meter") +@TableName(value = "kw_meter") @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) public class KwMeter extends BaseEntity { - @Id + protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; @@ -71,27 +67,27 @@ public class KwMeter extends BaseEntity { private Integer bindStatus; @Excel(name = "采集设备号", width = 20, orderNum = "7") - @Transient + @TableField(exist = false) private String boxImei; @Excel(name = "协议(0,1,2-AUTO,97,07协议)", width =30, orderNum = "5") - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "协议(0,1,2-AUTO,97,07协议)", name = "protocol") private Integer protocol; @Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6") - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "波特率(1200,2400,9600)", name = "bandrate") private Integer bandrate; - @Transient + @TableField(exist = false) @Excel(name = "商户", width = 20, orderNum = "8") private String merchantName; - @Transient + @TableField(exist = false) private Long merchantId; - @Transient + @TableField(exist = false) private Integer merchantMeterStatus; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index fa24db3ba..812cc1d4f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -1,20 +1,16 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.ArrayList; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "kw_meter_data") +@TableName(value = "kw_meter_data") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @@ -22,12 +18,7 @@ public class KwMeterData extends BaseEntity { protected Long id; - @Id protected Long fake_id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 7c44ba575..279c7d1eb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -1,43 +1,40 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; import java.util.List; -import javax.persistence.Id; -@Table(name = "mall_permission") +@TableName(value = "mall_permission") @Data @EqualsAndHashCode(callSuper = true) public class MallPermission extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") + + @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") private String name; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") private String nameLike; @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") private Long parentId; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="原父编号ID",name="origParentId") private Long origParentId; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="父菜单",name="parentName") private String parentName; @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission") private String available; @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") private String permission; - @Transient + @TableField(exist = false) private List permissions; @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") private Integer resourceType; @@ -54,20 +51,20 @@ public class MallPermission extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") private Integer sort; - @Transient + @TableField(exist = false) private Integer sortFrom; - @Transient + @TableField(exist = false) private Integer sortTo; - @Transient + @TableField(exist = false) private Integer sortGte; - @Transient + @TableField(exist = false) private Integer sortGt; - @Transient + @TableField(exist = false) private Integer sortLte; - @Transient + @TableField(exist = false) private Integer sortLt; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") private List children; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java b/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java index 1ff0e909c..b66710f77 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "mall_resource") +@TableName(value = "mall_resource") @Data @EqualsAndHashCode(callSuper = true) public class MallResource extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="bucket名称",name="bucket") private String bucket; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java index aa0039a08..3262e64c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java @@ -1,24 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "mall_role") +@TableName(value = "mall_role") @Data @EqualsAndHashCode(callSuper = true) public class MallRole extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -28,8 +22,8 @@ public class MallRole extends BaseEntity { private String available; @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") private String description; - - @Transient + + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") private String menus; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java index dc120e6ce..1b13247dc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java @@ -1,29 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.List; -@Table(name = "mall_role_permission") +@TableName(value = "mall_role_permission") @Data @EqualsAndHashCode(callSuper = true) public class MallRolePermission extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @Transient + @TableField(exist = false) protected List permissionIds; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") @@ -31,5 +25,4 @@ public class MallRolePermission extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId") private Long permissionId; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java b/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java index dafac653a..598dece7e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java @@ -1,26 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -@Table(name = "mall_sale_type") +@TableName(value = "mall_sale_type") @Data @EqualsAndHashCode(callSuper = true) public class MallSaleType extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="销售类型名",name="name") + @io.swagger.annotations.ApiModelProperty(value="销售类型名",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="资源类型1:速享版 2:速享标准版 3.标准版",name="type") private Integer type; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java index 7dc3989c7..c4c351bac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "mall_user_action") +@TableName(value = "mall_user_action") @Data @EqualsAndHashCode(callSuper = true) public class MallUserAction extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") private Long userId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index c86acf9c0..89ec398d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserWechat; import com.iformall.utils.Constant; @@ -7,27 +9,20 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.ArrayList; + import java.util.Date; import java.util.List; -@Table(name = "mall_user_info") +@TableName(value = "mall_user_info") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class MallUserInfo extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -58,28 +53,28 @@ public class MallUserInfo extends BaseEntity { private String webOpenId; @io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat") - @Transient + @TableField(exist = false) private Integer withWechat; - @Transient + @TableField(exist = false) private Integer withWechatForQuery; - @Transient + @TableField(exist = false) private Long roleId; - @Transient + @TableField(exist = false) private String roleName; //该用户所有的角色 - @Transient + @TableField(exist = false) private List role; //该用户包含的所有权限 - @Transient + @TableField(exist = false) private List permission; //拥有的菜单权限 - @Transient + @TableField(exist = false) private String menus; - @Transient + @TableField(exist = false) private String captcha; @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java index 9d55dc685..62bcf20bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java @@ -1,26 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -@Table(name = "mall_user_role") +@TableName(value = "mall_user_role") @Data @EqualsAndHashCode(callSuper = true) public class MallUserRole extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid") + + @io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid") private Long uid; @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") private Long roleId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java index b117f6226..df4d3ba96 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java @@ -1,26 +1,17 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; import java.io.Serializable; -@Table(name = "pos_action_log") +@TableName(value = "pos_action_log") @Data public class PosActionLog implements Serializable { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="访问url",name="url") + + @io.swagger.annotations.ApiModelProperty(value="访问url",name="url") private String url; @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java b/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java index 22221eef1..ad3329d7f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosCouponOrderVerify.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -import javax.persistence.Id; -@Table(name = "pos_coupon_order_verify") +@TableName(value = "pos_coupon_order_verify") @Data @EqualsAndHashCode(callSuper = true) public class PosCouponOrderVerify extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="券包ID",name="couponOrderId") private Long couponOrderId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java index 87a449eef..d7ad5bbfd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "pos_mall_config") +@TableName(value = "pos_mall_config") @Data @EqualsAndHashCode(callSuper = true) public class PosMallConfig extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="会员折扣是否开启,0-禁用,1-可用",name="discount") private Integer discount; @@ -34,5 +27,4 @@ public class PosMallConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java index ffb669e1d..b39a5ad2a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java @@ -1,25 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; import java.io.Serializable; -@Table(name = "pos_order") +@TableName(value = "pos_order") @Data public class PosOrder implements Serializable { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="POS订单ID",name="posOrderNo") private String posOrderNo; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java index a837da83f..737d58ab0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java @@ -1,26 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import javax.persistence.*; import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; import java.io.Serializable; -@Table(name = "pos_pay_order") +@TableName(value = "pos_pay_order") @Data public class PosPayOrder implements Serializable { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java index 5ccaec990..5cb05b2cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java @@ -1,24 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; import java.util.List; -import javax.persistence.Id; -@Table(name = "push_limit") +@TableName(value = "push_limit") @Data @EqualsAndHashCode(callSuper = true) public class PushLimit extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient + @TableField(exist = false) protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java index 2a1fb2738..2da501894 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java @@ -1,24 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "sys_monitor") +@TableName(value = "sys_monitor") @Data @EqualsAndHashCode(callSuper = true) public class SysMonitor extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; + @io.swagger.annotations.ApiModelProperty(value="网址url",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java index 5fc34ee85..733f2f23d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java @@ -1,26 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "th_dev_info") +@TableName(value = "th_dev_info") @Data @EqualsAndHashCode(callSuper = true) public class ThDevInfo extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="开发者ID",name="devId") + + + @io.swagger.annotations.ApiModelProperty(value="开发者ID",name="devId") private String devId; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index e75b2ba30..847dbcbd6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -1,30 +1,24 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_activity") +@TableName(value = "wx_activity") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxActivity extends BaseEntity { - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") private String tenantId; @@ -77,20 +71,20 @@ public class WxActivity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "是否发送短信1是0否", name = "sendMsg") private Integer sendMsg; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") private Date starttime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") private Date endtime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "报名小程序路径", name = "weappPath") protected String weappPath; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "报名二维码", name = "weappSceneForJoin") protected String weappSceneForJoin; @@ -103,11 +97,11 @@ public class WxActivity extends BaseEntity { } - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "签到小程序路径", name = "weappPath") protected String weappPathForSign; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "签到二维码", name = "weappSceneForSign") protected String weappSceneForSign; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 0c2c70da2..6d9983fcb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -1,31 +1,25 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_activity_join") +@TableName(value = "wx_activity_join") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxActivityJoin extends BaseEntity { - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -78,7 +72,7 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "图片", name = "imgUrl") private String imgUrl; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "状态", name = "statusStr") private String statusStr; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java index 2be6fac85..3f0499497 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java @@ -1,23 +1,15 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -@Table(name = "wx_admin_log") +@TableName(value = "wx_admin_log") @Data @EqualsAndHashCode(callSuper = true) public class WxAdminLog extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index bf86d2751..bea0c54f2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -1,26 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_appinfo") +@TableName(value = "wx_appinfo") @Data @EqualsAndHashCode(callSuper = true) public class WxAppinfo extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java index e2f3b0a73..5f27b21d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -1,24 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_authorizer_info") +@TableName(value = "wx_authorizer_info") @Data @EqualsAndHashCode(callSuper = true) public class WxAuthorizerInfo extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java index b05df9f05..105b3fdbd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_b_log") +@TableName(value = "wx_b_log") @Data @EqualsAndHashCode(callSuper = true) public class WxBLog extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="",name="data") private String data; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java index af0da6520..ac11df1ca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_bill_action") +@TableName(value = "wx_bill_action") @Data @EqualsAndHashCode(callSuper = true) public class WxBillAction extends BaseEntity { - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -53,15 +47,15 @@ public class WxBillAction extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "付款时间", name = "payDate") private Date payDate; - @Transient + @TableField(exist = false) private Long oldPrice; - @Transient + @TableField(exist = false) private Long newPrice; - @Transient + @TableField(exist = false) private String startDate; - @Transient + @TableField(exist = false) private String endDate; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index d3d57b81d..7d339cb23 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -1,14 +1,13 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; @@ -17,18 +16,15 @@ import java.util.Map; /** * @author gongbiao */ -@Table(name = "wx_bill_daily") +@TableName(value = "wx_bill_daily") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxBillDaily extends BaseEntity{ - @Id protected Long id; - @Transient - protected List ids; - @Transient + @TableField(exist = false) private String merchantName; @Excel(name = "费用类型*", replace = {"水费_1", "电费_2"}, width = 20, orderNum = "2") @@ -82,23 +78,23 @@ public class WxBillDaily extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value = "费用明细", name = "priceDetail") private String priceDetail; - @Transient + @TableField(exist = false) private Integer allPeriod; - @Transient + @TableField(exist = false) private Long needPay; - @Transient + @TableField(exist = false) private Long latePayPrice; - @Transient + @TableField(exist = false) @SortColumn(column = "period") private Integer period; - @Transient + @TableField(exist = false) private String shopNumber; - @Transient + @TableField(exist = false) private List> shops; @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index f38fb317d..eda10cd93 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -1,30 +1,25 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_bill_rent_deposit") +@TableName(value = "wx_bill_rent_deposit") @Data @EqualsAndHashCode(callSuper = true) public class WxBillDeposit extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @Transient + @TableField(exist = false) private String merchantName; @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 1df316759..d0dfee561 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -1,14 +1,13 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -17,19 +16,17 @@ import java.util.Map; /** * @author gongbiao */ -@Table(name = "wx_bill_other") +@TableName(value = "wx_bill_other") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxBillOther extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @Excel(name = "商户名称", width = 20, orderNum = "2") - @Transient + + @Excel(name = "商户名称", width = 20, orderNum = "2") + @TableField(exist = false) private String merchantName; @Excel(name = "其他费用名称", width = 20, orderNum = "3") @@ -83,30 +80,30 @@ public class WxBillOther extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") private Integer payWay; - @Transient + @TableField(exist = false) private Integer allPeriod; - @Transient + @TableField(exist = false) private Long needPay; - @Transient + @TableField(exist = false) private Long latePayPrice; - @Transient + @TableField(exist = false) @SortColumn(column = "period") private Integer period; @Excel(name = "商铺号", width = 20, orderNum = "1") - @Transient + @TableField(exist = false) private String shopNumber; - @Transient + @TableField(exist = false) @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) private String receivePayStr; - @Transient + @TableField(exist = false) @Excel(name = "实收金额(元)", orderNum = "5", width = 20) private String payStr; - @Transient + @TableField(exist = false) @Excel(name = "欠缴金额(元)", orderNum = "6", width = 20) private String oweStr; @@ -128,7 +125,7 @@ public class WxBillOther extends BaseEntity { return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString(); } - @Transient + @TableField(exist = false) private List> shops; @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") private Integer freeze; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 1a70376a0..ec724d5d9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -1,14 +1,14 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -17,20 +17,17 @@ import java.util.Map; /** * @author gongbiao */ -@Table(name = "wx_bill_other_deposit") +@TableName(value = "wx_bill_other_deposit") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxBillOtherDeposit extends BaseEntity { - @Id - protected Long id; - @Transient - protected List ids; + protected Long id; @Excel(name = "商户名称", width = 20, orderNum = "2") - @Transient + @TableField(exist = false) private String merchantName; @io.swagger.annotations.ApiModelProperty(value = "账单名称", name = "name") @@ -88,28 +85,28 @@ public class WxBillOtherDeposit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") private Integer payWay; - @Transient + @TableField(exist = false) private Integer allPeriod; - @Transient + @TableField(exist = false) private Long needPay; - @Transient + @TableField(exist = false) private Long latePayPrice; - @Transient + @TableField(exist = false) @SortColumn(column = "period") private Integer period; @Excel(name = "商铺号", width = 20, orderNum = "1") - @Transient + @TableField(exist = false) private String shopNumber; - @Transient + @TableField(exist = false) @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) private String receivePayStr; - @Transient + @TableField(exist = false) @Excel(name = "实收金额(元)", orderNum = "5", width = 20) private String payStr; @@ -128,10 +125,10 @@ public class WxBillOtherDeposit extends BaseEntity { return status == 5 ? updatetime : null; } - @Transient + @TableField(exist = false) @Excel(name = "退款日", orderNum = "7", width = 20, format = "yyyy-MM-dd") private Date returnDate; - @Transient + @TableField(exist = false) private List> shops; @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 1ab08ec51..78c7a76ca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -1,35 +1,31 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_bill_property") +@TableName(value = "wx_bill_property") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxBillProperty extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @Excel(name = "商户名称", width = 20, orderNum = "2") - @Transient + + @Excel(name = "商户名称", width = 20, orderNum = "2") + @TableField(exist = false) private String merchantName; @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") @@ -44,7 +40,7 @@ public class WxBillProperty extends BaseEntity { } @Excel(name = "本期账款(元)", width = 20, orderNum = "6") - @Transient + @TableField(exist = false) private String receivePayStr; @@ -53,7 +49,7 @@ public class WxBillProperty extends BaseEntity { } @Excel(name = "实收账款(元)", width = 20, orderNum = "7") - @Transient + @TableField(exist = false) private String payStr; @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") @@ -83,7 +79,7 @@ public class WxBillProperty extends BaseEntity { } @Excel(name = "欠缴金额(元)", width = 20, orderNum = "9") - @Transient + @TableField(exist = false) private String oweStr; @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8") @@ -135,7 +131,7 @@ public class WxBillProperty extends BaseEntity { } @Excel(name = "滞纳金(元)", width = 20, orderNum = "12") - @Transient + @TableField(exist = false) private String latePayPriceStr; @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") @@ -156,33 +152,33 @@ public class WxBillProperty extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; - @Transient + @TableField(exist = false) private Integer allPeriod; @Excel(name = "商铺号", width = 20, orderNum = "1") - @Transient + @TableField(exist = false) private String shopNumber; @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") - @Transient + @TableField(exist = false) private Integer depositStatus; - @Transient + @TableField(exist = false) private Long deposit; - @Transient + @TableField(exist = false) private Integer limitStart; - @Transient + @TableField(exist = false) private Integer limitEnd; @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") - @Transient + @TableField(exist = false) private Integer latePayDay; - @Transient + @TableField(exist = false) private String latePayMoneyBefore; - @Transient + @TableField(exist = false) private String latePayMoneyUpdate; @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 42e05dfd5..6ea43752c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -1,29 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_bill_property_deposit") +@TableName(value = "wx_bill_property_deposit") @Data @EqualsAndHashCode(callSuper = true) public class WxBillPropertyDeposit extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; - @Transient + @TableField(exist = false) private String merchantName; @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 90709370b..756f9c97c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -1,35 +1,32 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_bill_rent") +@TableName(value = "wx_bill_rent") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxBillRent extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @Excel(name = "商户名称", width = 20, orderNum = "2") - @Transient + + @Excel(name = "商户名称", width = 20, orderNum = "2") + @TableField(exist = false) private String merchantName; @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") @@ -43,7 +40,7 @@ public class WxBillRent extends BaseEntity { } @Excel(name = "本期账款(元)", width = 20, orderNum = "6") - @Transient + @TableField(exist = false) private String receivePayStr; public String getPayStr() { @@ -51,7 +48,7 @@ public class WxBillRent extends BaseEntity { } @Excel(name = "实收账款(元)", width = 20, orderNum = "7") - @Transient + @TableField(exist = false) private String payStr; @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") @@ -83,7 +80,7 @@ public class WxBillRent extends BaseEntity { } @Excel(name = "欠缴金额(元)", width = 20, orderNum = "9") - @Transient + @TableField(exist = false) private String oweStr; @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8") @@ -136,7 +133,7 @@ public class WxBillRent extends BaseEntity { } @Excel(name = "滞纳金(元)", width = 20, orderNum = "12") - @Transient + @TableField(exist = false) private String latePayPriceStr; @SortColumn(column = "period") @@ -159,38 +156,38 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; - @Transient + @TableField(exist = false) private Integer allPeriod; @Excel(name = "商铺号", width = 20, orderNum = "1") - @Transient + @TableField(exist = false) private String shopNumber; @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") - @Transient + @TableField(exist = false) private Integer depositStatus; - @Transient + @TableField(exist = false) private Integer rentType; - @Transient + @TableField(exist = false) private Long deposit; @io.swagger.annotations.ApiModelProperty(value = "联营费率", name = "payRatio") private Long payRatio; - @Transient + @TableField(exist = false) private Integer limitStart; - @Transient + @TableField(exist = false) private Integer limitEnd; @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") - @Transient + @TableField(exist = false) private Integer latePayDay; - @Transient + @TableField(exist = false) private String latePayMoneyBefore; - @Transient + @TableField(exist = false) private String latePayMoneyUpdate; private String busDiscountRatio; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java index 9fa4cfd63..dfcdb86d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -1,12 +1,12 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; import java.util.Map; @@ -14,24 +14,22 @@ import java.util.Map; /** * @author luozukai */ -@Table(name = "wx_bill_settle") +@TableName(value = "wx_bill_settle") @Data @EqualsAndHashCode(callSuper = true) public class WxBillSettle extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="结算单号",name="settleNumber") @Excel(name="结算单号",width = 20,orderNum = "1") private String settleNumber; - @Transient + @TableField(exist = false) @Excel(name="结算商户",width = 20,orderNum = "2") private String merchantName; @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") @@ -58,48 +56,48 @@ public class WxBillSettle extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; //结余金额 - @Transient + @TableField(exist = false) @Excel(name="结算金额(元)",width = 20,orderNum = "6") private Long balance; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "收款账单列表", name = "receiveBillIds") private List receiveBillIds; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "承付账单列表", name = "payBillIds") private List payBillIds; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "结单记录", name = "settleRecordList") private List settleRecordList; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") private Date starttime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") private Date endtime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="清算方向 1商场结款 2商户结款",name="settleWay") private Integer settleWay; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="流向 0流入 1流出",name="direction") private Integer direction; - @Transient + @TableField(exist = false) private Integer limitStart; - @Transient + @TableField(exist = false) private Integer limitEnd; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="是否过滤结算历史 1不过滤",name="filterSettleRecord") private Integer filterSettleRecord =0; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java index 45c1242cf..3a0fcbacf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java @@ -1,24 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; -import java.util.List; /** * @author luozukai */ -@Table(name = "wx_bill_settle_bill") +@TableName(value = "wx_bill_settle_bill") @Data @EqualsAndHashCode(callSuper = true) public class WxBillSettleBill extends BaseEntity { public WxBillSettleBill(){} private static final long serialVersionUID = 1L; - @Id + protected Long id; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -39,21 +38,21 @@ public class WxBillSettleBill extends BaseEntity { private Date updatetime; @io.swagger.annotations.ApiModelProperty(value="账单类型/名称",name="billName") - @Transient + @TableField(exist = false) private String billName; @io.swagger.annotations.ApiModelProperty(value="应收金额",name="receivePay") - @Transient + @TableField(exist = false) private String receivePay; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="账单开始时间",name="starttime") private Date starttime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime") private Date endtime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe") private Integer getReceivePayOrOwe; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java index 66b6af281..5a52f1076 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java @@ -1,30 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author luozukai */ -@Table(name = "wx_bill_settle_record") +@TableName(value = "wx_bill_settle_record") @Data @EqualsAndHashCode(callSuper = true) public class WxBillSettleRecord extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="结算单id",name="settleId") private Long settleId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index 288bc7d14..3f86b5b75 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -1,30 +1,25 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_brand") +@TableName(value = "wx_brand") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxBrand extends BaseEntity{ - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index 30b273619..be477bed1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -1,26 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_business") +@TableName(value = "wx_business") @Data @EqualsAndHashCode(callSuper = true) public class WxBusiness extends BaseEntity { - @Id protected Integer id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") + @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") private String title; @io.swagger.annotations.ApiModelProperty(value="1.优惠券",name="type") private Integer type; @@ -29,19 +23,19 @@ public class WxBusiness extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; - @Transient + @TableField(exist = false) private String tenantId; - @Transient + @TableField(exist = false) private Integer limitStart; - @Transient + @TableField(exist = false) private Integer limitEnd; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java index 7927f7c3c..ae2060dfa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_c_log") +@TableName(value = "wx_c_log") @Data @EqualsAndHashCode(callSuper = true) public class WxCLog extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="",name="data") private String data; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 69f85a095..8233e340c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -1,33 +1,31 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.UUID; -@Table(name = "wx_c_user") +@TableName(value = "wx_c_user") @JsonIgnoreProperties(ignoreUnknown = true) @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCUser extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId") private String openId; @@ -121,28 +119,28 @@ public class WxCUser extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private Integer credit; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="渠道名称",name="channelName") private String channelName; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="渠道描述",name="sceneDescription") protected String sceneDescription; - @Transient + @TableField(exist = false) List sceneList; - @Transient + @TableField(exist = false) protected Date startDate; - @Transient + @TableField(exist = false) protected Date endDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="操作人类型 枚举:EnumUserType",name="operatorType") private Integer operatorType; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") private Long operatorId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 4ee8f9789..95666f481 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -2,35 +2,31 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; import java.util.Objects; -@Table(name = "wx_c_user_basic_info") +@TableName(value = "wx_c_user_basic_info") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCUserBasicInfo extends BaseEntity { - @Id protected Long id; @JsonIgnore protected Date scoreDate; - @Transient - protected List ids; - @Excel(name="姓名",width = 20,orderNum = "1") + @Excel(name="姓名",width = 20,orderNum = "1") @NotNull @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") private String name; @@ -59,7 +55,7 @@ public class WxCUserBasicInfo extends BaseEntity { private Date birthdate; @Excel(name="地址",width = 20,orderNum = "7") - @Transient + @TableField(exist = false) private String addressStr; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @@ -99,27 +95,27 @@ public class WxCUserBasicInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="活动记录",name="actRecord") private Integer actRecord; - @Transient + @TableField(exist = false) @Excel(name="标签",width = 50,orderNum = "10") private String tagNames; - @Transient + @TableField(exist = false) private String tagIds; - @Transient + @TableField(exist = false) private List tagsList; - @Transient + @TableField(exist = false) private List carList; - @Transient + @TableField(exist = false) private Integer carCount; - @Transient + @TableField(exist = false) private Date startTime; - @Transient + @TableField(exist = false) private Date endTime; public String getAddressStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java index 707d37a03..84c251f11 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_c_user_car") +@TableName(value = "wx_c_user_car") @Data @EqualsAndHashCode(callSuper = true) public class WxCUserCar extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Long cUserId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java index 6dd0e014e..d57b6d6ae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_c_user_from_b") +@TableName(value = "wx_c_user_from_b") @Data @EqualsAndHashCode(callSuper = true) public class WxCUserFromB extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java index 387d29b0f..fc7c687ca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_c_user_tags") +@TableName(value = "wx_c_user_tags") @Data @EqualsAndHashCode(callSuper = true) public class WxCUserTags extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") private Long userId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 19b786a6a..8c355f772 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -1,29 +1,27 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCampaignType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_campaign") +@TableName(value = "wx_campaign") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCampaign extends BaseEntity { - @Id protected Long id; - @Transient + @TableField(exist = false) protected List ids; - @Transient + @TableField(exist = false) protected List coupons; @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") @@ -76,11 +74,11 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene") private String pageScene; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath") protected String weappPath; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序二维码Scene",name="weappScene") protected String weappScene; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java index ff69f11f7..cb88c6fbe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_car_cmd_log") +@TableName(value = "wx_car_cmd_log") @Data @EqualsAndHashCode(callSuper = true) public class WxCarCmdLog extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="停车厂家,1. ETCP,2.停简单",name="vendorType") private Integer vendorType; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index 3468c78ad..7594899cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -1,21 +1,21 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; -@Table(name = "wx_car_pay_record") +@TableName(value = "wx_car_pay_record") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCarPayRecord extends BaseEntity { - @Id + private Long id; @Excel(name="车牌",width = 20,orderNum = "1") @@ -52,13 +52,13 @@ public class WxCarPayRecord extends BaseEntity { private Date updateDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="开始日期",name="startDate") private String startDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="结束日期",name="endDate") private String endDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") private Integer isPay; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index d825cc73c..70d913f18 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -1,30 +1,27 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; -import java.util.List; -@Table(name = "wx_card_info") +@TableName(value = "wx_card_info") @Data @EqualsAndHashCode(callSuper = true) public class WxCardInfo extends BaseEntity { private static final long serialVersionUID = 1L; @Excel(name = "卡号", width = 20, orderNum = "1") - @Id + protected Long id; /**主键ID-与coupon_order_id一致*/ - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") private Long couponId; @@ -40,7 +37,7 @@ public class WxCardInfo extends BaseEntity { } @Excel(name = "余额(元)", width = 20, orderNum = "7") - @Transient + @TableField(exist = false) private String remainingAmountStr; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index af9e19384..8f67571c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -1,30 +1,26 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.ErrorCode; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; import java.util.List; -@Table(name = "wx_card_spend") +@TableName(value = "wx_card_spend") @Data @EqualsAndHashCode(callSuper = true) public class WxCardSpend extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="储值卡ID",name="cardId") private Long cardId; @@ -69,47 +65,47 @@ public class WxCardSpend extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="来源(0:C端小程序扫一扫, 1:POS支付)",name="payFrom") private Integer payFrom; - @Transient + @TableField(exist = false) @Excel(name = "消费金额(元)", width = 20, orderNum = "7") private String deductionAmountStr; - @Transient + @TableField(exist = false) @Excel(name = "应付金额(元)", width = 20, orderNum = "9") private String paymentStr; - @Transient + @TableField(exist = false) @Excel(name = "实付金额(扣除手续费/元)", width = 20, orderNum = "8") private String realPaymentStr; - @Transient + @TableField(exist = false) protected List payStatusS; - @Transient + @TableField(exist = false) protected String payStatusStr; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") private Date enddate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="时段(0,工作日白天,1,工作日晚上,2周末白天,3周末晚上)",name="timeSlot") private Integer timeSlot; - @Transient + @TableField(exist = false) private Integer businessId; - @Transient + @TableField(exist = false) private Integer subBusinessId; public String getCardRemainAmountStr() { return new BigDecimal(cardRemainAmount == null ? 0 : cardRemainAmount).divide(new BigDecimal(100)).toPlainString(); } - @Transient + @TableField(exist = false) @Excel(name = "卡余额(元) ", width = 20, orderNum = "10") private String cardRemainAmountStr; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java index 8f6ab07f5..e370da348 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java @@ -1,43 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_card_transfer_info") +@TableName(value = "wx_card_transfer_info") @Data @EqualsAndHashCode(callSuper = true) public class WxCardTransferInfo extends BaseEntity { - @Id protected Long id; - @Transient - protected List ids; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - //保存到转赠表中 id,coupon_order_id,tenant_id,title,amount,remain_amount,from_user,to_user,status,create_date,update_date @io.swagger.annotations.ApiModelProperty(value = "卡与订单关联ID", name = "couponOrderId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java index 9413ead8e..48c3ca07c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java @@ -1,24 +1,17 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; -@Table(name = "wx_channel") +@TableName(value = "wx_channel") @Data @EqualsAndHashCode(callSuper = true) public class WxChannel extends BaseEntity { - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId") private Integer channelId; @io.swagger.annotations.ApiModelProperty(value = "渠道名", name = "title") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java index 95caed1cf..45255b70b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java @@ -1,20 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; -@Table(name = "wx_chart_data") +@TableName(value = "wx_chart_data") @Data @EqualsAndHashCode(callSuper = true) public class WxChartDataEntity extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; private String tenantId; private Integer type; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java index 899551766..8a83a9309 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_component_verify_ticket") +@TableName(value = "wx_component_verify_ticket") @Data @EqualsAndHashCode(callSuper = true) public class WxComponentVerifyTicket extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid") + @io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid") private String componentAppid; @io.swagger.annotations.ApiModelProperty(value="微信第三方component_verify_ticket",name="componentVerifyTicket") private String componentVerifyTicket; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 3926873ac..26e01d9dc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.EnumCouponType; @@ -7,55 +9,51 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; -@Table(name = "wx_coupon") +@TableName(value = "wx_coupon") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCoupon extends BaseEntity { - @Id + protected Long id; - @Transient - protected List ids; - @Transient + @TableField(exist = false) protected List types; - @Transient + @TableField(exist = false) protected List notinTypes; - @Transient + @TableField(exist = false) protected String channels; - @Transient + @TableField(exist = false) @SortColumn(column = "sale_price") private String salePriceStr; - @Transient + @TableField(exist = false) @SortColumn(column = "use_price") private String usePriceStr; - @Transient + @TableField(exist = false) @SortColumn(column = "price") private String priceStr; - @Transient + @TableField(exist = false) @SortColumn(column = "subsidy_num") private String subsidyNumStr; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; @@ -140,25 +138,25 @@ public class WxCoupon extends BaseEntity { private Integer approvalType; - @Transient + @TableField(exist = false) private String merchantParams; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="投放频道参数,用来过滤",name="targetAd") private Integer targetAd; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="投放频道参数,用来过滤",name="couponId") private Long couponId; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="修改库存有效期参数, 用来做乐观锁",name="orgRemainInventory") private Integer orgRemainInventory; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="修改库存有效期参数, 用来做乐观锁",name="orgInventory") private Integer orgInventory; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") private Long couponChannelId; @@ -172,53 +170,53 @@ public class WxCoupon extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="作废审批状态",name="cancleApplyStatus") private Integer cancleApplyStatus; - @Transient + @TableField(exist = false) @SortColumn(column = "press_count") private Integer pressSendCount; - @Transient + @TableField(exist = false) private Integer pressCount; - @Transient + @TableField(exist = false) private String changeRate; - @Transient + @TableField(exist = false) @SortColumn(column = "join_count") private Integer pressJoinCount; - @Transient + @TableField(exist = false) private Integer paymentRate; - @Transient + @TableField(exist = false) private Integer saleCount; - @Transient + @TableField(exist = false) private Integer transferCount; - @Transient + @TableField(exist = false) private Integer saleAmount; - @Transient + @TableField(exist = false) private Integer sumPayment; - @Transient + @TableField(exist = false) private Integer sumSubsidy; - @Transient + @TableField(exist = false) private Integer backpayCount; - @Transient + @TableField(exist = false) private Integer pressSuccCount; @io.swagger.annotations.ApiModelProperty(value = "过滤可投放0不过滤 1过滤", name = "filterCanPut") - @Transient + @TableField(exist = false) private Integer filterCanPut; //审批模板id 卷、卡、拼团、砍价 - @Transient + @TableField(exist = false) private Long couponModelId; - @Transient + @TableField(exist = false) private Long cardModelId; - @Transient + @TableField(exist = false) private Long groupModelId; - @Transient + @TableField(exist = false) private Long pressModelId; - @Transient + @TableField(exist = false) private Integer limitStart; - @Transient + @TableField(exist = false) private Integer limitEnd; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java index a5a95eb00..19486511d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java @@ -1,28 +1,27 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_coupon_action_log") +@TableName(value = "wx_coupon_action_log") @Data @EqualsAndHashCode(callSuper = true) public class WxCouponActionLog extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - @Transient + @TableField(exist = false) protected List ids; - @Transient + @TableField(exist = false) protected Date startTime; - @Transient + @TableField(exist = false) protected Date endTime; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java index 4ef8e8ae3..17628460a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_coupon_car") +@TableName(value = "wx_coupon_car") @Data @EqualsAndHashCode(callSuper = true) public class WxCouponCar extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="停车场ID",name="parkId") private Long parkId; @@ -33,7 +27,7 @@ public class WxCouponCar extends BaseEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index ecb7e890f..27147061f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -1,38 +1,37 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import com.iformall.enums.EnumCouponType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_coupon_channel") +@TableName(value = "wx_coupon_channel") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCouponChannel extends BaseEntity { - @Id + protected Long id; - @Transient + @TableField(exist = false) protected List ids; - @Transient + @TableField(exist = false) private Date startdate; - @Transient + @TableField(exist = false) private Date enddate; - @Transient + @TableField(exist = false) private Integer supportTransfer; - @Transient + @TableField(exist = false) protected List couponIds; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -65,27 +64,27 @@ public class WxCouponChannel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="二维码",name="qrCode") private String qrCode; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="卷状态 0:可投放 1:作废",name="couponStatus") private Integer couponStatus; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; - @Transient + @TableField(exist = false) @SortColumn(column = "sale_price") private String salePriceStr; - @Transient + @TableField(exist = false) @SortColumn(column = "use_price") private String usePriceStr; - @Transient + @TableField(exist = false) @SortColumn(column = "price") private String priceStr; - @Transient + @TableField(exist = false) private Long merchantId; public String getWeappPath() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java index 6751f7fab..5a3cf9683 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java @@ -1,35 +1,33 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_coupon_inject") +@TableName(value = "wx_coupon_inject") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCouponInject extends BaseEntity { - @Id protected Long id; - @Transient + @TableField(exist = false) protected List ids; - @Transient + @TableField(exist = false) protected WxMsgModel msgModel; - @Transient + @TableField(exist = false) protected Date sendTimeStart; - @Transient + @TableField(exist = false) protected Date sendTimeEnd; @@ -66,10 +64,10 @@ public class WxCouponInject extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="短信id",name="msgId") private Long msgId; - @Transient + @TableField(exist = false) List filterList; - @Transient + @TableField(exist = false) protected String phones; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java index e4320c533..0c0289c2d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_coupon_merchant") +@TableName(value = "wx_coupon_merchant") @Data @EqualsAndHashCode(callSuper = true) public class WxCouponMerchant extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="",name="productId") private Long productId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index fe3db4917..7d79234d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.text.DecimalFormat; import java.util.Date; -import java.util.List; -@Table(name = "wx_coupon_order") +@TableName(value = "wx_coupon_order") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCouponOrder extends BaseEntity{ - @Id protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -54,29 +49,29 @@ public class WxCouponOrder extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="核销类型(0:B端核销, 1:POS独立核销 2:POS交易核销)",name="verifyType") private Integer verifyType; - @Transient + @TableField(exist = false) private String couponName; - @Transient + @TableField(exist = false) private String couponPriceStr; - @Transient + @TableField(exist = false) private String salePriceStr; - @Transient + @TableField(exist = false) private Integer salePrice; - @Transient + @TableField(exist = false) private Date startTime; - @Transient + @TableField(exist = false) private Date endTime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="时段(0,工作日白天,1,工作日晚上,2周末白天,3周末晚上)",name="timeSlot") private Integer timeSlot; - @Transient + @TableField(exist = false) private Integer businessId; - @Transient + @TableField(exist = false) private Integer subBusinessId; public String getCouponPriceStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index cb1b82335..0286844ab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -1,17 +1,17 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_coupon_send") +@TableName(value = "wx_coupon_send") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @@ -20,32 +20,32 @@ public class WxCouponSend extends BaseEntity { /** * 卡券ids */ - @Transient + @TableField(exist = false) public static final String KEY_COUPONIDS = "couponIds" ; /** * beforeDays */ - @Transient + @TableField(exist = false) public static final String KEY_BEFOREDAYS = "beforeDays" ; /** * limit 商户购券数 */ @JsonIgnore - @Transient + @TableField(exist = false) public static final String KEY_MERCHANT_LNVENTORY = "merchantLnventory" ; /** * limit 商户注券数 */ @JsonIgnore - @Transient + @TableField(exist = false) public static final String KEY_MERCHANT_SEND = "merchantSend" ; /** * limit 商户注券数 */ @JsonIgnore - @Transient + @TableField(exist = false) public static final String KEY_MERCHANT_REMAIN = "merchantRemain" ; /** @@ -66,37 +66,37 @@ public class WxCouponSend extends BaseEntity { @JsonIgnore public static final String SORT_REMAIN = "merchantRemain" ; - @Id + protected Long id; - @Transient + @TableField(exist = false) protected List ids; /** * 商户购券数 */ - @Transient + @TableField(exist = false) protected Integer merchantLnventory; /** * 商户已发数 */ - @Transient + @TableField(exist = false) protected Integer merchantSend; /** * 商户剩余数 */ - @Transient + @TableField(exist = false) protected Integer merchantRemain; /**发卷所属商户名**/ - @Transient + @TableField(exist = false) private String merchantName; /** * 商户ID */ - @Transient + @TableField(exist = false) private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -118,7 +118,7 @@ public class WxCouponSend extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="场景发券计数",name="sendCount") protected int sendCount; @@ -126,12 +126,12 @@ public class WxCouponSend extends BaseEntity { private Integer sendSms; @io.swagger.annotations.ApiModelProperty(value = "0未过期1已过期,全部时不传", name = "expired" ) - @Transient + @TableField(exist = false) private Integer expired; @JsonIgnore @io.swagger.annotations.ApiModelProperty(value = "0未过期1已过期,全部时不传", name = "expired" ) - @Transient + @TableField(exist = false) private String sortCol ; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java index e5caf10a3..cf10ba94e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_coupon_send_config") +@TableName(value = "wx_coupon_send_config") @Data @EqualsAndHashCode(callSuper = true) public class WxCouponSendConfig extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="配置(2:停车发券 3:核销发券 4: B端刷卡发券)",name="sendType") private Integer sendType; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java index e7abddb7a..0e75806c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java @@ -1,26 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "wx_coupon_type") +@TableName(value = "wx_coupon_type") @Data @EqualsAndHashCode(callSuper = true) public class WxCouponType extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="券类型",name="title") + @io.swagger.annotations.ApiModelProperty(value="券类型",name="title") private String title; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 86cc1c78f..72ca3c324 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -1,43 +1,37 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_credit_history") +@TableName(value = "wx_credit_history") @Data @EqualsAndHashCode(callSuper = true) public class WxCreditHistory extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") private Date startTime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") private Date endTime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="手机号",name="phone") private String phone; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") private String name; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="花费Str",name="spendStr") private String spendStr; @@ -70,7 +64,7 @@ public class WxCreditHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="兑换用途",name="changePurpose") private String changePurpose; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java index 1b3b730c3..2cf462429 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java @@ -1,29 +1,25 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_data_rule_target") +@TableName(value = "wx_data_rule_target") @Data @EqualsAndHashCode(callSuper = true) public class WxDataRuleTarget extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "父级ID", name = "parent") private Long parent; @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "name") @@ -35,7 +31,7 @@ public class WxDataRuleTarget extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") private Date updateTime; - @Transient + @TableField(exist = false) private List children; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java index 30abf2b9d..89af4b918 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_date_amount_record") +@TableName(value = "wx_date_amount_record") @Data @EqualsAndHashCode(callSuper = true) public class WxDateAmountRecord extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="日期",name="date") + + @io.swagger.annotations.ApiModelProperty(value="日期",name="date") private Date date; @io.swagger.annotations.ApiModelProperty(value="周几 从1开始",name="dayOfWeek") private Integer dayOfWeek; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index de7af3868..348e8f158 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_device") +@TableName(value = "wx_device") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxDevice extends BaseEntity { - @Id - protected Long id; - @Transient - protected List ids; + protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="设备id",name="deviceId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index 3701ac9f1..9b2f42ccb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -1,11 +1,11 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; @@ -13,12 +13,12 @@ import java.util.List; * @author luozukai * @date 2019/6/6 10:50 */ -@Table(name = "wx_flow_config") +@TableName(value = "wx_flow_config") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxFlowConfig extends BaseEntity { - @Id + protected Long id; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -45,10 +45,10 @@ public class WxFlowConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") private Date updateDate; - @Transient + @TableField(exist = false) private WxFlowModel wxFlowModel; - @Transient + @TableField(exist = false) private List childs; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index 0cece0e27..34c7b6744 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -1,12 +1,12 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.vo.UserTaskVo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; @@ -14,12 +14,12 @@ import java.util.List; * @author luozukai * @date 2019/6/6 10:50 */ -@Table(name = "wx_flow_model") +@TableName(value = "wx_flow_model") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxFlowModel extends BaseEntity { - @Id + protected Long id; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -44,11 +44,11 @@ public class WxFlowModel extends BaseEntity { private String flowId; @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价卷上架",name="flowType") - @Transient + @TableField(exist = false) private Integer flowType; //流程节点列表 - @Transient + @TableField(exist = false) private List lists; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index 531fac914..c9f0119bf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -1,21 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_flow_record") +@TableName(value = "wx_flow_record") @Data @EqualsAndHashCode(callSuper = true) public class WxFlowRecord extends BaseEntity { private static final long serialVersionUID = 1849242743274278L; - @Id + private Long id; @io.swagger.annotations.ApiModelProperty(value="业务id",name="businessId") private Long businessId; @@ -51,19 +51,19 @@ public class WxFlowRecord extends BaseEntity { private String contractNumber; private Integer endProperty; - @Transient + @TableField(exist = false) protected List ids; //是否最后一个启动节点 - @Transient + @TableField(exist = false) private Integer isLastStart; - @Transient + @TableField(exist = false) private Integer limit; //1普通 2会签 3或签 - @Transient + @TableField(exist = false) private Integer taskType; //coupon 操作类型 - @Transient + @TableField(exist = false) private Integer approvalType; public WxFlowRecord(){} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java index 877418a79..8c84026d4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_game") +@TableName(value = "wx_game") @Data @EqualsAndHashCode(callSuper = true) public class WxGame extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -48,34 +42,34 @@ public class WxGame extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "限奖次数(0:不受限制,n:限奖次数)", name = "awardLimit") private Integer awardLimit; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "已投放券信息") protected List couponIdsList; // couponChannel - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") private String name; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="游戏链接",name="url") private String url; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="游戏logo,c端游戏入口使用",name="imgUrl") private String imgUrl; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="选项限制(-1:不做限制)",name="optionLimit") private Integer optionLimit; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="游戏规则说明",name="rules") private String rules; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="游戏类型(1:卡牌),目前无用",name="type") private Integer type; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") private String weappPath; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") private String weappScene; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java index 92c966ff3..ad29c3b8c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java @@ -1,30 +1,29 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_game_action_log") +@TableName(value = "wx_game_action_log") @Data @EqualsAndHashCode(callSuper = true) public class WxGameActionLog extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient + @TableField(exist = false) protected List ids; - @Transient + @TableField(exist = false) protected Date startTime; - @Transient + @TableField(exist = false) protected Date endTime; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java index a645928d1..7840a05ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java @@ -1,26 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "wx_game_template") +@TableName(value = "wx_game_template") @Data @EqualsAndHashCode(callSuper = true) public class WxGameTemplate extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") + + @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="游戏链接",name="url") private String url; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java index 265a7adc5..b59fdbee7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_group") +@TableName(value = "wx_group") @Data @EqualsAndHashCode(callSuper = true) public class WxGroup extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected String id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") + @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="国家",name="country") private String country; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java index d1971b58f..92a7aa29f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java @@ -1,30 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_level_config") +@TableName(value = "wx_level_config") @Data @EqualsAndHashCode(callSuper = true) public class WxLevelConfig extends BaseEntity { private static final long serialVersionUID = 1L; - @Transient + @TableField(exist = false) public static final int DEFAULT_SCALE = 10; - @Id protected Long id; - @Transient - protected List ids; - - - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="成长值",name="points") @@ -47,10 +40,10 @@ public class WxLevelConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="积分倍率(默认值1.0)",name="scale") private Integer scale ; - @Transient + @TableField(exist = false) protected Long count; - @Transient + @TableField(exist = false) protected Long userCount; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java index 8af46834d..2444ddd3e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; -import java.util.List; -@Table(name = "wx_level_merchant") +@TableName(value = "wx_level_merchant") @Data @EqualsAndHashCode(callSuper = true) public class WxLevelMerchant extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="等级ID",name="levelId") private Long levelId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 361f432fe..f1aa4d5e0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -1,29 +1,25 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.math.BigDecimal; import java.util.Date; import java.util.List; -@Table(name = "wx_mall") +@TableName(value = "wx_mall") @Data @EqualsAndHashCode(callSuper = true) public class WxMall extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") private String name; @@ -76,10 +72,10 @@ public class WxMall extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="启用结束时间",name="validEnd") private Date validEnd; - @Transient + @TableField(exist = false) protected List buildings; - @Transient + @TableField(exist = false) private boolean valid; public boolean isValid() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java index 8fc106b0a..04a49f107 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_mall_apply") +@TableName(value = "wx_mall_apply") @Data @EqualsAndHashCode(callSuper = true) public class WxMallApply extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @Transient + @TableField(exist = false) protected String verifyCode; @io.swagger.annotations.ApiModelProperty(value="购物中心名称",name="mallName") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java index 0f9a3a54d..52185acd4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java @@ -1,26 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_mall_building") +@TableName(value = "wx_mall_building") @Data @EqualsAndHashCode(callSuper = true) public class WxMallBuilding extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @Transient + + @TableField(exist = false) protected List floors; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java index a1b6da5cc..881dbab8d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java @@ -1,28 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.math.BigDecimal; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_mall_floor") +@TableName(value = "wx_mall_floor") @Data @EqualsAndHashCode(callSuper = true) public class WxMallFloor extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId") private Long mallId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index eb8473c03..4d9523756 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.vo.WxShopVo; import com.iformall.enums.EnumBusiness; import com.iformall.enums.EnumSubBusiness; @@ -9,43 +11,38 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -@Table(name = "wx_merchant") +@TableName(value = "wx_merchant") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMerchant extends BaseEntity { - @Id + protected Long id; @ApiModelProperty(name = "ids", value = "商户ID数组") - @Transient - protected List ids; - @Transient + @TableField(exist = false) private List userids; - @Transient + @TableField(exist = false) private List shopids; - @Transient + @TableField(exist = false) private List shops; - @Transient + @TableField(exist = false) private List shopVos; - @Transient + @TableField(exist = false) private List users; - @Transient + @TableField(exist = false) private Long rentContractId; @@ -61,12 +58,12 @@ public class WxMerchant extends BaseEntity { @Excel(name="联系方式",width = 20,orderNum = "3") private String linkPhone; - @Transient + @TableField(exist = false) @Excel(name="租期开始时间",width = 20,format="yyyy-MM-dd",orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="租期开始时间",name="rentalStartDate") private Date rentalStartDate; - @Transient + @TableField(exist = false) @Excel(name="租期结束时间",width = 20,format="yyyy-MM-dd",orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="租期结束时间",name="rentalEndDate") private Date rentalEndDate; @@ -75,17 +72,17 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用",name="status") private Integer status; - @Transient + @TableField(exist = false) @Excel(name="账户类型",width = 20,orderNum = "7",replace = {"_null","商户号_0","微信号_1"}) @io.swagger.annotations.ApiModelProperty(value="账户类型",name="accountTypeValue") private Integer accountTypeValue; - @Transient + @TableField(exist = false) @Excel(name="账户号",width = 20,orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="账户ID",name="accountId") private String accountId; - @Transient + @TableField(exist = false) @Excel(name="账户名",width = 20,orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="账户名",name="accountName") private String accountName; @@ -102,21 +99,21 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "待缴提醒", name = "billSetting") private Integer billSetting; - @Transient + @TableField(exist = false) @Excel(name = "业态", width = 20, orderNum = "13") @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") private String businessName; - @Transient + @TableField(exist = false) @Excel(name = "子业态", width = 20, orderNum = "14") @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId") private String subBusinessName; - @Transient + @TableField(exist = false) @Excel(name = "商铺", width = 20, orderNum = "15") private String shopsStr; - @Transient + @TableField(exist = false) @Excel(name = "管理员", width = 20, orderNum = "16") private String usersStr; @@ -158,27 +155,27 @@ public class WxMerchant extends BaseEntity { return EnumSubBusiness.getEnumMessage(subBusinessId); } - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="单价",name="price") private BigDecimal price; - @Transient + @TableField(exist = false) private Integer receivePeriod; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="账户参数",name="accountParameter") private String accountParameter; - @Transient + @TableField(exist = false) private List> shoplist; - @Transient + @TableField(exist = false) private WxMerchantCorp wxMerchantCorp; - @Transient + @TableField(exist = false) private WxMerchantTax wxMerchantTax; - @Transient + @TableField(exist = false) private List levelConfigList; - @Transient + @TableField(exist = false) private Integer rentShopType; - @Transient + @TableField(exist = false) private Integer isUse; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -221,7 +218,7 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") private String linkLinePhone; - @Transient + @TableField(exist = false) private WxProfitSharingReceiver wxProfitSharingReceiver; public String getWeappPath() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 8a28cf747..e359411e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; -import java.util.List; import java.util.UUID; -@Table(name = "wx_merchant_b_user") +@TableName(value = "wx_merchant_b_user") @Data @EqualsAndHashCode(callSuper = true) public class WxMerchantBUser extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "phone") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java index 281128176..9fd970aa9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java @@ -1,28 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_merchant_corp") +@TableName(value = "wx_merchant_corp") @Data @EqualsAndHashCode(callSuper = true) public class WxMerchantCorp extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java index 81d01a8b8..553f43458 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantPowerBillConfig.java @@ -1,27 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_merchant_power_bill_config") +@TableName(value = "wx_merchant_power_bill_config") @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) public class WxMerchantPowerBillConfig extends BaseEntity { - @Id + protected Long id; - @Transient - protected List ids; + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java index 4d369e5c5..0d0fa96c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_merchant_shop") +@TableName(value = "wx_merchant_shop") @Data @EqualsAndHashCode(callSuper = true) public class WxMerchantShop extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index cf013d4fd..dd877d568 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -1,30 +1,26 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.*; import java.math.BigDecimal; import java.util.*; -import javax.persistence.Transient; import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_merchant_subsidy") +@TableName(value = "wx_merchant_subsidy") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMerchantSubsidy extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @Transient + @TableField(exist = false) protected String idStr; @@ -56,17 +52,17 @@ public class WxMerchantSubsidy extends BaseEntity { @SortColumn(column = "receiver_payment") private Integer receiverPayment; - @Transient + @TableField(exist = false) @Excel(name="本次消费(元)",width = 20,orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPaymentStr") private String orderPaymentStr; - @Transient + @TableField(exist = false) @Excel(name="商户应收(元)",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPaymentStr") private String receiverPaymentStr; - @Transient + @TableField(exist = false) @Excel(name="补贴(元)",width = 20,orderNum = "7") @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidyStr") private String subsidyStr; @@ -91,18 +87,18 @@ public class WxMerchantSubsidy extends BaseEntity { @SortColumn(column = "update_date") private Date updateDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") private Date enddate; - @Transient + @TableField(exist = false) protected List statusS; - @Transient + @TableField(exist = false) protected String statusStr; @io.swagger.annotations.ApiModelProperty(value="是否冻结",name="freeze") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java index 85626ffb4..e9c952373 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_merchant_tax") +@TableName(value = "wx_merchant_tax") @Data @EqualsAndHashCode(callSuper = true) public class WxMerchantTax extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 843192584..bca79ee11 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; -import java.util.List; -@Table(name = "wx_merchant_trade_daily") +@TableName(value = "wx_merchant_trade_daily") @Data @EqualsAndHashCode(callSuper = true) public class WxMerchantTradeDaily extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") @@ -60,16 +54,16 @@ public class WxMerchantTradeDaily extends BaseEntity { private String proof; @io.swagger.annotations.ApiModelProperty(value = "月份如2019-05", name = "month") - @Transient + @TableField(exist = false) private String month; - @Transient + @TableField(exist = false) private String startTime; - @Transient + @TableField(exist = false) private String endTime; - @Transient + @TableField(exist = false) private String merchantName; public Integer getTradeAmtInteger(){ @@ -80,7 +74,7 @@ public class WxMerchantTradeDaily extends BaseEntity { } @io.swagger.annotations.ApiModelProperty(value = "是否是当天 1是", name = "isToday") - @Transient + @TableField(exist = false) private Integer isToday; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java index 2b1e8a6b9..538d12e66 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -1,27 +1,24 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_msg_callback") +@TableName(value = "wx_msg_callback") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsgCallback extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="回调ID",name="callbackId") + + @io.swagger.annotations.ApiModelProperty(value="回调ID",name="callbackId") private Long callbackId; @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java index 331000c3b..a10c57775 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -@Table(name = "wx_msg_config") +@TableName(value = "wx_msg_config") @Data @EqualsAndHashCode(callSuper = true) public class WxMsgConfig extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="",name="secret") private String secret; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java index 9bb9577d8..6befe2fd0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_msg_limit") +@TableName(value = "wx_msg_limit") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsgLimit extends BaseEntity { - @Id - protected Long id; - - @Transient - protected List ids; + protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="1: 短信-验证码(24小时10条)2:短信-营销(24小时3条) 11:prepay_id(7天内3次), 12:form_id(7天内1次), 13.open_id for 小程序统一消息限制(2天内1次),14.open_id for 公众号模板消息限制(2天内1次)",name="type") private Integer type; @@ -33,7 +27,7 @@ public class WxMsgLimit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="限制时间(type=1,2时,24小时; tyep=11,12,13时,为自然日结束时间)",name="limitDate") private Date limitDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="过期时间(一般为当前时间)",name="expireDate") private Date expireDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index ab15f9b80..0861c18fe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -1,27 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_msg_model") +@TableName(value = "wx_msg_model") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsgModel extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java index 4bbc2c0e9..7e23a7d8a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -1,28 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_msg_signature") +@TableName(value = "wx_msg_signature") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsgSignature extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="签名",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java index 464e36ae0..237aafc2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java @@ -1,27 +1,24 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_msg_validationcode") +@TableName(value = "wx_msg_validationcode") @Data @EqualsAndHashCode(callSuper = true) public class WxMsgValidationcode extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="",name="phone") + + @io.swagger.annotations.ApiModelProperty(value="",name="phone") private String phone; @io.swagger.annotations.ApiModelProperty(value="",name="expiretime") private Date expiretime; @@ -41,7 +38,7 @@ public class WxMsgValidationcode extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="",name="appid") private String appid; - @Transient + @TableField(exist = false) private String createtimeStr; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java index 13144bca2..3472ded4f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_msg_validationcode_model") +@TableName(value = "wx_msg_validationcode_model") @Data @EqualsAndHashCode(callSuper = true) public class WxMsgValidationcodeModel extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="名称",name="name") + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") private String signature; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 46c623137..5b6c28fc1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -1,33 +1,31 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_order") +@TableName(value = "wx_order") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxOrder extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @Transient + + @TableField(exist = false) private String merchantName; - @Transient + @TableField(exist = false) private String cUserName; - @Transient + @TableField(exist = false) private String phone; @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") @@ -77,10 +75,10 @@ public class WxOrder extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="POS SN",name="posOrderCreateSn") private String posOrderCreateSn; - @Transient + @TableField(exist = false) protected List statusS; - @Transient + @TableField(exist = false) protected String statusStr; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java index b0758a4b9..ee9d09e74 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java @@ -1,26 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_order_group") +@TableName(value = "wx_order_group") @Data @EqualsAndHashCode(callSuper = true) public class WxOrderGroup extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "订单ID", name = "orderId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java index 5ec217f45..645220a3a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_order_press") +@TableName(value = "wx_order_press") @Data @EqualsAndHashCode(callSuper = true) public class WxOrderPress extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") private Long couponId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java index 07f79c4cc..80da44752 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_park") +@TableName(value = "wx_park") @Data @EqualsAndHashCode(callSuper = true) public class WxPark extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="停车场图片",name="imgUrl") private String imgUrl; @@ -47,5 +41,4 @@ public class WxPark extends BaseEntity { private String vendorParams; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 17c213b14..839d91ce6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -1,26 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "wx_pay_account") +@TableName(value = "wx_pay_account") @Data @EqualsAndHashCode(callSuper = true) public class WxPayAccount extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") private String mchId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java index ddf758728..4d49ac4b2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java @@ -1,30 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_pay_account_bill") +@TableName(value = "wx_pay_account_bill") @Data @EqualsAndHashCode(callSuper = true) public class WxPayAccountBill extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") private String mchId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java index 4049c9ea8..2be574674 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java @@ -1,31 +1,26 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_pay_bill") +@TableName(value = "wx_pay_bill") @Data @EqualsAndHashCode(callSuper = true) public class WxPayBill extends BaseEntity { private static final long serialVersionUID = 1L; - @Id - protected Long id; - @Transient - protected List ids; + protected Long id; - /**租户ID**/ + /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; /**创建时间**/ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index eb5d8801f..38fd741c4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_pay_order") +@TableName(value = "wx_pay_order") @Data @EqualsAndHashCode(callSuper = true) public class WxPayOrder extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java index 64011a9bd..d329a1af3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPowerBillAutoConfig.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_power_bill_auto_config") +@TableName(value = "wx_power_bill_auto_config") @Data @JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) public class WxPowerBillAutoConfig extends BaseEntity { - @Id + protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java index 906ab8d09..6a4c38adb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java @@ -1,29 +1,25 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_prepayment") +@TableName(value = "wx_prepayment") @Data @EqualsAndHashCode(callSuper = true) public class WxPrepayment extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") @@ -49,7 +45,7 @@ public class WxPrepayment extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") private Date updateTime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java index d978b53af..d336d2e4f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java @@ -1,28 +1,25 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; /** * @author gongbiao */ -@Table(name = "wx_prepayment_history") +@TableName(value = "wx_prepayment_history") @Data @EqualsAndHashCode(callSuper = true) public class WxPrepaymentHistory extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -43,7 +40,7 @@ public class WxPrepaymentHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java index 7e7418c95..0fb873f4b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -1,28 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_profit_sharing_order") +@TableName(value = "wx_profit_sharing_order") @Data @EqualsAndHashCode(callSuper = true) public class WxProfitSharingOrder extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java index 3d36af8d5..35aacbbae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java @@ -1,27 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_profit_sharing_receiver") +@TableName(value = "wx_profit_sharing_receiver") @Data @EqualsAndHashCode(callSuper = true) public class WxProfitSharingReceiver extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @@ -48,7 +44,7 @@ public class WxProfitSharingReceiver extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="分账参数,目前为分账比例(单位为万分之一)",name="parameter") private String parameter; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="分账金额(分)",name="sharingAmount") private Integer sharingAmount; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java index 6d55dd52e..eeacc9a8d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_profit_sharing_result") +@TableName(value = "wx_profit_sharing_result") @Data @EqualsAndHashCode(callSuper = true) public class WxProfitSharingResult extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 6fad42865..f834d9ffb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -1,14 +1,14 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import com.iformall.enums.EnumPriceUnit; import com.iformall.enums.EnumRentContractAdjustPeriod; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; import java.util.Map; @@ -16,28 +16,25 @@ import java.util.Map; /** * @author gongbiao */ -@Table(name = "wx_property_contract") +@TableName(value = "wx_property_contract") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxPropertyContract extends BaseEntity { - @Id protected Long id; @io.swagger.annotations.ApiModelProperty(value="审核状态,0未审核 1审核中 2审核完成 3驳回 4合同作废",name="applyStatus") private Integer applyStatus; @io.swagger.annotations.ApiModelProperty(value="审批流1合同2账单3终止审批",name="businessType") private Integer businessType; - - @Transient - protected List ids; - @Transient + + @TableField(exist = false) @SortColumn(column = "shopNumber") private String shopNumber; - @Transient + @TableField(exist = false) private String brandName; @@ -134,7 +131,7 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "计租周期", name = "计租周期") private Integer adjustPeriod; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; @@ -147,7 +144,7 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayDay") private Integer latePayDay; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "物业预账单列表", name = "previewBillRentList") private List previewBillRentList; @@ -157,10 +154,10 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames") private String fileNames; - @Transient + @TableField(exist = false) private String building; - @Transient + @TableField(exist = false) private String floor; @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java index 79e765ee6..6ad7a985f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java @@ -1,30 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -@Table(name = "wx_question") +@TableName(value = "wx_question") @Data @EqualsAndHashCode(callSuper = true) public class WxQuestion extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="问题内容",name="content") private String content; - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java index 74052376c..a09fac65a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java @@ -1,27 +1,23 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_question_config") +@TableName(value = "wx_question_config") @Data @EqualsAndHashCode(callSuper = true) public class WxQuestionConfig extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="问题列表",name="questionList") @@ -42,7 +38,7 @@ public class WxQuestionConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="调查力度0-100",name="strength") private Integer strength; - @Transient + @TableField(exist = false) protected List questions; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java index 880e23c01..670b96269 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; -@Table(name = "wx_question_log") +@TableName(value = "wx_question_log") @Data @EqualsAndHashCode(callSuper = true) public class WxQuestionLog extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") private Long userId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java index b0107a604..d63f506e1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java @@ -1,28 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_refund_order") +@TableName(value = "wx_refund_order") @Data @EqualsAndHashCode(callSuper = true) public class WxRefundOrder extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 07a486e38..7c47687ca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import com.iformall.enums.EnumPriceUnit; import com.iformall.enums.EnumRentContractAdjustPeriod; @@ -7,9 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.lang3.StringUtils; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -18,68 +18,66 @@ import java.util.Map; /** * @author gongbiao */ -@Table(name = "wx_rent_contract") +@TableName(value = "wx_rent_contract") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxRentContract extends BaseEntity { - @Id + protected Long id; - @Transient - protected List ids; - @Transient + @TableField(exist = false) @SortColumn(column = "shopNumber") private String shopNumber; - @Transient + @TableField(exist = false) private String building; - @Transient + @TableField(exist = false) private String floor; - @Transient + @TableField(exist = false) private String brandName; - @Transient + @TableField(exist = false) private String buildArea; - @Transient + @TableField(exist = false) private String priceStr; - @Transient + @TableField(exist = false) private String depositStr; - @Transient + @TableField(exist = false) @SortColumn(column = "allPeriod") private Integer allPeriod; - @Transient + @TableField(exist = false) @SortColumn(column = "period") private Integer period; - @Transient + @TableField(exist = false) @SortColumn(column = "needPay") private Integer needPay; - @Transient + @TableField(exist = false) @SortColumn(column = "receivePay") private Integer receivePay; - @Transient + @TableField(exist = false) @SortColumn(column = "owe") private Integer owe; - @Transient + @TableField(exist = false) private String receiveDate; - @Transient + @TableField(exist = false) @SortColumn(column = "latePayPrice") private Integer latePayPrice; @io.swagger.annotations.ApiModelProperty(value = "是否同时终止物业", name = "endProperty") - @Transient + @TableField(exist = false) private Integer endProperty; @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") @@ -179,7 +177,7 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") private Integer rentShopType; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; @@ -189,11 +187,11 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "装修期结束时间", name = "fixEndDate") private Date fixEndDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "租赁合同预账单列表", name = "previewBillRentList") private List previewBillRentList; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "物业合同预账单列表", name = "reviewBillPropertyPList") private List reviewBillPropertyPList; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java index a472731ba..279c24c85 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java @@ -1,28 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_score_history") +@TableName(value = "wx_score_history") @Data @EqualsAndHashCode(callSuper = true) public class WxScoreHistory extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId") private Long cUserId; @@ -43,11 +36,11 @@ public class WxScoreHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="扣减原因",name="reason") private String reason; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index f2771cb84..07d09f46a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -1,13 +1,13 @@ package com.iformall.domain.po; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.enums.EnumScoreType; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; import java.util.List; @@ -21,15 +21,15 @@ import java.util.List; * 7. 完善个人信息获取成长值 */ -@Table(name = "wx_score_rules") +@TableName(value = "wx_score_rules") @Data @EqualsAndHashCode(callSuper = true) public class WxScoreRules extends BaseEntity { - @Transient + @TableField(exist = false) public static final int DEFAULT_SCALE = 10; - @Transient + @TableField(exist = false) private static final String scoreDefaultRules = "[" + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"每日登陆\"}," + @@ -52,7 +52,7 @@ public class WxScoreRules extends BaseEntity { "{\"id\":7,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"编辑个人信息\"}" + "]"; - @Transient + @TableField(exist = false) private static final String creditDefaultRules = "[" + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"每日登陆\"}," + @@ -76,22 +76,20 @@ public class WxScoreRules extends BaseEntity { "{\"id\":8,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"编辑个人信息\"}" + "]"; - @Transient + @TableField(exist = false) public static final String ID = "id"; - @Transient + @TableField(exist = false) public static final String LIMIT = "limit"; - @Transient + @TableField(exist = false) public static final String STEP = "step"; - @Transient + @TableField(exist = false) public static final String SCORE = "score"; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="规则",name="rules") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java index de46a2321..d317eee00 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.util.Date; -import java.util.List; -@Table(name = "wx_screen_ad") +@TableName(value = "wx_screen_ad") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxScreenAd extends BaseEntity { - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="标题",name="title") @@ -48,7 +43,7 @@ public class WxScreenAd extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="广告目标ID: couponChannelId or campaignId",name="targetId") private Long targetId; - @Transient + @TableField(exist = false) protected Object target; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 3a09ccaf3..b391b9608 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -1,36 +1,33 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + import java.math.BigDecimal; import java.util.Date; -import java.util.List; -@Table(name = "wx_shop") +@TableName(value = "wx_shop") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxShop extends BaseEntity { - @Id + protected Long id; - - @Transient - protected List ids; - @Transient + + @TableField(exist = false) private Long rentContractId; - @Transient + @TableField(exist = false) private String linkPerson; - @Transient + @TableField(exist = false) private String linkPhone; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -112,15 +109,15 @@ public class WxShop extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ") private Integer isDel; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "查询-开始时间", name = "startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "查询-结束时间", name = "startdate") private Date enddate; - @Transient + @TableField(exist = false) @SortColumn(column = "freeDay") @io.swagger.annotations.ApiModelProperty(value = "闲置时间", name = "freeDay") private Integer freeDay; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java index 360db0708..d2d93d3f3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_sub_business") +@TableName(value = "wx_sub_business") @Data @EqualsAndHashCode(callSuper = true) public class WxSubBusiness extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Integer id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="子业态名",name="title") + + @io.swagger.annotations.ApiModelProperty(value="子业态名",name="title") private String title; @io.swagger.annotations.ApiModelProperty(value="业态ID",name="businessId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java index 6351d1b4d..b31193d12 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java @@ -1,28 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_subsidy") +@TableName(value = "wx_subsidy") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxSubsidy extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="操作用户ID",name="operatorUserId") private Long operatorUserId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java index 7b8fdbedd..3aacec4d3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java @@ -1,26 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "wx_tags") +@TableName(value = "wx_tags") @Data @EqualsAndHashCode(callSuper = true) public class WxTags extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="名称",name="name") + + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") private Long groupId; @@ -31,7 +26,7 @@ public class WxTags extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="typeName") private String typeName; - @Transient + @TableField(exist = false) protected Long count; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java index 4e0f44241..0cdb596f3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java @@ -1,26 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -@Table(name = "wx_tags_group") +@TableName(value = "wx_tags_group") @Data @EqualsAndHashCode(callSuper = true) public class WxTagsGroup extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="名称",name="name") + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java index 6fa43ce24..e97f1c9c9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java @@ -1,26 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -@Table(name = "wx_tags_type") +@TableName(value = "wx_tags_type") @Data @EqualsAndHashCode(callSuper = true) public class WxTagsType extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="名称",name="name") + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index 849ac1d74..1340fb8e3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_template_msg") +@TableName(value = "wx_template_msg") @Data @EqualsAndHashCode(callSuper = true) public class WxTemplateMsg extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="模板ID",name="templateId") private String templateId; @@ -34,5 +27,4 @@ public class WxTemplateMsg extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 586b7c9e7..da810c205 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -1,22 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_topic") +@TableName(value = "wx_topic") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxTopic extends BaseEntity { - @Id + protected Long id; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -47,37 +46,37 @@ public class WxTopic extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="背景颜色",name="bgColor") private String bgColor; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") private String couponIds; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") private List couponList; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="状态,一个或者多个",name="statusStr") private String statusStr; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="状态,一个或者多个",name="statusList") protected List statusList; // - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询下架状态",name="queryDownLineStatus") private boolean queryDownLineStatus; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") private Integer isOnline; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="couponChannelId渠道ID",name="couponChannelId") private Long couponChannelId; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") private String weappPath; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") private String weappScene; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserChannel.java index 1e836678d..2ad270edf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserChannel.java @@ -1,34 +1,28 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "wx_user_channel") +@TableName(value = "wx_user_channel") @Data @EqualsAndHashCode(callSuper = true) public class WxUserChannel extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - - @io.swagger.annotations.ApiModelProperty(value="",name="channelName") + + @io.swagger.annotations.ApiModelProperty(value="",name="channelName") private String channelName; @io.swagger.annotations.ApiModelProperty(value="",name="sceneAddress") private String sceneAddress; @io.swagger.annotations.ApiModelProperty(value="",name="description") private String description; - @Transient + @TableField(exist = false) protected long count; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java index d08c91070..d9ddc3ce1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_user_data_rule") +@TableName(value = "wx_user_data_rule") @Data @EqualsAndHashCode(callSuper = true) public class WxUserDataRule extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") private Long userId; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index d4366d23b..525e7f8b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_user_visit") +@TableName(value = "wx_user_visit") @Data @EqualsAndHashCode(callSuper = true) public class WxUserVisit extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - - @Transient - protected List ids; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="日期字符串",name="refDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java index 3d7c3da5f..bf1de0e09 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java @@ -1,25 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_weapp_audit_status") +@TableName(value = "wx_weapp_audit_status") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappAuditStatus extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java index 7ff6e769d..d777c3aa3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_weapp_basic_set") +@TableName(value = "wx_weapp_basic_set") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappBasicSet extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") + @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; @io.swagger.annotations.ApiModelProperty(value="部署类型(1:dev,2:test,3:prod)",name="deploy") private Integer deploy; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java index 9fae99007..eb98c5956 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java @@ -1,25 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_weapp_code_status") +@TableName(value = "wx_weapp_code_status") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappCodeStatus extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index a217bc790..29d0e0f7a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -1,27 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_weapp_ext_set") +@TableName(value = "wx_weapp_ext_set") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappExtSet extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") + + @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java index 08d548dbd..83fa6dd79 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_weapp_release_status") +@TableName(value = "wx_weapp_release_status") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappReleaseStatus extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java index dbcd3406e..923d3709b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java @@ -1,27 +1,22 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_wiwide_info") +@TableName(value = "wx_wiwide_info") @Data @EqualsAndHashCode(callSuper = true) public class WxWiWideInfo extends BaseEntity { private static final long serialVersionUID = 1L; - @Id + protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="迈外迪id",name="wiwideId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java index 6ae826906..771a932e0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java @@ -1,11 +1,11 @@ package com.iformall.domain.po.msg; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; /** * @author luozukai @@ -18,35 +18,35 @@ public class BaseMsg extends BaseEntity { private static final long serialVersionUID = 923764283764823L; @io.swagger.annotations.ApiModelProperty(value="域0全部 1sys 2a端 3c端 4b端",name="domain") - @Transient + @TableField(exist = false) private Integer domain = 0; @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - @Transient + @TableField(exist = false) private String tenantId; @io.swagger.annotations.ApiModelProperty(value="唯一标识",name="uuid") - @Transient + @TableField(exist = false) private String uuid; @io.swagger.annotations.ApiModelProperty(value="接收人,手机号邮件地址等",name="receiver") - @Transient + @TableField(exist = false) private String receiver; @io.swagger.annotations.ApiModelProperty(value="消息类型 1短信 2回调短信 3邮件 4微信小程序模板 5微信公众号模板 6系统通知 7websocket",name="msgType") - @Transient + @TableField(exist = false) private Integer msgType; @io.swagger.annotations.ApiModelProperty(value="消息状态 0默认1发送成功2消费成功3消费失败",name="msgStatus") - @Transient + @TableField(exist = false) private Integer msgStatus; @io.swagger.annotations.ApiModelProperty(value="结果信息",name="statusMessage") - @Transient + @TableField(exist = false) private String statusMessage; @io.swagger.annotations.ApiModelProperty(value="延迟重试消息 1s,5s,10s,30s,1m,2m,3m,4m,5m,6m,7m,8m,9m,10m,20m,30m,1h,2h",name="delayTimeLevel") - @Transient + @TableField(exist = false) private Integer delayTimeLevel = 0; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index 7fb98ba8b..36032f6f2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -1,29 +1,25 @@ package com.iformall.domain.po.msg; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.WxCouponInject; import com.iformall.domain.po.WxMsgConfig; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_msg") +@TableName(value = "wx_msg") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsg extends BaseMsg{ private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -79,6 +75,6 @@ public class WxMsg extends BaseMsg{ //coupon精准投放 private WxCouponInject couponInject; - @Transient + @TableField(exist = false) List filterList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java index 51be9204b..8be6829e0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java @@ -1,21 +1,19 @@ package com.iformall.domain.po.msg; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; import java.util.Map; -@Table(name = "wx_msg_record") +@TableName(value = "wx_msg_record") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMsgRecord extends BaseMsg { private static final long serialVersionUID = 18957895653478L; - @Id protected Long id; //msg 消息类型1短信 2回调短信 邮件 3微信小程序模板 4微信公众号模板 5系统通 @io.swagger.annotations.ApiModelProperty(value="消息类型 1短信 2回调短信 3邮件 4微信小程序模板 5微信公众号模板 6系统通知 7websocket",name="msg") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java index ac7c882a3..3980f1802 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java @@ -1,9 +1,9 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; -import javax.persistence.Transient; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.io.Serializable; @@ -46,11 +46,11 @@ public class CUserBaseInfoT implements Serializable { @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private String createDate; - @Transient + @TableField(exist = false) @Excel(name = "标签", width = 20, orderNum = "10") private String tagNames; - @Transient + @TableField(exist = false) @Excel(name = "成长值", width = 20, orderNum = "11") private String poins; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagNewIdVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagNewIdVo.java index f2961a48f..a5b247640 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagNewIdVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagNewIdVo.java @@ -1,12 +1,11 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCUserTags; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; - /** * Created by syf on 2018/8/30. */ @@ -15,7 +14,7 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) public class CUserTagNewIdVo extends WxCUserTags { - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") private Long newUserId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java index e488437d1..00e4122c1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java @@ -1,11 +1,11 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.MallUserAction; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; import java.util.Date; /** @@ -21,11 +21,11 @@ public class MallUserActionVo extends MallUserAction { @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") private String name; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 4f543c6ea..60363ed7b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -1,13 +1,12 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; -import java.util.ArrayList; import java.util.List; /** @@ -45,9 +44,9 @@ public class WxBillAll extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="商户Id",name="merchantId") private Long merchantId; - @Transient + @TableField(exist = false) private String statusListStr; - @Transient + @TableField(exist = false) private String typeListStr; @io.swagger.annotations.ApiModelProperty(value="多个状态",name="statusList") @@ -88,41 +87,41 @@ public class WxBillAll extends BaseEntity { private List billTypeList; - @Transient + @TableField(exist = false) @SortColumn(column = "rentReceivePay") private Integer rentReceivePay; - @Transient + @TableField(exist = false) @SortColumn(column = "propertyReceivePay") private Integer propertyReceivePay; - @Transient + @TableField(exist = false) @SortColumn(column = "depositReceivePay") private Integer depositReceivePay; - @Transient + @TableField(exist = false) @SortColumn(column = "otherReceivePay") private Integer otherReceivePay; - @Transient + @TableField(exist = false) @SortColumn(column = "totalReceivePay") private Integer totalReceivePay; - @Transient + @TableField(exist = false) @SortColumn(column = "shopNumber") private String shopNumber; - @Transient + @TableField(exist = false) @SortColumn(column = "receivePay") private Integer receivePay; - @Transient + @TableField(exist = false) @SortColumn(column = "pay") private Integer pay; - @Transient + @TableField(exist = false) @SortColumn(column = "owe") private Integer owe; - @Transient + @TableField(exist = false) private String receiveDate; - @Transient + @TableField(exist = false) @SortColumn(column = "payDate") private String payDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") private Integer filterHasPay; @@ -133,20 +132,20 @@ public class WxBillAll extends BaseEntity { private Long newPrice; //滞纳金 - @Transient + @TableField(exist = false) private Long oldLatePrice; - @Transient + @TableField(exist = false) private Long newLatePrice; - @Transient + @TableField(exist = false) @SortColumn(column = "payOut") private Integer payOut; - @Transient + @TableField(exist = false) private Integer balance; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "冻结状态0正常1冻结", name = "freeze") private Integer freeze; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index 14ce62e61..9a799775c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -1,9 +1,9 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; -import javax.persistence.Transient; import java.math.BigDecimal; import java.util.Date; @@ -75,7 +75,7 @@ public class WxBillAllVo { @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") private Date updatetime; - @Transient + @TableField(exist = false) private Integer freeze; public String getReceivePayStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java index d8c92b95a..75668349b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -1,12 +1,12 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponOrder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @@ -53,10 +53,10 @@ public class WxCardCVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value = "couponChannelId", name = "couponChannelId") private Long couponChannelId; - @Transient + @TableField(exist = false) protected List statusS; - @Transient + @TableField(exist = false) protected String statusStr; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index 0a474d90b..f344a1cdf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -2,12 +2,12 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCardInfo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -42,7 +42,7 @@ public class WxCardVo extends WxCardInfo { } @Excel(name = "面额(元)", width = 20, orderNum = "6") - @Transient + @TableField(exist = false) private String priceStr; @@ -54,7 +54,7 @@ public class WxCardVo extends WxCardInfo { } @Excel(name = "售价(元)", width = 20, orderNum = "8") - @Transient + @TableField(exist = false) private String salePriceStr; @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") @@ -67,7 +67,7 @@ public class WxCardVo extends WxCardInfo { } @Excel(name = "补贴额(元)", width = 20, orderNum = "9") - @Transient + @TableField(exist = false) private String subsidyNumStr; @io.swagger.annotations.ApiModelProperty(value = "补贴金额", name = "subsidyNum") @@ -98,18 +98,18 @@ public class WxCardVo extends WxCardInfo { @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") private String ouPhone; - @Transient + @TableField(exist = false) protected List statusS; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="卡状态",name="statusStr") protected String statusStr; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") private Date startdate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index 8a5adcf7e..d98ff13a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -1,13 +1,12 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCoupon; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Transient; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -20,22 +19,21 @@ import java.util.List; public class WxCouponCVo extends WxCoupon implements Serializable { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient + @TableField(exist = false) private String salePriceStr; - @Transient + @TableField(exist = false) private String usePriceStr; - @Transient + @TableField(exist = false) private String priceStr; - @Transient + @TableField(exist = false) private Integer activityStatus; - @Transient + @TableField(exist = false) private String qrCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java index 28fc955bd..5ae5057a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java @@ -1,16 +1,12 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCoupon; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Transient; import java.io.Serializable; -import java.text.DecimalFormat; -import java.util.Date; -import java.util.List; @Data @ToString(callSuper = true) @@ -23,6 +19,6 @@ public class WxCouponCarVo extends WxCoupon implements Serializable { @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") private String vendorParams; - @Transient + @TableField(exist = false) private Integer status; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 825749455..ab4c989d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -1,12 +1,12 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponChannel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; import java.io.Serializable; import java.math.BigDecimal; @@ -23,7 +23,7 @@ import java.util.List; public class WxCouponChannelVo extends WxCouponChannel implements Serializable { private static final long serialVersionUID = 1L; - @Transient + @TableField(exist = false) private Integer activityStatus; @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") @@ -69,22 +69,22 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition") private String conditions; - @Transient + @TableField(exist = false) private String salePriceStr; - @Transient + @TableField(exist = false) private String usePriceStr; - @Transient + @TableField(exist = false) private String priceStr; - @Transient + @TableField(exist = false) private String qrCode; @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; - @Transient + @TableField(exist = false) private Integer gameWeight; @io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index e871c7476..5fd0c9a57 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -1,14 +1,13 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponOrder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Transient; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; @@ -21,7 +20,7 @@ import java.util.List; public class WxCouponOrderBVo extends WxCouponOrder{ private static final long serialVersionUID = 6687954932922444531L; - @Id + @Excel(name = "券码", width = 20, orderNum = "1") protected Long id; @@ -63,11 +62,11 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") private Date createDate; - @Transient + @TableField(exist = false) @Excel(name = "面额(元)", width = 20, orderNum = "7") private String priceStr; - @Transient + @TableField(exist = false) @Excel(name = "交易价格(元)", width = 20, orderNum = "6") private String salePriceStr; @@ -135,7 +134,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ private String merchantName; @Excel(name = "商铺号", width = 50, orderNum = "5") - @Transient + @TableField(exist = false) private String shopNumber; /**发券商户信息*/ @@ -146,39 +145,39 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType") private Integer channelType; - @Transient + @TableField(exist = false) private Date startDate; - @Transient + @TableField(exist = false) private Date endDate; - @Transient + @TableField(exist = false) private Long merchantId; - @Transient + @TableField(exist = false) private Date verifyStartDate; - @Transient + @TableField(exist = false) private Date verifyEndDate; - @Transient + @TableField(exist = false) private Long couponId; @Excel(name = "券类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "积分券_50", "积分停车券_51", "消费卡_100"}) - @Transient + @TableField(exist = false) private Integer couponType; @Excel(name = "核销商户", width = 50, orderNum = "4") - @Transient + @TableField(exist = false) private String verifyMerchantName; - @Transient + @TableField(exist = false) private Integer floor; - @Transient + @TableField(exist = false) private Integer building; @Excel(name = "楼层楼座", width = 50, orderNum = "12") - @Transient + @TableField(exist = false) private String buildingStr; @Override diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 7932c4807..fa298a968 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -1,13 +1,12 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponOrder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Transient; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -19,14 +18,12 @@ import java.util.List; public class WxCouponOrderCVo extends WxCouponOrder { private static final long serialVersionUID = 6687954932922444531L; - - @Id protected Long id; - @Transient + @TableField(exist = false) protected List ids; - @Transient + @TableField(exist = false) private Integer validStatus; @@ -84,13 +81,13 @@ public class WxCouponOrderCVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; - @Transient + @TableField(exist = false) private String salePriceStr; - @Transient + @TableField(exist = false) private String usePriceStr; - @Transient + @TableField(exist = false) private String priceStr; public String getSalePriceStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java index 2cab48668..6e189c340 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java @@ -1,17 +1,12 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCouponSend; -import com.iformall.domain.po.WxLevelConfig; -import com.iformall.domain.po.WxTags; -import com.iformall.domain.po.WxTagsType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; import java.io.Serializable; import java.util.Date; -import java.util.List; @Data @ToString(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java index 2643b8a34..ab0f3059f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java @@ -1,10 +1,10 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCoupon; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; /** * @author luozukai @@ -16,52 +16,52 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) public class WxCouponStatisVo extends WxCoupon { - @Transient + @TableField(exist = false) private String xtime; - @Transient + @TableField(exist = false) private String xcount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") private Integer saleCount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") private Integer transferCount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") private Integer saleAmount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") private Integer sumPayment; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") private Integer backpayCount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") private Integer pressSendCount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") private Integer pressSuccCount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") private Integer pressJoinCount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") private Integer sumSubsidy; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRateStr") private String paymentRateStr; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRateStr") private String changeRateStr; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java index 757f6593a..99545861a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java @@ -1,18 +1,16 @@ package com.iformall.domain.vo; -import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCreditHistory; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Transient; -import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) public class WxCreditHistoryNewIdVo extends WxCreditHistory { - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") private Long newUserId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java index 951f765ba..5306130b8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java @@ -1,10 +1,9 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -13,10 +12,8 @@ import java.util.List; public class WxLevelMerchantCVo implements Serializable { private static final long serialVersionUID = 6687964942922444531L; - @Id protected Long id; - @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") @@ -35,7 +32,7 @@ public class WxLevelMerchantCVo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="折扣(0-100折扣)",name="discount") private Integer discount; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") private String linkLinePhone; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 5da52d0ea..cb0f426a7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.BaseEntity; import com.iformall.enums.EnumBusiness; import com.iformall.enums.EnumSubBusiness; @@ -8,8 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Transient; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; @@ -20,11 +19,8 @@ import java.util.stream.Collectors; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMerchantTradeDailyVo extends BaseEntity { - @Id - protected Long id; - @Transient - protected List ids; + protected Long id; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @@ -38,7 +34,7 @@ public class WxMerchantTradeDailyVo extends BaseEntity { private Integer tradeAmt; @Excel(name = "解单金额(元)", width = 20, orderNum = "3") - @Transient + @TableField(exist = false) private String tradeAmtStr; public String getTradeAmtStr() { @@ -94,26 +90,26 @@ public class WxMerchantTradeDailyVo extends BaseEntity { private String proof; - @Transient + @TableField(exist = false) private List shopVos; - @Transient + @TableField(exist = false) @Excel(name = "商铺", width = 20, orderNum = "10") private String shopsStr; - @Transient + @TableField(exist = false) private Integer isToday; private Integer businessId; private Integer subBusinessId; - @Transient + @TableField(exist = false) @Excel(name = "业态", width = 20, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") private String businessName; - @Transient + @TableField(exist = false) @Excel(name = "子业态", width = 20, orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId") private String subBusinessName; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index e2df89c32..ad7ff0dcf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -3,7 +3,6 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; -import javax.persistence.Id; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @@ -11,7 +10,6 @@ import java.util.List; public class WxMerchantVo { private static final long serialVersionUID = 6687964942922444531L; - @Id protected Long id; /** 发券商户信息 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index 105c1f4cc..d66aba5c9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -1,9 +1,9 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; -import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -16,7 +16,7 @@ public class WxOrderCouponVo { protected Long id; - @Transient + @TableField(exist = false) private Integer validStatus; /** 基础购买到的券信息 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java index e60b45477..73659ed47 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -1,11 +1,11 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; import java.util.Date; /** @@ -30,10 +30,10 @@ public class WxOrderQueryVo extends BaseEntity { private Integer payment; - @Transient + @TableField(exist = false) private Integer orderStatus; - @Transient + @TableField(exist = false) private Date createDate; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index cea5a7ae7..560cf1c87 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -1,5 +1,6 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,15 +31,15 @@ public class WxProfitSharingOrderQueryVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") private Date enddate; - @javax.persistence.Transient + @TableField(exist = false) private Integer sharingStatus; - @javax.persistence.Transient + @TableField(exist = false) private Integer type; - @javax.persistence.Transient + @TableField(exist = false) private Integer payAmount; - @javax.persistence.Transient + @TableField(exist = false) private Date createTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 4239511a4..7c9d108a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -5,8 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Id; -import javax.persistence.Transient; import java.util.Date; /** @@ -17,10 +15,8 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) public class WxRentPropertyContractVo extends BaseEntity { - @Id protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") private String contractNumber; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java index 7704ae20c..4b2fa853e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java @@ -1,16 +1,15 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxScoreHistory; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Transient; - @Data @EqualsAndHashCode(callSuper = true) public class WxScoreHistoryNewIdVo extends WxScoreHistory { - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") private Long newUserId; diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java index af932b25f..e616bcd5f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java @@ -11,7 +11,7 @@ import java.util.Map; public interface MallUserInfoMapper extends CommonMapper { - MallUserInfo selectById(@Param("id") Long id); + MallUserInfo getById(@Param("id") Long id); List findList(MallUserInfo mallUserInfo); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index d7511c725..f5f9a58fc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -34,7 +34,7 @@ public interface WxBillPropertyMapper extends CommonMapper void deletePreviewBill(WxPropertyContract wxPropertyContract); - void update(WxBillProperty wxBillProperty); + void updateForReceivePay(WxBillProperty record); void updatePreviewStatus(WxBillProperty record); @@ -46,8 +46,6 @@ public interface WxBillPropertyMapper extends CommonMapper WxBillProperty selectBillOne(WxBillProperty propertyQuery); - List findLatePayBill(); - /** * 累加每一天的滞纳金 */ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index b39254a4b..a3d5eb6d2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -31,7 +31,7 @@ public interface WxBillRentMapper extends CommonMapper { void deletePreviewBill(WxRentContract wxRentContract); - void update(WxBillRent record); + void updateForReceiverPay(WxBillRent record); void updatePreviewStatus(WxBillRent record); @@ -43,8 +43,6 @@ public interface WxBillRentMapper extends CommonMapper { WxBillRent selectBillOne(WxBillRent rentQuery); - List findLatePayBill(); - /** * 累加每一天的滞纳金 */ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java index 8dd034ed3..c06654b80 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java @@ -12,7 +12,5 @@ import java.util.List; public interface WxFlowModelMapper extends CommonMapper { List findList(WxFlowModel wxFlowModel); - WxFlowModel selectById(Long id); - List getModelBybusiness(WxFlowModel wxFlowModel); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java index bfaff6bbb..19708347d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java @@ -8,11 +8,9 @@ import java.util.List; public interface WxMsgRecordMapper extends CommonMapper { - void update(BaseMsg record); + void updateByBaseMsg(BaseMsg record); List findList(WxMsgRecord record); - void update(WxMsgRecord record); - void save(WxMsgRecord record); } diff --git a/mallinkService/src/main/java/com/iformall/mq/MqBaseProducer.java b/mallinkService/src/main/java/com/iformall/mq/MqBaseProducer.java index a7994bd02..93c836a64 100644 --- a/mallinkService/src/main/java/com/iformall/mq/MqBaseProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/MqBaseProducer.java @@ -1,7 +1,6 @@ package com.iformall.mq; import com.iformall.domain.po.msg.BaseMsg; -import org.springframework.amqp.rabbit.core.RabbitTemplate; public interface MqBaseProducer { diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java index 70db1c762..6b24b7f6c 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -9,7 +9,6 @@ import com.iformall.service.WxMsgRecordService; import com.iformall.utils.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.Marker; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -52,7 +51,7 @@ public class RabbitMqMessageProducer implements MqBaseProducer , RabbitTemplate. data.setUuid(correlationData.getId()); data.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); data.setStatusMessage(cause); - wxMsgRecordMapper.update(data); + wxMsgRecordMapper.updateByBaseMsg(data); } catch (Exception e) { log.error(" RabbitMqMessageProducer.confirm.updateDb Error", e); } @@ -80,4 +79,5 @@ public class RabbitMqMessageProducer implements MqBaseProducer , RabbitTemplate. log.error(uuid + " RabbitMqMessageProducer: Send Message Error", e); } } + } diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java index aaee62088..4953951c5 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java @@ -14,7 +14,6 @@ import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.remoting.common.RemotingHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.amqp.rabbit.support.CorrelationData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; @@ -43,11 +42,6 @@ public class RocketMqMessageProducer implements MqBaseProducer { @Autowired private WxMsgRecordService wxMsgRecordService; -// @Override -// public void confirm(CorrelationData correlationData, boolean b, String s) { -// -// } - @PostConstruct public void start(){ try { @@ -77,7 +71,7 @@ public class RocketMqMessageProducer implements MqBaseProducer { public void onSuccess(SendResult sendResult) { log.info("Message Producer: Send Message Success {}", sendResult); data.setMsgStatus(EnumMsgRecordStatus.SEND_SUCC.getCode()); - wxMsgRecordMapper.update(data); + wxMsgRecordMapper.updateByBaseMsg(data); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 7b48b298f..2cacca8ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -70,6 +70,4 @@ public interface WxBillPropertyService { ResultData updateLatePayStatus(WxBillProperty wxBillProperty); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillProperty wxBillProperty); - - List findLatePayBill(); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index d12061a59..4a5e0d701 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -14,12 +14,11 @@ import javax.servlet.http.HttpServletResponse; */ public interface WxBillRentService { - /** - * 根据实体查询分页列表 - * - * @param offset - * @param limit + /** + * 根据实体查询列表 * @param record + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize); @@ -70,6 +69,4 @@ public interface WxBillRentService { ResultData updateLatePayStatus(WxBillRent wxBillRent); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillRent wxBillRent); - - List findLatePayBill(); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java b/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java index 2be0c5e73..2ac98ec6b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java @@ -22,7 +22,6 @@ public interface WxBillSettleService { */ PageInfo listAsPage(WxBillSettle record, Integer pageIndex, Integer pageSize); - /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java index 4173f4447..fb871b7ea 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java @@ -16,8 +16,8 @@ public interface WxBrandService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxBrand record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 0af49295c..949a54b4c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -156,7 +156,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { @Override public MallPermission getById(Long id) { - return mallPermissionMapper.selectByPrimaryKey(id); + return mallPermissionMapper.selectById(id); } @Override @@ -175,15 +175,15 @@ public class MallPermissionServiceImpl implements MallPermissionService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallPermissionMapper.insertSelective(record); + mallPermissionMapper.insert(record); } else { - mallPermissionMapper.updateByPrimaryKeySelective(record); + mallPermissionMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallPermissionMapper.deleteByPrimaryKey(id); + mallPermissionMapper.deleteById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java index 13283aa89..85d34d0de 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java @@ -23,7 +23,7 @@ public class MallResourceServiceImpl implements MallResourceService { @Override public MallResource getById(Long id) { - return mallResourceMapper.selectByPrimaryKey(id); + return mallResourceMapper.selectById(id); } @Override @@ -32,15 +32,15 @@ public class MallResourceServiceImpl implements MallResourceService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallResourceMapper.insertSelective(record); + mallResourceMapper.insert(record); } else { - mallResourceMapper.updateByPrimaryKeySelective(record); + mallResourceMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallResourceMapper.deleteByPrimaryKey(id); + mallResourceMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java index df8df4e81..6dc486518 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java @@ -37,7 +37,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService @Override public MallRolePermission getById(Long id) { - return mallUserRolePermissionMapper.selectByPrimaryKey(id); + return mallUserRolePermissionMapper.selectById(id); } @Override @@ -46,15 +46,15 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallUserRolePermissionMapper.insertSelective(record); + mallUserRolePermissionMapper.insert(record); } else { - mallUserRolePermissionMapper.updateByPrimaryKeySelective(record); + mallUserRolePermissionMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallUserRolePermissionMapper.deleteByPrimaryKey(id); + mallUserRolePermissionMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java index 7160f69a7..a6bed2016 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -35,12 +36,12 @@ public class MallRoleServiceImpl implements MallRoleService { @Override public int countList(MallRole record) { - return mallRoleMapper.selectCount(record); + return mallRoleMapper.selectCount(new QueryWrapper(record)); } @Override public MallRole getById(Long id) { - return mallRoleMapper.selectByPrimaryKey(id); + return mallRoleMapper.selectById(id); } @Override @@ -49,15 +50,15 @@ public class MallRoleServiceImpl implements MallRoleService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallRoleMapper.insertSelective(record); + mallRoleMapper.insert(record); } else { - mallRoleMapper.updateByPrimaryKeySelective(record); + mallRoleMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallRoleMapper.deleteByPrimaryKey(id); + mallRoleMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java index 18aa0b34a..5b3323551 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java @@ -25,7 +25,7 @@ public class MallUserActionServiceImpl implements MallUserActionService { @Override public MallUserAction getById(Long id) { - return mallUserActionMapper.selectByPrimaryKey(id); + return mallUserActionMapper.selectById(id); } @Override @@ -34,9 +34,9 @@ public class MallUserActionServiceImpl implements MallUserActionService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallUserActionMapper.insertSelective(record); + mallUserActionMapper.insert(record); } else { - mallUserActionMapper.updateByPrimaryKeySelective(record); + mallUserActionMapper.updateById(record); } } @@ -51,12 +51,12 @@ public class MallUserActionServiceImpl implements MallUserActionService { record.setUserId(userId); record.setActionDesc(actionDesc); record.setActionTime(new Date()); - mallUserActionMapper.insertSelective(record); + mallUserActionMapper.insert(record); } @Override public void deleteById(Long id) { - mallUserActionMapper.deleteByPrimaryKey(id); + mallUserActionMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 89d122ef9..eb77c70a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -1,15 +1,17 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; -import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallPermission; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.MallUserRole; +import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.vo.MallUserInfoVo; -import com.iformall.enums.EnumMenuType; -import com.iformall.enums.EnumUserAdmin; import com.iformall.exception.MallinkException; import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallUserInfoMapper; @@ -17,8 +19,6 @@ import com.iformall.mapper.MallUserRoleMapper; import com.iformall.mapper.WxMsgValidationcodeMapper; import com.iformall.service.MallUserInfoService; import com.iformall.service.WxMallService; -import com.iformall.utils.Constant; -import net.sf.saxon.trans.Err; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,12 +56,12 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override public int cntUserList(MallUserInfo record) { - return mallUserInfoMapper.selectCount(record); + return mallUserInfoMapper.selectCount(new QueryWrapper(record)); } @Override public MallUserInfo getById(Long id) { - return mallUserInfoMapper.selectById(id); + return mallUserInfoMapper.getById(id); } @Override @@ -74,7 +74,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); updateUser.setBopenId(user.getBopenId()); - mallUserInfoMapper.updateByPrimaryKeySelective(user); + mallUserInfoMapper.updateById(user); } @Override @@ -107,7 +107,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); updateUser.setWebOpenId(user.getWebOpenId()); - mallUserInfoMapper.updateByPrimaryKeySelective(updateUser); + mallUserInfoMapper.updateById(updateUser); } @Override @@ -135,15 +135,15 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallUserInfoMapper.insertSelective(record); + mallUserInfoMapper.insert(record); } else { - mallUserInfoMapper.updateByPrimaryKeySelective(record); + mallUserInfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallUserInfoMapper.deleteByPrimaryKey(id); + mallUserInfoMapper.deleteById(id); } @Override @@ -168,10 +168,10 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override @Transactional(rollbackFor = Exception.class) public void deleteUser(Long id) { - mallUserInfoMapper.deleteByPrimaryKey(id); + mallUserInfoMapper.deleteById(id); MallUserRole userRole = new MallUserRole(); userRole.setUid(id); - userRoleMapper.delete(userRole); + userRoleMapper.delete(new UpdateWrapper<>(userRole)); } @Override @@ -203,7 +203,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { updateUser.setId(user.getId()); updateUser.setTenantId(user.getTenantId()); updateUser.setPassword(user.getPassword()); - mallUserInfoMapper.updateByPrimaryKeySelective(updateUser); + mallUserInfoMapper.updateById(updateUser); } catch (Exception e) { logger.error("db failed: 用户-" + user.getUsername() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -243,7 +243,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { // 富茂超管 MallPermission q = new MallPermission(); q.setAvailable("Y"); - List menuList = mallPermissionMapper.select(q); + List menuList = mallPermissionMapper.selectList(new QueryWrapper(q)); permsList = new ArrayList<>(menuList.size()); for(MallPermission menu : menuList){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java index 79fa81d0b..5372ed76f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java @@ -1,25 +1,22 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; -import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserRole; import com.iformall.enums.EnumMenuType; import com.iformall.enums.EnumUserAdmin; -import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallRolePermissionMapper; import com.iformall.mapper.MallUserRoleMapper; import com.iformall.service.MallUserRoleService; -import com.iformall.utils.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @Service @@ -45,7 +42,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { @Override public MallUserRole getById(Long id) { - return mallUserRoleMapper.selectByPrimaryKey(id); + return mallUserRoleMapper.selectById(id); } @Override @@ -53,7 +50,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { try { MallUserRole q = new MallUserRole(); q.setUid(uid); - return mallUserRoleMapper.selectOne(q); + return mallUserRoleMapper.selectOne(new QueryWrapper(q)); } catch (Exception e) { logger.error(e.getMessage()); } @@ -66,20 +63,20 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallUserRoleMapper.insertSelective(record); + mallUserRoleMapper.insert(record); } else { - mallUserRoleMapper.updateByPrimaryKeySelective(record); + mallUserRoleMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallUserRoleMapper.deleteByPrimaryKey(id); + mallUserRoleMapper.deleteById(id); } @Override public int cntUserList(MallUserRole record) { - return mallUserRoleMapper.selectCount(record); + return mallUserRoleMapper.selectCount(new QueryWrapper(record)); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java index 1c7119c24..d5776c453 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java @@ -24,7 +24,7 @@ public class PosActionLogServiceImpl implements PosActionLogService { @Override public PosActionLog getById(Long id) { - return posActionLogMapper.selectByPrimaryKey(id); + return posActionLogMapper.selectById(id); } @Override @@ -33,15 +33,15 @@ public class PosActionLogServiceImpl implements PosActionLogService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - posActionLogMapper.insertSelective(record); + posActionLogMapper.insert(record); } else { - posActionLogMapper.updateByPrimaryKeySelective(record); + posActionLogMapper.updateById(record); } } @Override public void deleteById(Long id) { - posActionLogMapper.deleteByPrimaryKey(id); + posActionLogMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java index 3fc87acf8..b101297b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java @@ -30,7 +30,7 @@ public class PosCouponOrderVerifyServiceImpl implements PosCouponOrderVerifyServ @Override public PosCouponOrderVerify getById(Long id) { - return posCouponOrderVerifyMapper.selectByPrimaryKey(id); + return posCouponOrderVerifyMapper.selectById(id); } @Override @@ -39,15 +39,15 @@ public class PosCouponOrderVerifyServiceImpl implements PosCouponOrderVerifyServ //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - posCouponOrderVerifyMapper.insertSelective(record); + posCouponOrderVerifyMapper.insert(record); } else { - posCouponOrderVerifyMapper.updateByPrimaryKeySelective(record); + posCouponOrderVerifyMapper.updateById(record); } } @Override public void deleteById(Long id) { - posCouponOrderVerifyMapper.deleteByPrimaryKey(id); + posCouponOrderVerifyMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java index 71df7b1b7..9ad908b9e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java @@ -23,7 +23,7 @@ public class PosMallConfigServiceImpl implements PosMallConfigService { @Override public PosMallConfig getById(Long id) { - return posMallConfigMapper.selectByPrimaryKey(id); + return posMallConfigMapper.selectById(id); } @Override @@ -38,15 +38,15 @@ public class PosMallConfigServiceImpl implements PosMallConfigService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - posMallConfigMapper.insertSelective(record); + posMallConfigMapper.insert(record); } else { - posMallConfigMapper.updateByPrimaryKeySelective(record); + posMallConfigMapper.updateById(record); } } @Override public void deleteById(Long id) { - posMallConfigMapper.deleteByPrimaryKey(id); + posMallConfigMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java index 8f831f748..f3487ea28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java @@ -23,7 +23,7 @@ public class PosOrderServiceImpl implements PosOrderService { @Override public PosOrder getById(Long id) { - return posOrderMapper.selectByPrimaryKey(id); + return posOrderMapper.selectById(id); } @Override @@ -35,15 +35,15 @@ public class PosOrderServiceImpl implements PosOrderService { if (record.getPayment() != null) { record.setRemainAmount(record.getPayment()); } - posOrderMapper.insertSelective(record); + posOrderMapper.insert(record); } else { - posOrderMapper.updateByPrimaryKeySelective(record); + posOrderMapper.updateById(record); } } @Override public void deleteById(Long id) { - posOrderMapper.deleteByPrimaryKey(id); + posOrderMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java index f29dfd866..b076fc83b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java @@ -29,7 +29,7 @@ public class PosPayOrderServiceImpl implements PosPayOrderService { @Override public PosPayOrder getById(Long id) { - return posPayOrderMapper.selectByPrimaryKey(id); + return posPayOrderMapper.selectById(id); } @Override @@ -39,15 +39,15 @@ public class PosPayOrderServiceImpl implements PosPayOrderService { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setPayOrderNo(String.valueOf(record.getId())); - posPayOrderMapper.insertSelective(record); + posPayOrderMapper.insert(record); } else { - posPayOrderMapper.updateByPrimaryKeySelective(record); + posPayOrderMapper.updateById(record); } } @Override public void deleteById(Long id) { - posPayOrderMapper.deleteByPrimaryKey(id); + posPayOrderMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java index 3413a4826..22741891b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java @@ -68,7 +68,7 @@ public class PushLimitServiceImpl implements PushLimitService { Date curDate = new Date(); pushLimit.setCreateTime(curDate); pushLimit.setUpdateTime(curDate); - pushLimitMapper.insertSelective(pushLimit); + pushLimitMapper.insert(pushLimit); } // 插入缓存 @@ -79,7 +79,7 @@ public class PushLimitServiceImpl implements PushLimitService { @Override public void saveOrUpdate(PushLimit record) { - pushLimitMapper.updateByPrimaryKeySelective(record); + pushLimitMapper.updateById(record); // 缓存存在,删除缓存 String key = keyPrev + record.getTenantId(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java index f5a994177..51a6ffd97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java @@ -29,7 +29,7 @@ public class SysMonitorServiceImpl implements SysMonitorService { @Override public SysMonitor getById(Long id) { - return sysMonitorMapper.selectByPrimaryKey(id); + return sysMonitorMapper.selectById(id); } @Override @@ -38,15 +38,15 @@ public class SysMonitorServiceImpl implements SysMonitorService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - sysMonitorMapper.insertSelective(record); + sysMonitorMapper.insert(record); } else { - sysMonitorMapper.updateByPrimaryKeySelective(record); + sysMonitorMapper.updateById(record); } } @Override public void deleteById(Long id) { - sysMonitorMapper.deleteByPrimaryKey(id); + sysMonitorMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/ThDevInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/ThDevInfoServiceImpl.java index 9e2f2ed61..800b306c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/ThDevInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/ThDevInfoServiceImpl.java @@ -1,7 +1,9 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.ThDevInfo; import com.iformall.mapper.ThDevInfoMapper; import com.iformall.service.ThDevInfoService; @@ -9,7 +11,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; @Service public class ThDevInfoServiceImpl implements ThDevInfoService { @@ -27,7 +28,7 @@ public class ThDevInfoServiceImpl implements ThDevInfoService { @Override public ThDevInfo getById(Long id) { - return thDevInfoMapper.selectByPrimaryKey(id); + return thDevInfoMapper.selectById(id); } @Override @@ -35,7 +36,7 @@ public class ThDevInfoServiceImpl implements ThDevInfoService { ThDevInfo q = new ThDevInfo(); q.setDevId(devId); try { - return thDevInfoMapper.selectOne(q); + return thDevInfoMapper.selectOne(new QueryWrapper(q)); } catch (Exception e) { logger.error(e.getMessage()); } @@ -48,15 +49,15 @@ public class ThDevInfoServiceImpl implements ThDevInfoService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - thDevInfoMapper.insertSelective(record); + thDevInfoMapper.insert(record); } else { - thDevInfoMapper.updateByPrimaryKeySelective(record); + thDevInfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - thDevInfoMapper.deleteByPrimaryKey(id); + thDevInfoMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 177711dc7..27ae18476 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -75,24 +76,24 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData modifyStatus(WxActivityJoin wxActivityJoin) { if (wxActivityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); Integer personLimit = wxActivity.getPersonLimit(); WxActivityJoin params = new WxActivityJoin(); params.setTenantId(wxActivity.getTenantId()); params.setActivityId(wxActivity.getId()); params.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); - int count = wxActivityJoinMapper.selectCount(params); + int count = wxActivityJoinMapper.selectCount(new QueryWrapper(params)); if (personLimit.equals(count)) { return new ResultData(ErrorCode.ACTIVITY_PERSON_LIMITED, count); } } - wxActivityJoinMapper.updateByPrimaryKeySelective(wxActivityJoin); + wxActivityJoinMapper.updateById(wxActivityJoin); return new ResultData(Result.SUCCESS, "操作成功"); } @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxActivityJoin wxActivityJoin) { - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); String title = wxActivity.getTitle(); List list = wxActivityJoinMapper.findList(wxActivityJoin); for (WxActivityJoin activityJoin : list) { @@ -114,14 +115,14 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData queryJoinInfo(WxActivityJoin wxActivityJoin) { - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); //活动人数 Integer personLimit = wxActivity.getPersonLimit(); //总人数 - int total = wxActivityJoinMapper.selectCount(wxActivityJoin); + int total = wxActivityJoinMapper.selectCount(new QueryWrapper(wxActivityJoin)); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); //确认数 - int confirm = wxActivityJoinMapper.selectCount(wxActivityJoin); + int confirm = wxActivityJoinMapper.selectCount(new QueryWrapper(wxActivityJoin)); Map data = new HashMap<>(); data.put("personLimit", personLimit); data.put("confirm", confirm); @@ -133,15 +134,15 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { public ResultData sendMsg(WxActivityJoin wxActivityJoin) { wxActivityJoin.setSendMsg(EnumSendMsg.NO.getCode()); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); - List joinList = wxActivityJoinMapper.select(wxActivityJoin); + List joinList = wxActivityJoinMapper.selectList(new QueryWrapper(wxActivityJoin)); if (joinList.size() == 0) { return new ResultData(); } //更改状态 - WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity activity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); activity.setSendMsg(EnumSendMsg.YES.getCode()); activity.setUpdateTime(new Date()); - wxActivityMapper.updateByPrimaryKeySelective(activity); + wxActivityMapper.updateById(activity); //发短信 for (WxActivityJoin join : joinList) { if (StringUtils.isNotEmpty(join.getPhone())) { @@ -167,13 +168,13 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxActivityJoin joinQuery = new WxActivityJoin(); joinQuery.setUserId(wxActivityJoin.getUserId()); joinQuery.setActivityId(wxActivityJoin.getActivityId()); - int count = wxActivityJoinMapper.selectCount(joinQuery); + int count = wxActivityJoinMapper.selectCount(new QueryWrapper(joinQuery)); if (count > 0) { return new ResultData(ErrorCode.ACTIVITY_JOINED); } - WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); + WxCUser user = wxCUserMapper.selectById(wxActivityJoin.getUserId()); //查询是否消耗积分 - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); Date date = new Date(); if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { Integer credit = wxActivity.getCredit(); @@ -193,14 +194,14 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { wxActivityJoin.setPhone(user.getPhone()); wxActivityJoin.setCreateTime(date); wxActivityJoin.setUpdateTime(date); - wxActivityJoinMapper.insertSelective(wxActivityJoin); + wxActivityJoinMapper.insert(wxActivityJoin); return new ResultData(); } @Override public ResultData sign(WxActivityJoin wxActivityJoin) { //是否报名记录 - WxActivityJoin activityJoin = wxActivityJoinMapper.selectOne(wxActivityJoin); + WxActivityJoin activityJoin = wxActivityJoinMapper.selectOne(new QueryWrapper(wxActivityJoin)); if (activityJoin == null) { return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); } @@ -209,9 +210,9 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { } if (activityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); - wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); + wxActivityJoinMapper.updateById(activityJoin); //查询活动名称 - WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity activity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); return new ResultData(Result.SUCCESS, "签到成功", activity.getTitle()); } return new ResultData(ErrorCode.ACTIVITY_EXPIRED); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 964431b51..89d688c34 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -53,7 +54,7 @@ public class WxActivityServiceImpl implements WxActivityService { @Override public WxActivity getById(Long id) { - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxActivity wxActivity = wxActivityMapper.selectById(id); String html = wxActivity.getHtml(); if (!StringUtils.isEmpty(html)) { try { @@ -103,9 +104,9 @@ public class WxActivityServiceImpl implements WxActivityService { if (wxActivity.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxActivity.setId(idWorker.nextId()); - wxActivityMapper.insertSelective(wxActivity); + wxActivityMapper.insert(wxActivity); } else { - wxActivityMapper.updateByPrimaryKeySelective(wxActivity); + wxActivityMapper.updateById(wxActivity); } return new ResultData(Result.SUCCESS, "操作成功"); } @@ -113,18 +114,18 @@ public class WxActivityServiceImpl implements WxActivityService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData updateStatus(WxActivity wxActivity) { - WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivity.getId()); + WxActivity activity = wxActivityMapper.selectById(wxActivity.getId()); if (activity == null) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } wxActivity.setUpdateTime(new Date()); - wxActivityMapper.updateByPrimaryKeySelective(wxActivity); + wxActivityMapper.updateById(wxActivity); if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { WxCampaign campaign = new WxCampaign(); campaign.setProduceId(wxActivity.getId()); - WxCampaign wxCampaign = wxCampaignMapper.selectOne(campaign); + WxCampaign wxCampaign = wxCampaignMapper.selectOne(new QueryWrapper(campaign)); wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + wxCampaignMapper.updateById(wxCampaign); } return new ResultData(Result.SUCCESS, "操作成功"); } @@ -133,7 +134,7 @@ public class WxActivityServiceImpl implements WxActivityService { public void printHtmlById(Long id, HttpServletResponse response) { try { response.setHeader("Content-type", "text/html;charset=utf-8"); - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxActivity wxActivity = wxActivityMapper.selectById(id); String html = StringUtils.isEmpty(wxActivity.getHtml()) ? "" : wxActivity.getHtml(); try { html = URLDecoder.decode(html, "utf-8"); @@ -158,23 +159,23 @@ public class WxActivityServiceImpl implements WxActivityService { public ResultData sendToCampaign(Long id) { WxCampaign campaignQuery = new WxCampaign(); campaignQuery.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - int count = wxCampaignMapper.selectCount(campaignQuery); + int count = wxCampaignMapper.selectCount(new QueryWrapper(campaignQuery)); int campaignTotal = 7; if (count == campaignTotal) { return new ResultData(ErrorCode.ACTIVITY_SEND_ERROR); } //修改投放状态 - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxActivity wxActivity = wxActivityMapper.selectById(id); if (wxActivity.getEndTime().before(new Date())) { return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_END); } wxActivity.setStatus(EnumActivityStatus.INJECT_CAMPAIGN.getCode()); wxActivity.setUpdateTime(new Date()); - wxActivityMapper.updateByPrimaryKeySelective(wxActivity); + wxActivityMapper.updateById(wxActivity); //添加到宣传页 campaignQuery = new WxCampaign(); campaignQuery.setProduceId(id); - WxCampaign campaign = wxCampaignMapper.selectOne(campaignQuery); + WxCampaign campaign = wxCampaignMapper.selectOne(new QueryWrapper(campaignQuery)); if (campaign == null) { campaign = new WxCampaign(); } @@ -197,7 +198,7 @@ public class WxActivityServiceImpl implements WxActivityService { @Override public Integer queryStatus(Long id, Long userId) { - WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxActivity wxActivity = wxActivityMapper.selectById(id); WxActivityJoin activityJoin = new WxActivityJoin(); activityJoin.setUserId(userId); activityJoin.setActivityId(id); @@ -222,7 +223,7 @@ public class WxActivityServiceImpl implements WxActivityService { return EnumActivityEnrollStatus.END.getCode(); } } - int count = wxActivityJoinMapper.selectCount(activityJoin); + int count = wxActivityJoinMapper.selectCount(new QueryWrapper(activityJoin)); if (count > 0) { return EnumActivityEnrollStatus.JOINED.getCode(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java index 8196f47ae..42d9edc36 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java @@ -1,8 +1,9 @@ package com.iformall.service.impl; -import java.util.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxAdminLog; import com.iformall.mapper.WxAdminLogMapper; import com.iformall.service.WxAdminLogService; @@ -10,7 +11,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; + +import java.util.List; @Service public class WxAdminLogServiceImpl implements WxAdminLogService { @@ -27,7 +29,7 @@ public class WxAdminLogServiceImpl implements WxAdminLogService { @Override public WxAdminLog getById(Long id) { - return wxAdminLogMapper.selectByPrimaryKey(id); + return wxAdminLogMapper.selectById(id); } @Override @@ -36,15 +38,15 @@ public class WxAdminLogServiceImpl implements WxAdminLogService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxAdminLogMapper.insertSelective(record); + wxAdminLogMapper.insert(record); } else { - wxAdminLogMapper.updateByPrimaryKeySelective(record); + wxAdminLogMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxAdminLogMapper.deleteByPrimaryKey(id); + wxAdminLogMapper.deleteById(id); } @Override @@ -55,16 +57,16 @@ public class WxAdminLogServiceImpl implements WxAdminLogService { reqQ.setUrl(record.getUrl()); reqQ.setType(record.getType()); reqQ.setActionDate(record.getActionDate()); - List logList = wxAdminLogMapper.select(reqQ); + List logList = wxAdminLogMapper.selectList(new QueryWrapper(reqQ)); if (logList.size() > 0) { WxAdminLog log = logList.get(0); log.setCount(log.getCount() + 1); - wxAdminLogMapper.updateByPrimaryKeySelective(log); + wxAdminLogMapper.updateById(log); } else { final IdWorker idWorker = IdWorker.get(); reqQ.setId(idWorker.nextId()); reqQ.setCount(1); - wxAdminLogMapper.insertSelective(reqQ); + wxAdminLogMapper.insert(reqQ); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index 651f28e6e..6077909f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -1,33 +1,18 @@ package com.iformall.service.impl; -import cn.binarywang.wx.miniapp.api.WxMaService; -import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; -import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor; -import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxAppinfo; import com.iformall.enums.EnumAppType; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.service.WxAppinfoService; -import com.iformall.utils.Constant; -import com.iformall.utils.MaUtil; -import com.iformall.utils.QRCodeUtils; -import me.chanjar.weixin.common.error.WxErrorException; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Date; import java.util.List; @Service @@ -43,7 +28,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { WxAppinfo appinfoQ = new WxAppinfo(); appinfoQ.setTenantId(tenantId); appinfoQ.setType(EnumAppType.C.getCode()); - List appList = wxAppinfoMapper.select(appinfoQ); + List appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); if (appList.size() > 0) { appInfo = appList.get(0); } @@ -67,7 +52,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { @Override public WxAppinfo getById(Long id) { - return wxAppinfoMapper.selectByPrimaryKey(id); + return wxAppinfoMapper.selectById(id); } @Override @@ -76,14 +61,14 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxAppinfoMapper.insertSelective(record); + wxAppinfoMapper.insert(record); } else { - wxAppinfoMapper.updateByPrimaryKeySelective(record); + wxAppinfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxAppinfoMapper.deleteByPrimaryKey(id); + wxAppinfoMapper.deleteById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index f7977c95f..cfffc0ea3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -1,7 +1,9 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.domain.po.WxWeappExtSet; @@ -17,7 +19,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import java.util.Date; import java.util.List; @@ -53,7 +54,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { @Override public WxAuthorizerInfo getById(Long id) { - return authorizerInfoMapper.selectByPrimaryKey(id); + return authorizerInfoMapper.selectById(id); } @Override @@ -61,7 +62,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxAuthorizerInfo authQ = new WxAuthorizerInfo(); authQ.setAuthorizerAppid(appId); try { - WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(authQ); + WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper(authQ)); return authorizerInfo; } catch (Exception e) { logger.error(e.getMessage()); @@ -80,7 +81,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { try { WxAuthorizerInfo aiQ = new WxAuthorizerInfo(); aiQ.setAuthorizerAppid(record.getAuthorizerAppid()); - authorizerInfo = authorizerInfoMapper.selectOne(aiQ); + authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper(aiQ)); } catch (Exception e) { logger.error(e.getMessage()); } @@ -98,7 +99,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { record.setCreateTime(curDate); record.setUpdateTime(curDate); // 授权表 添加 - authorizerInfoMapper.insertSelective(record); + authorizerInfoMapper.insert(record); if(appinfo.getType() != null) { if (appinfo.getType().equals(EnumAppType.C.getCode()) || appinfo.getType().equals(EnumAppType.B.getCode())) { @@ -114,20 +115,20 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { } weappExtSet.setCreateDate(curDate); weappExtSet.setUpdateDate(curDate); - weappExtSetMapper.insertSelective(weappExtSet); + weappExtSetMapper.insert(weappExtSet); } } } else { record.setId(authorizerInfo.getId()); record.setUpdateTime(curDate); logger.info(record.toString()); - authorizerInfoMapper.updateByPrimaryKeySelective(record); + authorizerInfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - authorizerInfoMapper.deleteByPrimaryKey(id); + authorizerInfoMapper.deleteById(id); } @Override @@ -143,7 +144,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setBaseStatus(record.getBaseStatus()); info.setBaseTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -154,7 +155,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setDomainStatus(record.getDomainStatus()); info.setDomainTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -165,7 +166,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setWebdomainStatus(record.getWebdomainStatus()); info.setWebdomainTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -176,7 +177,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setTemplateStatus(record.getTemplateStatus()); info.setTemplateTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -186,7 +187,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setId(record.getId()); info.setOpenAppid(record.getOpenAppid()); info.setBindOpenTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -199,7 +200,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.findByAppid(record.getAuthorizerAppid()); if(authorizerInfo != null) { record.setId(authorizerInfo.getId()); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateById(record); } else { /// TODO } @@ -220,7 +221,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { } else { // 不是同一个月,重置authBackNum record.setAuditBackNum(1); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateById(record); } } else { /// TODO diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java index 13b84cefa..590124191 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java @@ -26,7 +26,7 @@ public class WxBLogServiceImpl implements WxBLogService { @Override public WxBLog getById(Long id) { - return wxBLogMapper.selectByPrimaryKey(id); + return wxBLogMapper.selectById(id); } @Override @@ -35,15 +35,15 @@ public class WxBLogServiceImpl implements WxBLogService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxBLogMapper.insertSelective(record); + wxBLogMapper.insert(record); } else { - wxBLogMapper.updateByPrimaryKeySelective(record); + wxBLogMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxBLogMapper.deleteByPrimaryKey(id); + wxBLogMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java index 1e0b0fb6b..f2a157bf5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java @@ -43,7 +43,7 @@ public class WxBillActionServiceImpl implements WxBillActionService { Date date = new Date(); action.setCreatetime(date); action.setUpdatetime(date); - return wxBillActionMapper.insertSelective(action); + return wxBillActionMapper.insert(action); } @@ -63,7 +63,7 @@ public class WxBillActionServiceImpl implements WxBillActionService { Date date = new Date(); wxBillAction.setCreatetime(date); wxBillAction.setUpdatetime(date); - return wxBillActionMapper.insertSelective(wxBillAction); + return wxBillActionMapper.insert(wxBillAction); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 10c0fd20f..e9d044d5f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -224,55 +225,55 @@ public class WxBillAllServiceImpl implements WxBillAllService { logger.info(">>>>>>>>>>>>>>>>>>>>账单回调修改数据:" + JSONObject.toJSONString(bill)); if (billTypeValue == EnumBillTypeParam.RENT.getCode().intValue()) { logger.info("更新租金账单"); - WxBillRent billRent = wxBillRentMapper.selectByPrimaryKey(bill.get("id")); + WxBillRent billRent = wxBillRentMapper.selectById((Long) bill.get("id")); if (billRent != null && !billRent.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillRent(bill); } } else if (billTypeValue == EnumBillTypeParam.RENT_DEPOSIT.getCode().intValue()) { logger.info("更新租金押金账单"); - WxBillDeposit billDeposit = wxBillDepositMapper.selectByPrimaryKey(bill.get("id")); + WxBillDeposit billDeposit = wxBillDepositMapper.selectById((Long) bill.get("id")); if (billDeposit != null && !billDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillRentDeposit(bill); } } else if (billTypeValue == EnumBillTypeParam.PROPERTY.getCode().intValue()) { logger.info("更新物业账单"); - WxBillProperty property = wxBillPropertyMapper.selectByPrimaryKey(bill.get("id")); + WxBillProperty property = wxBillPropertyMapper.selectById((Long) bill.get("id")); if (property != null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillProperty(bill); } } else if (billTypeValue == EnumBillTypeParam.PROPERTY_DEPOSIT.getCode().intValue()) { logger.info("更新物业押金账单"); - WxBillPropertyDeposit wxBillPropertyDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(bill.get("id")); + WxBillPropertyDeposit wxBillPropertyDeposit = wxBillPropertyDepositMapper.selectById((Long) bill.get("id")); if (wxBillPropertyDeposit != null && !wxBillPropertyDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillPropertyDeposit(bill); } } else if (billTypeValue == EnumBillTypeParam.WATER.getCode().intValue()) { logger.info("更新水费账单"); - WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); + WxBillDaily wxBillDaily = wxBillDailyMapper.selectById((Long) bill.get("id")); if (wxBillDaily != null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillDaily(bill); } } else if (billTypeValue == EnumBillTypeParam.POWER.getCode().intValue()) { logger.info("更新电费账单"); - WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); + WxBillDaily wxBillDaily = wxBillDailyMapper.selectById((Long) bill.get("id")); if (wxBillDaily != null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillDaily(bill); } } else if (billTypeValue == EnumBillTypeParam.AIR_CONDITIONING.getCode().intValue()) { logger.info("更新空调费账单"); - WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); + WxBillDaily wxBillDaily = wxBillDailyMapper.selectById((Long) bill.get("id")); if (wxBillDaily != null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillDaily(bill); } } else if (billTypeValue == EnumBillTypeParam.ROUTINE.getCode().intValue()) { logger.info("更新其他账单"); - WxBillOther wxBillOther = wxBillOtherMapper.selectByPrimaryKey(bill.get("id")); + WxBillOther wxBillOther = wxBillOtherMapper.selectById((Long) bill.get("id")); if (wxBillOther != null && !wxBillOther.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillOther(bill); } } else if (billTypeValue == EnumBillTypeParam.ATHER_DEPOSIT.getCode().intValue()) { logger.info("更新其他押金账单"); - WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(bill.get("id")); + WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectById((Long) bill.get("id")); if (wxBillOtherDeposit != null && !wxBillOtherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { updateBillOtherDeposit(bill); } @@ -289,13 +290,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); settleRecord.setTenantId(wxBillSettle.getTenantId()); - BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); - settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); - wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); + BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); + wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); wxBillSettle.setUpdatetime(new Date()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); - wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); + wxBillSettleMapper.updateById(wxBillSettle); logger.info("更新结算单success"); }catch (Exception e){ @@ -339,7 +340,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { private int updateBillOtherDeposit(Map bill) { logger.info("updateBillOtherDeposit params:" + bill.toString()); Object id = bill.get("id"); - WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(id); + WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectById((Long) id); if (wxBillOtherDeposit == null) { return 0; } @@ -354,13 +355,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillOtherDeposit.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); int count = 0; try { - count = wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); + count = wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); } catch (Exception e) { logger.error("更新其他押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //日志 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bill.get("userId")); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById((Long) bill.get("userId")); WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillOtherDeposit.getId()); String price = new BigDecimal(owe).divide(new BigDecimal(100)).toPlainString(); @@ -383,7 +384,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { private int updateBillOther(Map bill) { logger.info("updateBillOther params:" + bill.toString()); Object id = bill.get("id"); - WxBillOther wxBillOther = wxBillOtherMapper.selectByPrimaryKey(id); + WxBillOther wxBillOther = wxBillOtherMapper.selectById((Long) id); if (wxBillOther == null) { return 0; } @@ -398,13 +399,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillOther.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); int count = 0; try { - count = wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); + count = wxBillOtherMapper.updateById(wxBillOther); } catch (Exception e) { logger.error("更新其他账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //日志 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bill.get("userId")); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById((Long) bill.get("userId")); WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillOther.getId()); String price = new BigDecimal(owe).divide(new BigDecimal(100)).toPlainString(); @@ -427,7 +428,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { private int updateBillDaily(Map bill) { logger.info("updateBillDaily params:" + bill.toString()); Object id = bill.get("id"); - WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(id); + WxBillDaily wxBillDaily = wxBillDailyMapper.selectById((Long) id); if (wxBillDaily == null) { return 0; } @@ -443,13 +444,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { int count = 0; try { - count = wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); + count = wxBillDailyMapper.updateById(wxBillDaily); } catch (Exception e) { logger.error("更新日常账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //日志 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bill.get("userId")); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById((Long) bill.get("userId")); WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillDaily.getId()); String price = new BigDecimal(owe).divide(new BigDecimal(100)).toPlainString(); @@ -472,7 +473,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { private int updateBillPropertyDeposit(Map bill) { logger.info("updateBillPropertyDeposit params:" + bill.toString()); Object id = bill.get("id"); - WxBillPropertyDeposit wxBillPropertyDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(id); + WxBillPropertyDeposit wxBillPropertyDeposit = wxBillPropertyDepositMapper.selectById((Long) id); if (wxBillPropertyDeposit == null) { return 0; } @@ -488,13 +489,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { int count = 0; try { - count = wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); + count = wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); } catch (Exception e) { logger.error("更新物业押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //日志 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bill.get("userId")); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById((Long) bill.get("userId")); WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillPropertyDeposit.getId()); String price = new BigDecimal(owe).divide(new BigDecimal(100)).toPlainString(); @@ -517,7 +518,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { private int updateBillProperty(Map bill) { logger.info("updateBillProperty params:" + bill.toString()); Object id = bill.get("id"); - WxBillProperty property = wxBillPropertyMapper.selectByPrimaryKey(id); + WxBillProperty property = wxBillPropertyMapper.selectById((Long) id); if (property == null) { return 0; } @@ -533,13 +534,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { int count = 0; try { - count = wxBillPropertyMapper.updateByPrimaryKeySelective(property); + count = wxBillPropertyMapper.updateById(property); } catch (Exception e) { logger.error("更新物业账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //日志 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bill.get("userId")); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById((Long) bill.get("userId")); WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(property.getId()); String price = new BigDecimal(owe).divide(new BigDecimal(100)).toPlainString(); @@ -562,7 +563,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { private int updateBillRentDeposit(Map bill) { logger.info("updateBillRentDeposit params:" + bill.toString()); Object id = bill.get("id"); - WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(id); + WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectById((Long) id); if (wxBillDeposit == null) { return 0; } @@ -578,13 +579,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { int count = 0; try { - count = wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + count = wxBillDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("更新租赁押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //日志 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bill.get("userId")); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById((Long) bill.get("userId")); WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillDeposit.getId()); String price = new BigDecimal(owe).divide(new BigDecimal(100)).toPlainString(); @@ -607,7 +608,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { private int updateBillRent(Map bill) { logger.info("updateBillRentDeposit params:" + bill.toString()); Object id = bill.get("id"); - WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(id); + WxBillRent wxBillRent = wxBillRentMapper.selectById((Long) id); if (wxBillRent == null) { return 0; } @@ -623,13 +624,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { int count = 0; try { - count = wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + count = wxBillRentMapper.updateById(wxBillRent); } catch (Exception e) { logger.error("更新租金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //日志 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bill.get("userId")); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById((Long) bill.get("userId")); WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillRent.getId()); String price = new BigDecimal(owe).divide(new BigDecimal(100)).toPlainString(); @@ -694,7 +695,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { //付款方式 WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); - WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); + WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(new QueryWrapper(wxPayAccountBill)); if (payAccountBill != null) { String bankCardId = payAccountBill.getBankCardId(); String bankAccountName = payAccountBill.getBankAccountName(); @@ -846,7 +847,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxMall wxMall = wxMallMapper.getByTenantId(wxBillSettle.getTenantId()); result.put("mall", wxMall.getName()); - result.put("merchant",wxMerchantMapper.selectByPrimaryKey(wxBillSettle.getMerchantId()).getName()); + result.put("merchant", wxMerchantMapper.selectById(wxBillSettle.getMerchantId()).getName()); result.put("num", wxBillSettle.getSettleNumber()); result.put("cdate", DateUtils.format(wxBillSettle.getCreatetime())); @@ -910,13 +911,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { Long id = wxBillAll.getId(); Date updateDate = new Date(); if (billType.equals(EnumBillTypeParam.RENT.getCode())) { - WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(id); + WxBillRent dbBill = wxBillRentMapper.selectById(id); WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(id); wxBillRent.setUpdatetime(updateDate); if (oldLatePrice != null) { wxBillRent.setLatePayPrice(newLatePrice); - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillRentMapper.updateById(wxBillRent); addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); } else { //租赁账单更新 @@ -925,12 +926,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (newPrice.equals(dbBill.getPay())) { wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); } - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillRentMapper.updateById(wxBillRent); //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } } else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) { - WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(id); + WxBillDeposit dbBill = wxBillDepositMapper.selectById(id); if(dbBill!=null) { //租赁押金账单更新 WxBillDeposit wxBillDeposit = new WxBillDeposit(); @@ -941,12 +942,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); } wxBillDeposit.setUpdatetime(updateDate); - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillDepositMapper.updateById(wxBillDeposit); //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } - WxBillPropertyDeposit propertyDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(id); + WxBillPropertyDeposit propertyDeposit = wxBillPropertyDepositMapper.selectById(id); if(propertyDeposit!=null){ //物业押金账单更新 WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); @@ -957,19 +958,19 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillPropertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); } wxBillPropertyDeposit.setUpdatetime(updateDate); - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); + wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } } else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) { - WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(id); + WxBillProperty dbBill = wxBillPropertyMapper.selectById(id); //物业账单更新 WxBillProperty wxBillProperty = new WxBillProperty(); wxBillProperty.setId(id); wxBillProperty.setUpdatetime(updateDate); if (oldLatePrice != null) { wxBillProperty.setLatePayPrice(newLatePrice); - wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); + wxBillPropertyMapper.updateById(wxBillProperty); addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); } else { wxBillProperty.setReceivePay(newPrice); @@ -977,12 +978,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (newPrice.equals(dbBill.getPay())) { wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode()); } - wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); + wxBillPropertyMapper.updateById(wxBillProperty); //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } } else if (billType.equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode())) { - WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(id); + WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(id); //物业押金账单更新 WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); wxBillPropertyDeposit.setId(id); @@ -992,7 +993,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillPropertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); } wxBillPropertyDeposit.setUpdatetime(updateDate); - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); + wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } else if (billType.equals(EnumBillTypeParam.WATER.getCode())) { @@ -1011,7 +1012,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } else if (billType.equals(EnumBillTypeParam.ROUTINE.getCode())) { - WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(id); + WxBillOther dbBill = wxBillOtherMapper.selectById(id); //其他费用账单更新 WxBillOther wxBillOther = new WxBillOther(); wxBillOther.setId(id); @@ -1021,11 +1022,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); } wxBillOther.setUpdatetime(updateDate); - wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); + wxBillOtherMapper.updateById(wxBillOther); //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } else if (billType.equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) { - WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(id); + WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(id); //其他押金账单更新 WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); wxBillOtherDeposit.setId(id); @@ -1035,7 +1036,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); } wxBillOtherDeposit.setUpdatetime(updateDate); - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); + wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); //账单日志 addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } else { @@ -1185,7 +1186,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { dailyQuery.setMerchantId(bill.getMerchantId()); dailyQuery.setReceiveDate(bill.getReceiveDate()); dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxBillDaily daily = wxBillDailyMapper.selectOne(dailyQuery); + WxBillDaily daily = wxBillDailyMapper.selectOne(new QueryWrapper(dailyQuery)); if (daily != null && pay > 0) { if (!daily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { long allPay = new BigDecimal(daily.getPay()).add(new BigDecimal(pay)).longValueExact(); @@ -1201,7 +1202,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } daily.setPayDate(bill.getPayDate()); daily.setReceiveDate(bill.getReceiveDate()); - wxBillDailyMapper.updateByPrimaryKey(daily); + wxBillDailyMapper.updateById(daily); addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } } else { @@ -1209,7 +1210,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxMerchantShop.setTenantId(tenantId); wxMerchantShop.setMerchantId(bill.getMerchantId()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - List select = wxMerchantShopMapper.select(wxMerchantShop); + List select = wxMerchantShopMapper.selectList(new QueryWrapper<>(wxMerchantShop)); if (!select.isEmpty()) { daily = new WxBillDaily(); final IdWorker idWorker = IdWorker.get(); @@ -1234,7 +1235,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { daily.setExpiredDay(expiredDayAndStatus.getExpiredDay()); daily.setStatus(expiredDayAndStatus.getStatus()); daily.setBuildWay(EnumBillDailyBuildWay.IMPORT.getCode()); - wxBillDailyMapper.insertSelective(daily); + wxBillDailyMapper.insert(daily); if (pay > 0) { addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } @@ -1247,7 +1248,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherQuery.setReceiveDate(bill.getReceiveDate()); otherQuery.setName(bill.getBillAttr()); otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); + WxBillOther other = wxBillOtherMapper.selectOne(new QueryWrapper(otherQuery)); if (other != null && pay > 0) { if (!other.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { long allPay = new BigDecimal(other.getPay()).add(new BigDecimal(pay)).longValueExact(); @@ -1265,7 +1266,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } other.setPayDate(bill.getPayDate()); other.setReceiveDate(bill.getReceiveDate()); - wxBillOtherMapper.updateByPrimaryKey(other); + wxBillOtherMapper.updateById(other); addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } } else { @@ -1273,7 +1274,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxMerchantShop.setTenantId(tenantId); wxMerchantShop.setMerchantId(bill.getMerchantId()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - List select = wxMerchantShopMapper.select(wxMerchantShop); + List select = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); if (!select.isEmpty()) { other = new WxBillOther(); final IdWorker idWorker = IdWorker.get(); @@ -1298,7 +1299,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxBillRent expiredDayAndStatus = getExpiredDayAndStatus(bill.getReceiveDate(), bill.getPayDate(), receivePay, pay, false); other.setExpiredDay(expiredDayAndStatus.getExpiredDay()); other.setStatus(expiredDayAndStatus.getStatus()); - wxBillOtherMapper.insertSelective(other); + wxBillOtherMapper.insert(other); if (pay > 0) { addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } @@ -1311,7 +1312,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDepositQuery.setReceiveDate(bill.getReceiveDate()); otherDepositQuery.setComments(bill.getBillAttr()); otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); + WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(new QueryWrapper(otherDepositQuery)); if (otherDeposit != null && pay > 0) { if (!otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode()) && !otherDeposit.getStatus().equals(EnumBillRentStatus.RETURN.getCode())) { long allPay = new BigDecimal(otherDeposit.getPay()).add(new BigDecimal(pay)).longValueExact(); @@ -1330,7 +1331,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } otherDeposit.setPayDate(bill.getPayDate()); otherDeposit.setReceiveDate(bill.getReceiveDate()); - wxBillOtherDepositMapper.updateByPrimaryKey(otherDeposit); + wxBillOtherDepositMapper.updateById(otherDeposit); addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } } else { @@ -1339,7 +1340,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxMerchantShop.setMerchantId(bill.getMerchantId()); otherDepositQuery.setReceiveDate(bill.getReceiveDate()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - List select = wxMerchantShopMapper.select(wxMerchantShop); + List select = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); if (!select.isEmpty()) { otherDeposit = new WxBillOtherDeposit(); final IdWorker idWorker = IdWorker.get(); @@ -1367,7 +1368,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } else { otherDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } - wxBillOtherDepositMapper.insertSelective(otherDeposit); + wxBillOtherDepositMapper.insert(otherDeposit); if (pay > 0) { addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } @@ -1441,7 +1442,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { rent.setOwe(rent.getOwe() - pay); rent.setPayDate(bill.getPayDate()); rent.setReceiveDate(bill.getReceiveDate()); - wxBillRentMapper.updateByPrimaryKey(rent); + wxBillRentMapper.updateById(rent); if (pay > 0) { addActionImport(rent.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } @@ -1468,7 +1469,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { property.setOwe(property.getOwe() - pay); property.setPayDate(bill.getPayDate()); property.setReceiveDate(bill.getReceiveDate()); - wxBillPropertyMapper.updateByPrimaryKey(property); + wxBillPropertyMapper.updateById(property); if (pay > 0) { addActionImport(property.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); } @@ -1492,7 +1493,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } public void updateDailyBill(Long businessId, Long newPrice, Date updateDate) { - WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(businessId); + WxBillDaily dbBill = wxBillDailyMapper.selectById(businessId); WxBillDaily wxBillDaily = new WxBillDaily(); wxBillDaily.setId(businessId); wxBillDaily.setReceivePay(newPrice); @@ -1501,7 +1502,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); } wxBillDaily.setUpdatetime(updateDate); - wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); + wxBillDailyMapper.updateById(wxBillDaily); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 5a7672b85..bd029e7fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -135,7 +136,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { dailyQuery.setMerchantId(record.getMerchantId()); dailyQuery.setReceiveDate(record.getReceiveDate()); dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxBillDaily daily = wxBillDailyMapper.selectOne(dailyQuery); + WxBillDaily daily = wxBillDailyMapper.selectOne(new QueryWrapper<>(dailyQuery)); if (daily != null) { return new ResultData(ErrorCode.BILL_IS_FOUND); } @@ -148,7 +149,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { - wxBillDailyMapper.insertSelective(record); + wxBillDailyMapper.insert(record); } catch (Exception e) { logger.error("保存日常账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -156,7 +157,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { return new ResultData(Result.SUCCESS, "保存日常账单成功"); } else { logger.info("更新日常押金账单"); - WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(record.getId()); + WxBillDaily wxBillDaily = wxBillDailyMapper.selectById(record.getId()); if(wxBillDaily==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } @@ -180,7 +181,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setPayWay(record.getPayWay()); wxBillDaily.setPriceDetail(record.getPriceDetail()); try { - wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); + wxBillDailyMapper.updateById(wxBillDaily); } catch (Exception e) { logger.error("更新日常账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -209,13 +210,13 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public void deleteById(Long id) { - wxBillDailyMapper.deleteByPrimaryKey(id); + wxBillDailyMapper.deleteById(id); } @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(id); + WxBillDaily wxBillDaily = wxBillDailyMapper.selectById(id); if(wxBillDaily==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } @@ -224,7 +225,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setPayDate(d); wxBillDaily.setUpdatetime(d); try { - wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); + wxBillDailyMapper.updateById(wxBillDaily); } catch (Exception e) { logger.error("日常账单结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(),e.getMessage()); @@ -301,12 +302,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { WxMerchantShop merchantShop = new WxMerchantShop(); merchantShop.setShopId(billDaily.getShopId()); merchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxMerchantShop wxMerchantShop = wxMerchantShopMapper.selectOne(merchantShop); + WxMerchantShop wxMerchantShop = wxMerchantShopMapper.selectOne(new QueryWrapper<>(merchantShop)); wxBillDaily.setMerchantId(wxMerchantShop.getMerchantId()); final IdWorker idWorker = IdWorker.get(); wxBillDaily.setId(idWorker.nextId()); - wxBillDailyMapper.insertSelective(wxBillDaily); + wxBillDailyMapper.insert(wxBillDaily); //记数 stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 3f1bba885..7f4aaf772 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -115,7 +115,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { - wxBillDepositMapper.insertSelective(record); + wxBillDepositMapper.insert(record); } catch (Exception e) { logger.error("保存租赁押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -123,7 +123,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { return new ResultData(Result.SUCCESS, "保存租赁押金账单成功"); } else { logger.info("更新租赁押金账单"); - WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId()); + WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectById(record.getId()); if(wxBillDeposit==null){ return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } @@ -144,7 +144,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillDeposit.setUpdatetime(date); wxBillDeposit.setPayWay(record.getPayWay()); try { - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("更新租赁押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -173,13 +173,13 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public void deleteById(Long id) { - wxBillDepositMapper.deleteByPrimaryKey(id); + wxBillDepositMapper.deleteById(id); } @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(id); + WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectById(id); if(wxBillDeposit==null){ return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } @@ -188,7 +188,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillDeposit.setPayDate(d); wxBillDeposit.setUpdatetime(d); try { - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("租赁押金结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -200,7 +200,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public ResultData returnDeposit(WxBillDeposit record, MallUserInfo user) { logger.info("租赁押金退还"); - WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId()); + WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectById(record.getId()); if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } @@ -209,7 +209,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); wxBillDeposit.setUpdatetime(new Date()); try { - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("租赁押金退还失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -237,7 +237,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public ResultData adjustDeposit(WxBillDeposit record) { logger.info("租赁押金调整"); - WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId()); + WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectById(record.getId()); if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } @@ -245,7 +245,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillDeposit.setOwe(record.getReceivePay() - record.getPay()); wxBillDeposit.setUpdatetime(new Date()); try { - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("租赁押金调整失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 146c4059c..1ca8460e9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -1,12 +1,16 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxBillAction; +import com.iformall.domain.po.WxBillOtherDeposit; +import com.iformall.domain.po.WxShop; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillOtherDepositMapper; @@ -129,7 +133,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService otherDepositQuery.setReceiveDate(record.getReceiveDate()); otherDepositQuery.setComments(record.getComments()); otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); + WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(new QueryWrapper(otherDepositQuery)); if (otherDeposit != null) { return new ResultData(ErrorCode.BILL_IS_FOUND); } @@ -143,7 +147,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService record.setOwe(record.getReceivePay() - record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { - wxBillOtherDepositMapper.insertSelective(record); + wxBillOtherDepositMapper.insert(record); } catch (Exception e) { logger.error("保存其他账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -151,7 +155,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService return new ResultData(Result.SUCCESS, "保存其他账单成功"); } else { logger.info("更新其他押金账单"); - WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); + WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectById(record.getId()); if (wxBillOtherDeposit == null) { return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } @@ -175,7 +179,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillOtherDeposit.setPayWay(record.getPayWay()); wxBillOtherDeposit.setComments(record.getComments()); try { - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); + wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); } catch (Exception e) { logger.error("更新其他账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -205,13 +209,13 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public void deleteById(Long id) { - wxBillOtherDepositMapper.deleteByPrimaryKey(id); + wxBillOtherDepositMapper.deleteById(id); } @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(id); + WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectById(id); if (wxBillOtherDeposit == null) { return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } @@ -220,7 +224,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillOtherDeposit.setPayDate(d); wxBillOtherDeposit.setUpdatetime(d); try { - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); + wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); } catch (Exception e) { logger.error("其他押金账单结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), e.getMessage()); @@ -231,7 +235,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public ResultData returnDeposit(WxBillOtherDeposit record, MallUserInfo user) { logger.info("其他押金退还"); - WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); + WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectById(record.getId()); if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); } @@ -239,7 +243,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); wxBillDeposit.setUpdatetime(new Date()); try { - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillOtherDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("押金退还失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -269,7 +273,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public ResultData adjustDeposit(WxBillOtherDeposit record) { logger.info("其他押金调整"); - WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); + WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectById(record.getId()); if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); } @@ -277,7 +281,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillDeposit.setOwe(record.getReceivePay() - record.getPay()); wxBillDeposit.setUpdatetime(new Date()); try { - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillOtherDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("其他押金退还失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index b7bead103..c9f355329 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -1,12 +1,16 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxBillAction; +import com.iformall.domain.po.WxBillOther; +import com.iformall.domain.po.WxShop; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillOtherMapper; @@ -130,7 +134,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { otherQuery.setReceiveDate(record.getReceiveDate()); otherQuery.setName(record.getName()); otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); + WxBillOther other = wxBillOtherMapper.selectOne(new QueryWrapper(otherQuery)); if (other != null) { return new ResultData(ErrorCode.BILL_IS_FOUND); } @@ -143,7 +147,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { - wxBillOtherMapper.insertSelective(record); + wxBillOtherMapper.insert(record); } catch (Exception e) { logger.error("保存其他账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -151,7 +155,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { return new ResultData(Result.SUCCESS, "保存其他账单成功"); } else { logger.info("更新其他押金账单"); - WxBillOther wxBillOther = wxBillOtherMapper.selectByPrimaryKey(record.getId()); + WxBillOther wxBillOther = wxBillOtherMapper.selectById(record.getId()); if(wxBillOther==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } @@ -176,7 +180,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillOther.setComments(record.getComments()); wxBillOther.setName(record.getName()); try { - wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); + wxBillOtherMapper.updateById(wxBillOther); } catch (Exception e) { logger.error("更新其他账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -206,13 +210,13 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { @Override public void deleteById(Long id) { - wxBillOtherMapper.deleteByPrimaryKey(id); + wxBillOtherMapper.deleteById(id); } @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillOther wxBillOther = wxBillOtherMapper.selectByPrimaryKey(id); + WxBillOther wxBillOther = wxBillOtherMapper.selectById(id); if(wxBillOther==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } @@ -221,7 +225,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillOther.setPayDate(d); wxBillOther.setUpdatetime(d); try { - wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); + wxBillOtherMapper.updateById(wxBillOther); } catch (Exception e) { logger.error("其他账单结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(),e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index ed328ab46..13acbb78d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -115,7 +115,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { - wxBillPropertyDepositMapper.insertSelective(record); + wxBillPropertyDepositMapper.insert(record); } catch (Exception e) { logger.error("保存物业押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -123,7 +123,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe return new ResultData(Result.SUCCESS, "保存物业押金账单成功"); } else { logger.info("更新押金账单"); - WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(record.getId()); + WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectById(record.getId()); if(record==null){ return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); } @@ -144,7 +144,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillDeposit.setUpdatetime(date); wxBillDeposit.setPayWay(record.getPayWay()); try { - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillPropertyDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("更新物业押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -173,13 +173,13 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Override public void deleteById(Long id) { - wxBillPropertyDepositMapper.deleteByPrimaryKey(id); + wxBillPropertyDepositMapper.deleteById(id); } @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(id); + WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectById(id); if(wxBillDeposit==null){ return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); } @@ -188,7 +188,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillDeposit.setPayDate(d); wxBillDeposit.setUpdatetime(d); try { - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillPropertyDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("物业押金结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -199,7 +199,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Override public ResultData returnDeposit(WxBillPropertyDeposit record, MallUserInfo user) { logger.info("物业押金退还"); - WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(record.getId()); + WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectById(record.getId()); if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); } @@ -208,7 +208,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); wxBillDeposit.setUpdatetime(new Date()); try { - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillPropertyDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("物业押金退还失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -237,7 +237,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Override public ResultData adjustDeposit(WxBillPropertyDeposit record) { logger.info("物业押金调整"); - WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(record.getId()); + WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectById(record.getId()); if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); } @@ -245,7 +245,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillDeposit.setOwe(record.getReceivePay() - record.getPay()); wxBillDeposit.setUpdatetime(new Date()); try { - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + wxBillPropertyDepositMapper.updateById(wxBillDeposit); } catch (Exception e) { logger.error("物业押金退还失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index dfcdf1551..1c113086f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -124,7 +124,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { - wxBillPropertyMapper.insertSelective(record); + wxBillPropertyMapper.insert(record); } catch (Exception e) { logger.error("保存物业账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -132,7 +132,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { return new ResultData(Result.SUCCESS, "保存物业账单成功"); } else { logger.info("更新物业账单"); - WxBillProperty property = wxBillPropertyMapper.selectByPrimaryKey(record.getId()); + WxBillProperty property = wxBillPropertyMapper.selectById(record.getId()); if(property==null){ return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); } @@ -159,7 +159,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setUpdatetime(date); property.setPayWay(record.getPayWay()); try { - wxBillPropertyMapper.updateByPrimaryKeySelective(property); + wxBillPropertyMapper.updateById(property); } catch (Exception e) { logger.error("更新物业账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -188,7 +188,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public void deleteById(Long id) { - wxBillPropertyMapper.deleteByPrimaryKey(id); + wxBillPropertyMapper.deleteById(id); } @Override @@ -208,7 +208,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillProperty record = wxBillPropertyMapper.selectByPrimaryKey(id); + WxBillProperty record = wxBillPropertyMapper.selectById(id); if(record==null){ return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); } @@ -217,7 +217,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.setPayDate(d); record.setUpdatetime(d); try { - wxBillPropertyMapper.updateByPrimaryKeySelective(record); + wxBillPropertyMapper.updateById(record); } catch (Exception e) { logger.error("结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -248,7 +248,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.setLatePayStatus(EnumBillDailyStatus.PAID.getCode()); record.setUpdatetime(new Date()); try { - wxBillPropertyMapper.updateByPrimaryKeySelective(record); + wxBillPropertyMapper.updateById(record); } catch (Exception e) { logger.error("修改营业额失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "滞纳金结单失败"); @@ -288,17 +288,12 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { excelService.exportExcel(datalist, null, billName, WxBillProperty.class, billName + ".xlsx", response, false); } - @Override - public List findLatePayBill() { - return wxBillPropertyMapper.findLatePayBill(); - } - @Override public ResultData updateLatePayMoney(WxBillProperty record, MallUserInfo user) { if(record.getLatePayMoneyUpdate() != null) { record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); } - wxBillPropertyMapper.updateByPrimaryKeySelective(record); + wxBillPropertyMapper.updateById(record); final IdWorker idWorker = IdWorker.get(); WxBillAction billAction = new WxBillAction(); @@ -309,7 +304,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { billAction.setBillId(record.getId()); billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); billAction.setUpdatetime(new Date()); - wxBillActionMapper.insertSelective(billAction); + wxBillActionMapper.insert(billAction); return new ResultData(); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index b883e5eb6..59c0c0370 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -136,7 +136,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { - wxBillRentMapper.insertSelective(record); + wxBillRentMapper.insert(record); } catch (Exception e) { logger.error("保存租赁账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -144,7 +144,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { return new ResultData(Result.SUCCESS, "保存租赁账单成功"); } else { logger.info("更新租赁账单"); - WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId()); + WxBillRent wxBillRent = wxBillRentMapper.selectById(record.getId()); if(wxBillRent==null){ return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); } @@ -170,7 +170,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setUpdatetime(date); wxBillRent.setPayWay(record.getPayWay()); try { - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillRentMapper.updateById(wxBillRent); } catch (Exception e) { logger.error("更新租赁账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -199,7 +199,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public void deleteById(Long id) { - wxBillRentMapper.deleteByPrimaryKey(id); + wxBillRentMapper.deleteById(id); } @Override @@ -222,7 +222,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(id); + WxBillRent wxBillRent = wxBillRentMapper.selectById(id); if(wxBillRent==null){ return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); } @@ -231,7 +231,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setPayDate(d); wxBillRent.setUpdatetime(d); try { - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillRentMapper.updateById(wxBillRent); } catch (Exception e) { logger.error("租赁账单结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -258,7 +258,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { //解单金额 SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - WxBillRent billRent = wxBillRentMapper.selectByPrimaryKey(id); + WxBillRent billRent = wxBillRentMapper.selectById(id); WxMerchantTradeDaily merchantTradeDaily = new WxMerchantTradeDaily(); merchantTradeDaily.setMerchantId(billRent.getMerchantId()); merchantTradeDaily.setStartTime(sd.format(billRent.getStarttime())); @@ -280,8 +280,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override @Transactional(rollbackFor = {Exception.class}) public ResultData updateRevenue(WxBillRent record, MallUserInfo user) { - WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId()); - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxBillRent.getRentContractId()); + WxBillRent wxBillRent = wxBillRentMapper.selectById(record.getId()); + WxRentContract wxRentContract = wxRentContractMapper.selectById(wxBillRent.getRentContractId()); SimpleDateFormat sdD = new SimpleDateFormat("d"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); @@ -342,7 +342,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { Long newPrice = newReceivePay; wxBillRent.setUpdatetime(new Date()); - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillRentMapper.updateById(wxBillRent); if (!oldPrice.equals(newPrice)) { //日志 @@ -371,7 +371,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { record.setLatePayStatus(EnumBillDailyStatus.PAID.getCode()); record.setUpdatetime(new Date()); try { - wxBillRentMapper.updateByPrimaryKeySelective(record); + wxBillRentMapper.updateById(record); } catch (Exception e) { logger.error("修改营业额失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "滞纳金结单失败"); @@ -410,17 +410,12 @@ public class WxBillRentServiceImpl implements WxBillRentService { excelService.exportExcel(datalist, null, billName, WxBillRent.class, billName + ".xlsx", response, false); } - @Override - public List findLatePayBill() { - return wxBillRentMapper.findLatePayBill(); - } - @Override public ResultData updateLatePayMoney(WxBillRent record, MallUserInfo user) { if(record.getLatePayMoneyUpdate() != null) { record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); } - wxBillRentMapper.updateByPrimaryKeySelective(record); + wxBillRentMapper.updateById(record); final IdWorker idWorker = IdWorker.get(); WxBillAction billAction = new WxBillAction(); @@ -431,7 +426,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { billAction.setBillId(record.getId()); billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); billAction.setUpdatetime(new Date()); - wxBillActionMapper.insertSelective(billAction); + wxBillActionMapper.insert(billAction); return new ResultData(); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java index 8af5bdc45..c54b65534 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java @@ -48,7 +48,7 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService WxBillSettle wxBillSettle = new WxBillSettle(); wxBillSettle.setId(record.getSettleId()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); - wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); + wxBillSettleMapper.updateById(wxBillSettle); } if(record.getBalance()!=null && record.getBalance() < 0){ record.setSettleMoney(-record.getSettleMoney()); @@ -65,13 +65,13 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService record.setUserid(mallUserInfo.getId()); record.setUserName(mallUserInfo.getName()); }else if(bUserId != null){ - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(bUserId); if(wxMerchantBUser!=null) record.setUserName(wxMerchantBUser.getName()); } - wxBillSettleRecordMapper.insertSelective(record); + wxBillSettleRecordMapper.insert(record); }else{ - wxBillSettleRecordMapper.updateByPrimaryKeySelective(record); + wxBillSettleRecordMapper.updateById(record); } return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 1efac2b15..ae0efe323 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -97,10 +97,10 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { @Override public WxBillSettle getById(Long id,Integer filterSettleRecord){ - WxBillSettle billSettle = wxBillSettleMapper.selectByPrimaryKey(id); + WxBillSettle billSettle = wxBillSettleMapper.selectById(id); - if(billSettle != null){ - WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(billSettle.getMerchantId()); + if(billSettle != null) { + WxMerchant merchant = wxMerchantMapper.selectById(billSettle.getMerchantId()); if(merchant != null){ billSettle.setMerchantName(merchant.getName()); } @@ -151,7 +151,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { billAction.setDetails("通过结算单清算"+newmoney.toString()+"元"); billAction.setUpdatetime(new Date()); billAction.setPayDate(new Date()); - wxBillActionMapper.insertSelective(billAction); + wxBillActionMapper.insert(billAction); } @Override @@ -167,7 +167,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillRent dbBill = wxBillRentMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getOwe() == null) dbBill.setOwe(0l); @@ -176,7 +176,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillRentMapper.updateById(wxBillRent); }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { WxBillDeposit wxBillRent = new WxBillDeposit(); wxBillRent.setId(bill.getBillId()); @@ -186,7 +186,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillDeposit dbBill = wxBillDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getReceivePay() == null) dbBill.setReceivePay(0l); @@ -200,7 +200,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillDepositMapper.updateById(wxBillRent); WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); wxBillOtherDeposit.setId(bill.getBillId()); @@ -210,7 +210,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillOtherDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getReceivePay() == null) dbBill.setReceivePay(0l); @@ -224,7 +224,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); + wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); @@ -234,7 +234,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getReceivePay() == null) dbBill.setReceivePay(0l); @@ -248,7 +248,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); + wxBillPropertyDepositMapper.updateById(propertyDeposit); }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { WxBillProperty wxBillRent = new WxBillProperty(); @@ -259,7 +259,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillProperty dbBill = wxBillPropertyMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getOwe() == null) dbBill.setOwe(0l); @@ -268,7 +268,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillPropertyMapper.updateById(wxBillRent); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); @@ -278,7 +278,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getReceivePay() == null) dbBill.setReceivePay(0l); @@ -292,7 +292,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); + wxBillPropertyDepositMapper.updateById(propertyDeposit); }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { WxBillOther wxBillRent = new WxBillOther(); wxBillRent.setId(bill.getBillId()); @@ -302,7 +302,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getOwe() == null) dbBill.setOwe(0l); @@ -311,7 +311,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillOtherMapper.updateById(wxBillRent); }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); wxBillRent.setId(bill.getBillId()); @@ -321,7 +321,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getReceivePay() == null) dbBill.setReceivePay(0l); @@ -335,7 +335,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillOtherDepositMapper.updateById(wxBillRent); WxMerchantSubsidy wxMerchantSubsidy = new WxMerchantSubsidy(); wxMerchantSubsidy.setId(bill.getBillId()); @@ -343,7 +343,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(status != null){ wxMerchantSubsidy.setStatus(status); } - wxMerchantSubsidyMapper.updateByPrimaryKeySelective(wxMerchantSubsidy); + wxMerchantSubsidyMapper.updateById(wxMerchantSubsidy); }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); wxBillRent.setId(bill.getBillId()); @@ -353,7 +353,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getReceivePay() == null) dbBill.setReceivePay(0l); @@ -367,7 +367,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillOtherDepositMapper.updateById(wxBillRent); }else{ WxBillDaily wxBillDaily = new WxBillDaily(); wxBillDaily.setId(bill.getBillId()); @@ -377,7 +377,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillDaily.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillDaily.getId()); + WxBillDaily dbBill = wxBillDailyMapper.selectById(wxBillDaily.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getOwe() == null) dbBill.setOwe(0l); @@ -386,7 +386,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); + wxBillDailyMapper.updateById(wxBillDaily); WxBillOther wxBillRent = new WxBillOther(); wxBillRent.setId(bill.getBillId()); @@ -396,7 +396,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getOwe() == null) dbBill.setOwe(0l); @@ -405,7 +405,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillOtherMapper.updateById(wxBillRent); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); @@ -415,7 +415,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); propertyDeposit.setPayDate(new Date()); @@ -427,7 +427,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { addBillAction(bill.getBillId(), dbBill.getOwe()); } } - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); + wxBillPropertyDepositMapper.updateById(propertyDeposit); } } } @@ -485,9 +485,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { } if (record.getId() == null) { record.setId(idWorker.nextId()); - wxBillSettleMapper.insertSelective(record); + wxBillSettleMapper.insert(record); }else{ - wxBillSettleMapper.updateByPrimaryKeySelective(record); + wxBillSettleMapper.updateById(record); } wxBillSettleBillMapper.delBySettleId(record); @@ -497,14 +497,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { bill.setSettleId(record.getId()); bill.setTenantId(record.getTenantId()); bill.setType(EnumSettleBillType.R.getCode()); - wxBillSettleBillMapper.insertSelective(bill); + wxBillSettleBillMapper.insert(bill); } for (WxBillSettleBill bill:record.getPayBillIds()) { bill.setId(idWorker.nextId()); bill.setSettleId(record.getId()); bill.setTenantId(record.getTenantId()); bill.setType(EnumSettleBillType.P.getCode()); - wxBillSettleBillMapper.insertSelective(bill); + wxBillSettleBillMapper.insert(bill); } //改为冻结状态 @@ -547,5 +547,3 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { } } - - diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index e6e0756d9..17f0ff845 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -32,7 +32,6 @@ public class WxBrandServiceImpl implements WxBrandService { @Autowired WxBrandMapper wxBrandMapper; - @Override public PageInfo listAsPage(WxBrand record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBrandMapper.findList(record)); @@ -40,12 +39,12 @@ public class WxBrandServiceImpl implements WxBrandService { @Override public WxBrand getById(Long id) { - return wxBrandMapper.selectByPrimaryKey(id); + return wxBrandMapper.selectById(id); } @Override public void deleteById(Long id) { - wxBrandMapper.deleteByPrimaryKey(id); + wxBrandMapper.deleteById(id); } @Override @@ -60,7 +59,7 @@ public class WxBrandServiceImpl implements WxBrandService { Date date = new Date(); wxBrand.setCreatetime(date); wxBrand.setUpdatetime(date); - wxBrandMapper.insertSelective(wxBrand); + wxBrandMapper.insert(wxBrand); return new ResultData(Result.SUCCESS, "操作成功", id); } catch (Exception e) { logger.error("保存租赁合同信息失败,e:" + e.getMessage()); @@ -72,7 +71,7 @@ public class WxBrandServiceImpl implements WxBrandService { public ResultData update(WxBrand wxBrand) { if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ wxBrand.setUpdatetime(new Date()); - wxBrandMapper.updateByPrimaryKeySelective(wxBrand); + wxBrandMapper.updateById(wxBrand); return new ResultData(Result.SUCCESS, "操作成功"); } @@ -81,7 +80,7 @@ public class WxBrandServiceImpl implements WxBrandService { } try { wxBrand.setUpdatetime(new Date()); - wxBrandMapper.updateByPrimaryKeySelective(wxBrand); + wxBrandMapper.updateById(wxBrand); return new ResultData(Result.SUCCESS, "操作成功"); } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 88c78cdef..b7c1ab7ee 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; @@ -27,8 +28,8 @@ import java.util.Map; @Service public class WxBusinessServiceImpl implements WxBusinessService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired + + @Autowired WxBusinessMapper wxBusinessMapper; @Autowired private WxRentContractMapper wxRentContractMapper; @@ -60,9 +61,10 @@ public class WxBusinessServiceImpl implements WxBusinessService { @Override public WxBusiness getById(Integer id) { - return wxBusinessMapper.selectByPrimaryKey(id); + return wxBusinessMapper.selectById(id); } + @Override public List> businessDataList(WxBusiness wxBusiness, Long userid) { //1 得到天数+1 @@ -72,7 +74,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { BigDecimal businessSumMoney = new BigDecimal(0); WxRentContract query = new WxRentContract(); query.setBusinessId((Integer) e.get("id")); - List rentContractList = wxRentContractMapper.select(query); + List rentContractList = wxRentContractMapper.selectList(new QueryWrapper<>(query)); for (WxRentContract dbRent : rentContractList) { if (dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || @@ -93,7 +95,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { WxPropertyContract pquery = new WxPropertyContract(); pquery.setBusinessId((Integer) e.get("id")); - List propertyContractList = wxPropertyContractMapper.select(pquery); + List propertyContractList = wxPropertyContractMapper.selectList(new QueryWrapper<>(pquery)); for (WxPropertyContract dbRent : propertyContractList) { if (dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || @@ -182,6 +184,5 @@ public class WxBusinessServiceImpl implements WxBusinessService { PageHelper.clearPage(); return new ResultData(pageInfo); } -} - +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java index f871b18a6..c5a46ccc8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java @@ -26,7 +26,7 @@ public class WxCLogServiceImpl implements WxCLogService { @Override public WxCLog getById(Long id) { - return wxCLogMapper.selectByPrimaryKey(id); + return wxCLogMapper.selectById(id); } @Override @@ -35,15 +35,15 @@ public class WxCLogServiceImpl implements WxCLogService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCLogMapper.insertSelective(record); + wxCLogMapper.insert(record); } else { - wxCLogMapper.updateByPrimaryKeySelective(record); + wxCLogMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCLogMapper.deleteByPrimaryKey(id); + wxCLogMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index e8eb23446..67dcbc5cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -532,7 +533,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @Override public int countUser(WxCUserBasicInfo record) { - return wxCUserBasicInfoMapper.selectCount(record); + return wxCUserBasicInfoMapper.selectCount(new QueryWrapper(record)); } @Override @@ -540,7 +541,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); basicQ.setTenantId(tenantId); basicQ.setPhone(phone); - List basicInfos = wxCUserBasicInfoMapper.select(basicQ); + List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos != null && basicInfos.size() > 0) { WxCUserBasicInfo wxCUserBasicInfo = basicInfos.get(0); if (wxCUserBasicInfo.getPoins() != null) { @@ -566,7 +567,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); basicQ.setTenantId(tenantId); basicQ.setPhone(phone); - List basicInfos = wxCUserBasicInfoMapper.select(basicQ); + List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos.size() > 0) { return basicInfos.get(0); } @@ -580,17 +581,17 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @Override public WxCUserBasicInfo getById(Long id) { - return wxCUserBasicInfoMapper.selectByPrimaryKey(id); + return wxCUserBasicInfoMapper.selectById(id); } @Override public void save(WxCUserBasicInfo record) { - wxCUserBasicInfoMapper.insertSelective(record); + wxCUserBasicInfoMapper.insert(record); } @Override public void update(WxCUserBasicInfo record) { - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(record); + wxCUserBasicInfoMapper.updateById(record); } @Override @@ -627,7 +628,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @Override public void deleteById(Long id) { - wxCUserBasicInfoMapper.deleteByPrimaryKey(id); + wxCUserBasicInfoMapper.deleteById(id); } @Override @@ -831,7 +832,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); userBaseQ.setTenantId(tenantId); userBaseQ.setPhone(userBase.getPhone()); - List userBList = wxCUserBasicInfoMapper.select(userBaseQ); + List userBList = wxCUserBasicInfoMapper.selectList(new QueryWrapper(userBaseQ)); if (userBList.size() > 0) { oldUserBase = userBList.get(0); } @@ -871,14 +872,14 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUser cUserQ = new WxCUser(); cUserQ.setTenantId(tenantId); cUserQ.setPhone(userBase.getPhone()); - List userList = wxCUserMapper.select(cUserQ); + List userList = wxCUserMapper.selectList(new QueryWrapper(cUserQ)); if (userList.size() > 0) { WxCUser user = userList.get(0); if (user != null) { //覆盖积分 if(credit != null) { user.setCredit(credit); - wxCUserMapper.updateByPrimaryKey(user); + wxCUserMapper.updateById(user); } bHaveCUser = true; if (oldUserBase != null) { @@ -897,11 +898,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { if (oldUserBase != null) { logger.info("update user base: " + oldUserBase.getId()); - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(oldUserBase); + wxCUserBasicInfoMapper.updateById(oldUserBase); } else { logger.info("insert user base: " + userBase.getId()); try { - wxCUserBasicInfoMapper.insertSelective(userBase); + wxCUserBasicInfoMapper.insert(userBase); } catch (Exception e) { stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); logger.error(e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java index 6b0981901..1e2ea31d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java @@ -1,8 +1,9 @@ package com.iformall.service.impl; -import java.util.*; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.WxCUserCar; import com.iformall.mapper.WxCUserCarMapper; @@ -11,7 +12,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; + +import java.util.List; @Service public class WxCUserCarServiceImpl implements WxCUserCarService { @@ -62,7 +64,7 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Override public WxCUserCar getById(Long id) { - return wxCUserCarMapper.selectByPrimaryKey(id); + return wxCUserCarMapper.selectById(id); } @Override @@ -73,7 +75,7 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Override public void save(WxCUserCar record) { - wxCUserCarMapper.insertSelective(record); + wxCUserCarMapper.insert(record); } @Override @@ -81,20 +83,20 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCUserCarMapper.insertSelective(record); + wxCUserCarMapper.insert(record); } else { - wxCUserCarMapper.updateByPrimaryKeySelective(record); + wxCUserCarMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCUserCarMapper.deleteByPrimaryKey(id); + wxCUserCarMapper.deleteById(id); } @Override public void deleteByObj(WxCUserCar record) { - wxCUserCarMapper.delete(record); + wxCUserCarMapper.delete(new UpdateWrapper<>(record)); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java index 8047f8d0a..8593d796a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java @@ -33,7 +33,7 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { @Override public WxCUserFromB getById(Long id) { - return wxCUserFromBMapper.selectByPrimaryKey(id); + return wxCUserFromBMapper.selectById(id); } @Override @@ -44,21 +44,21 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { Date date = new Date(); record.setCreateTime(date); record.setUpdateTime(date); - wxCUserFromBMapper.insertSelective(record); + wxCUserFromBMapper.insert(record); } else { record.setUpdateTime(new Date()); - wxCUserFromBMapper.updateByPrimaryKeySelective(record); + wxCUserFromBMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCUserFromBMapper.deleteByPrimaryKey(id); + wxCUserFromBMapper.deleteById(id); } @Override public WxCUserFromB getByOpenidAndAppId(WxCUserFromBDto wxCUserFromBDto) { - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(wxCUserFromBDto.getUserId()); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(wxCUserFromBDto.getUserId()); if (wxMerchantBUser == null) { return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index c368a91fe..89b6456ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -24,7 +25,6 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; -import java.util.Map; @Service public class WxCUserServiceImpl implements WxCUserService { @@ -55,7 +55,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public WxCUser getById(Long id) { - return wxCUserMapper.selectByPrimaryKey(id); + return wxCUserMapper.selectById(id); } @Override @@ -66,7 +66,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public WxCUser getByObject(WxCUser record) { try { - return wxCUserMapper.selectOne(record); + return wxCUserMapper.selectOne(new QueryWrapper(record)); } catch (Exception e) { logger.error("NOT found: " + e.getMessage()); } @@ -85,7 +85,7 @@ public class WxCUserServiceImpl implements WxCUserService { // 已有,更新 user.setId(oldUser.getId()); // TODO 是否其他信息需要更新 - ret = wxCUserMapper.updateByPrimaryKeySelective(user); + ret = wxCUserMapper.updateById(user); return ret; } } @@ -94,10 +94,10 @@ public class WxCUserServiceImpl implements WxCUserService { user.setLoginCount(1); user.setCreateDate(curr); user.setUpdateDate(curr); - ret = wxCUserMapper.insertSelective(user); + ret = wxCUserMapper.insert(user); } else { user.setUpdateDate(curr); - ret = wxCUserMapper.updateByPrimaryKeySelective(user); + ret = wxCUserMapper.updateById(user); } return ret; @@ -170,7 +170,7 @@ public class WxCUserServiceImpl implements WxCUserService { userL.setId(record.getId()); userL.setScene(record.getScene()); userL.setUpdateDate(curr); - int ret = wxCUserMapper.updateByPrimaryKeySelective(userL); + int ret = wxCUserMapper.updateById(userL); return ret; } @@ -182,7 +182,7 @@ public class WxCUserServiceImpl implements WxCUserService { userL.setLongitude(record.getLongitude()); userL.setLatitude(record.getLatitude()); userL.setUpdateDate(curr); - int ret = wxCUserMapper.updateByPrimaryKeySelective(userL); + int ret = wxCUserMapper.updateById(userL); return ret; } @@ -193,13 +193,13 @@ public class WxCUserServiceImpl implements WxCUserService { userL.setId(record.getId()); userL.setExtraInfo(record.getExtraInfo()); userL.setUpdateDate(curr); - int ret = wxCUserMapper.updateByPrimaryKeySelective(userL); + int ret = wxCUserMapper.updateById(userL); return ret; } @Override public void deleteById(Long id) { - wxCUserMapper.deleteByPrimaryKey(id); + wxCUserMapper.deleteById(id); } @Override @@ -286,7 +286,7 @@ public class WxCUserServiceImpl implements WxCUserService { for(WxCUser tempUser: userList) { if(tempUser.getUnionId() == null) { // 删除 无unionId的用户 - wxCUserMapper.deleteByPrimaryKey(tempUser.getId()); + wxCUserMapper.deleteById(tempUser.getId()); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index e4676d717..37f63b432 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -62,7 +62,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { @Override public WxCUserTags getById(Long id) { - return wxCUserTagsMapper.selectByPrimaryKey(id); + return wxCUserTagsMapper.selectById(id); } @Override @@ -72,16 +72,16 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { record.setId(idWorker.nextId()); record.setCreateDate(new Date()); record.setUpdateDate(new Date()); - wxCUserTagsMapper.insertSelective(record); + wxCUserTagsMapper.insert(record); } else { record.setUpdateDate(new Date()); - wxCUserTagsMapper.updateByPrimaryKeySelective(record); + wxCUserTagsMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCUserTagsMapper.deleteByPrimaryKey(id); + wxCUserTagsMapper.deleteById(id); } @@ -150,7 +150,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { if (user.getTagId() == null || !user.getTagId().equals(record.getId())) { user.setTagId(record.getId()); - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(user); + wxCUserBasicInfoMapper.updateById(user); } WxTags wxTags = new WxTags(); wxTags.setIds(tagIdList); @@ -606,7 +606,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { switch (trigger) { case ASSIGN_TAGS_TRIGGER_IMPORT: { WxCUserBasicInfo param = (WxCUserBasicInfo) obj; - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(param.getId()); + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId()); if (user != null) { if (param.getSex() != null) { //性别 @@ -635,7 +635,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { break; case ASSIGN_TAGS_TRIGGER_CAR:{ Long param = (Long) obj; - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(param); + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param); if (user != null) { //车 resList = assignTypeId11(user); @@ -644,7 +644,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { break; case ASSIGN_TAGS_TRIGGER_PHONE: { WxCUser param = (WxCUser) obj; - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(param.getId()); + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId()); if (user != null) { if (param.getPhone() != null) { //来源 @@ -657,7 +657,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { break; case ASSIGN_TAGS_TRIGGER_BUY:{ WxCUser param = (WxCUser) obj; - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(param.getId()); + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId()); if (user != null) { //消费类别 resList = assignTypeId14(user, param); @@ -675,7 +675,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { case ASSIGN_TAGS_TRIGGER_LOGIN: { WxCUser param = (WxCUser) obj; - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(param.getId()); + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId()); if (user != null) { if (param.getGender() != null) { //性别 @@ -698,7 +698,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { break; case ASSIGN_TAGS_TRIGGER_SCAN: { WxCUserBasicInfo user = (WxCUserBasicInfo) obj; - WxCUser param = wxCUserMapper.selectByPrimaryKey(user.getId()); + WxCUser param = wxCUserMapper.selectById(user.getId()); if (user != null) { if (user.getSex() != null) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTokenServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTokenServiceImpl.java index da4f77544..8ae593fc8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTokenServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTokenServiceImpl.java @@ -63,10 +63,10 @@ public class WxCUserTokenServiceImpl implements WxCUserTokenService { user.setLoginCount(1); user.setCreateDate(curr); user.setUpdateDate(curr); - ret = wxCUserMapper.insertSelective(user); + ret = wxCUserMapper.insert(user); } else { user.setUpdateDate(curr); - ret = wxCUserMapper.updateByPrimaryKeySelective(user); + ret = wxCUserMapper.updateById(user); } String key = tokenPrev + user.getToken(); // 缓存已存在,删除 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 41bc8d10c..432ea2ae8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -67,7 +67,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { @Override public WxCampaign getById(Long id) { - WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(id); + WxCampaign wxCampaign = wxCampaignMapper.selectById(id); String html = wxCampaign.getHtml(); if (!StringUtils.isEmpty(html)) { try { @@ -108,9 +108,9 @@ public class WxCampaignServiceImpl implements WxCampaignService { if (wxCampaign.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxCampaign.setId(idWorker.nextId()); - wxCampaignMapper.insertSelective(wxCampaign); + wxCampaignMapper.insert(wxCampaign); } else { - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + wxCampaignMapper.updateById(wxCampaign); } //type 为固定格式才会有券的信息 才会有投放的问题 couponInject(wxCampaign); @@ -141,9 +141,9 @@ public class WxCampaignServiceImpl implements WxCampaignService { if (wxCampaign.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxCampaign.setId(idWorker.nextId()); - wxCampaignMapper.insertSelective(wxCampaign); + wxCampaignMapper.insert(wxCampaign); } else { - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + wxCampaignMapper.updateById(wxCampaign); } //type 为固定格式才会有券的信息 才会有投放的问题 couponInject(wxCampaign); @@ -153,14 +153,14 @@ public class WxCampaignServiceImpl implements WxCampaignService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData updateStatus(WxCampaign wxCampaign) { - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + wxCampaignMapper.updateById(wxCampaign); if (wxCampaign.getType().equals(EnumCampaignType.PAGEPATH.getCode())) { - WxCampaign campaign = wxCampaignMapper.selectByPrimaryKey(wxCampaign.getId()); + WxCampaign campaign = wxCampaignMapper.selectById(wxCampaign.getId()); WxActivity wxActivity = new WxActivity(); wxActivity.setId(campaign.getProduceId()); wxActivity.setStatus(wxCampaign.getStatus()); wxActivity.setUpdateTime(new Date()); - wxActivityMapper.updateByPrimaryKeySelective(wxActivity); + wxActivityMapper.updateById(wxActivity); } //type 为固定格式才会有券的信息 才会有投放的问题 couponInject(wxCampaign); @@ -168,7 +168,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { } public void couponInject(WxCampaign wxCampaign) { - wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaign.getId()); + wxCampaign = wxCampaignMapper.selectById(wxCampaign.getId()); if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) { if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { addOrUpdateBatch(JSONArray.parseArray(wxCampaign.getCouponIds(), String.class), wxCampaign); @@ -190,7 +190,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { for (WxCouponChannel ch : wxCouponChannels) { ch.setStatus(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); ch.setUpdateDate(new Date()); - wxCouponChannelMapper.updateByPrimaryKeySelective(ch); + wxCouponChannelMapper.updateById(ch); } } } @@ -219,7 +219,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { for (WxCouponChannel wxCouponChannel : wxCouponChannelsMap.values()) { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); wxCouponChannel.setUpdateDate(new Date()); - wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannel); + wxCouponChannelMapper.updateById(wxCouponChannel); } } } @@ -244,7 +244,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannel.setBeginTime(record.getValidStartDate()); wxCouponChannel.setEndTime(record.getValidEndDate()); wxCouponChannel.setUpdateDate(new Date()); - wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannel); + wxCouponChannelMapper.updateById(wxCouponChannel); wxCouponChannelsMap.remove(couponId); } else { // 不存在的, 新增 @@ -262,7 +262,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannel.setSubTargetId(record.getId()); final IdWorker idWorker = IdWorker.get(); wxCouponChannel.setId(idWorker.nextId()); - wxCouponChannelMapper.insertSelective(wxCouponChannel); + wxCouponChannelMapper.insert(wxCouponChannel); String pageUrl = "pages/index/index"; WxCouponChannel couponChannel = new WxCouponChannel(); @@ -274,14 +274,14 @@ public class WxCampaignServiceImpl implements WxCampaignService { if(map!=null && map.get("url") !=null) { String url = map.get("url"); couponChannel.setQrCode(url); - wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + wxCouponChannelMapper.updateById(couponChannel); } } } @Override public void deleteById(Long id) { - wxCampaignMapper.deleteByPrimaryKey(id); + wxCampaignMapper.deleteById(id); } @Override @@ -293,7 +293,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { public void printHtmlById(Long id, HttpServletResponse response) { try { response.setHeader("Content-type","text/html;charset=utf-8"); - WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(id); + WxCampaign wxCampaign = wxCampaignMapper.selectById(id); String html = StringUtils.isEmpty(wxCampaign.getHtml()) ? "" : wxCampaign.getHtml(); try { html = URLDecoder.decode(html, "utf-8"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index 4adbceb92..6043c6e9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -29,7 +29,7 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { @Override public WxCarCmdLog getById(Long id) { - return wxCarCmdLogMapper.selectByPrimaryKey(id); + return wxCarCmdLogMapper.selectById(id); } @Override @@ -38,15 +38,15 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCarCmdLogMapper.insertSelective(record); + wxCarCmdLogMapper.insert(record); } else { - wxCarCmdLogMapper.updateByPrimaryKeySelective(record); + wxCarCmdLogMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCarCmdLogMapper.deleteByPrimaryKey(id); + wxCarCmdLogMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java index 89b9f16f3..73d782bb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java @@ -28,9 +28,9 @@ public class WxCarPayRecordServiceImpl implements WxCarPayRecordService{ if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCarPayRecordMapper.insertSelective(record); + wxCarPayRecordMapper.insert(record); } else { - wxCarPayRecordMapper.updateByPrimaryKeySelective(record); + wxCarPayRecordMapper.updateById(record); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java index a488c5437..708f82ae7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java @@ -31,7 +31,7 @@ public class WxCardInfoServiceImpl implements WxCardInfoService { @Override public WxCardInfo getById(Long id) { - return wxCardInfoMapper.selectByPrimaryKey(id); + return wxCardInfoMapper.selectById(id); } @Override @@ -40,15 +40,15 @@ public class WxCardInfoServiceImpl implements WxCardInfoService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCardInfoMapper.insertSelective(record); + wxCardInfoMapper.insert(record); } else { - wxCardInfoMapper.updateByPrimaryKeySelective(record); + wxCardInfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCardInfoMapper.deleteByPrimaryKey(id); + wxCardInfoMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index ffaa007b6..c05d7ccf1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -81,7 +82,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { couponMerchantQ.setMerchantId(merchantId); couponMerchantQ.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); try { - couponMerchant = wxCouponMerchantMapper.selectOne(couponMerchantQ); + couponMerchant = wxCouponMerchantMapper.selectOne(new QueryWrapper(couponMerchantQ)); } catch (Exception e) { logger.error("couponmerchant not found: " + cardInfo.getCouponId()); } @@ -94,14 +95,14 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { Date curDate = new Date(); final IdWorker idWorker = IdWorker.get(); // 1. get card info - WxCardInfo cardInfo = wxCardInfoMapper.selectByPrimaryKey(record.getCardId()); + WxCardInfo cardInfo = wxCardInfoMapper.selectById(record.getCardId()); if (cardInfo == null) { logger.error("card not found: " + record.getCardId()); return new ResultData(ErrorCode.CARD_IS_NOT_FOUND); } // 2. coupon Integer subsidyRate = 0; - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(cardInfo.getCouponId()); + WxCoupon coupon = wxCouponMapper.selectById(cardInfo.getCouponId()); if (coupon == null) { logger.error("card's coupon not found: " + cardInfo.getCouponId()); return new ResultData(ErrorCode.CARD_IS_NOT_FOUND); @@ -116,7 +117,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxPayAccount payAccountQ = new WxPayAccount(); payAccountQ.setTenantId(record.getTenantId()); try { - payAccount = payAccountMapper.selectOne(payAccountQ); + payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { logger.error("获取payAccount error: " + record.getTenantId()); return new ResultData(ErrorCode.DB_FAIL.getCode(), "获取payAccount失败"); @@ -149,7 +150,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { record.setCreateDate(curDate); record.setUpdateDate(curDate); try { - wxCardSpendMapper.insertSelective(record); + wxCardSpendMapper.insert(record); } catch (Exception e) { logger.error("card spend insert error"); return new ResultData(ErrorCode.DB_FAIL.getCode(), "card spend 插入出错!"); @@ -164,7 +165,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { orderUpdate.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); orderUpdate.setUpdateDate(curDate); try { - wxOrderMapper.updateByPrimaryKeySelective(orderUpdate); + wxOrderMapper.updateById(orderUpdate); } catch (Exception e) { logger.error("order update error"); return new ResultData(ErrorCode.DB_FAIL.getCode(), "order update 出错!"); @@ -181,7 +182,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { updateCardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); } try { - wxCardInfoMapper.updateByPrimaryKeySelective(cardInfo); + wxCardInfoMapper.updateById(cardInfo); } catch (Exception e) { logger.error("card info update error"); return new ResultData(ErrorCode.DB_FAIL.getCode(), "card info 更新出错!"); @@ -228,7 +229,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); try { - wxMerchantSubsidyMapper.insertSelective(merchantSubsidy); + wxMerchantSubsidyMapper.insert(merchantSubsidy); } catch (Exception e) { logger.error("merchantSubsidy info insert error"); return new ResultData(ErrorCode.DB_FAIL.getCode(), "merchantSubsidy info 插入出错!"); @@ -291,7 +292,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.CARD_COMPLETE.getCode()); couponOrder.setUpdateDate(curDate); try { - wxCouponOrderMapper.updateByPrimaryKeySelective(couponOrder); + wxCouponOrderMapper.updateById(couponOrder); } catch (Exception e) { logger.error("couponOrder status update error"); return true; @@ -317,7 +318,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override public WxCardSpend getById(Long id) { - return wxCardSpendMapper.selectByPrimaryKey(id); + return wxCardSpendMapper.selectById(id); } @Override @@ -326,9 +327,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCardSpendMapper.insertSelective(record); + wxCardSpendMapper.insert(record); } else { - wxCardSpendMapper.updateByPrimaryKeySelective(record); + wxCardSpendMapper.updateById(record); } } @@ -350,7 +351,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // admin用户手动帮已用卡消费用户退卡, 此卡需要分账完结, 买卡的钱进商场账户 WxCardInfo cardInfo = null; try { - cardInfo = wxCardInfoMapper.selectByPrimaryKey(cardId); + cardInfo = wxCardInfoMapper.selectById(cardId); } catch (Exception e) { logger.error("微信分账: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), e.getMessage()); @@ -363,17 +364,17 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 卡已消费, 余额不为0 int remainShareFeeAmount = cardInfo.getRemainingShareFeeAmount(); try { - WxCouponOrder couponOrder = wxCouponOrderMapper.selectByPrimaryKey(cardInfo.getId()); + WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(cardInfo.getId()); // 更新 coupon order状态 couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.CARD_RETURNED.getCode()); couponOrder.setUpdateDate(new Date()); - wxCouponOrderMapper.updateByPrimaryKeySelective(couponOrder); + wxCouponOrderMapper.updateById(couponOrder); // 卡余额 WxCardInfo cardInfo1 = new WxCardInfo(); cardInfo1.setId(cardInfo.getId()); cardInfo1.setRemainingAmount(0); cardInfo1.setUpdateDate(new Date()); - wxCardInfoMapper.updateByPrimaryKeySelective(cardInfo1); + wxCardInfoMapper.updateById(cardInfo1); // 分账完结 WxSharingOrderDto shareOrder = new WxSharingOrderDto(); @@ -394,7 +395,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override public void deleteById(Long id) { - wxCardSpendMapper.deleteByPrimaryKey(id); + wxCardSpendMapper.deleteById(id); } @@ -407,7 +408,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxCardSpend cardSpendQ = new WxCardSpend(); cardSpendQ.setTenantId(tenantId); cardSpendQ.setCardId(cardId); - psNum = wxCardSpendMapper.selectCount(cardSpendQ); + psNum = wxCardSpendMapper.selectCount(new QueryWrapper(cardSpendQ)); if (psNum > 20) { logger.error("微信分账已超过限制次数-20次"); throw new MallinkException(ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT); @@ -426,14 +427,14 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { cardSpend.setId(cardSpendId); cardSpend.setCardId(cardId); cardSpend.setOrderId(orderId); - cardSpend = wxCardSpendMapper.selectOne(cardSpend); + cardSpend = wxCardSpendMapper.selectOne(new QueryWrapper(cardSpend)); if (cardSpend != null && cardSpend.getRealPayment() <= 0) { logger.error("微信分账金额为0, 无法再分"); return; } - WxCardInfo cardInfo = wxCardInfoMapper.selectByPrimaryKey(cardSpend.getCardId()); - WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); - WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(cardSpend.getMerchantId()); + WxCardInfo cardInfo = wxCardInfoMapper.selectById(cardSpend.getCardId()); + WxOrder wxOrder = wxOrderMapper.selectById(orderId); + WxMerchant merchant = wxMerchantMapper.selectById(cardSpend.getMerchantId()); if (cardSpend != null && cardInfo != null && merchant != null) { // 分账 @@ -461,7 +462,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { updateRecord.setId(cardSpend.getId()); updateRecord.setPayStatus(EnumCardSpendStatus.PS_SHARED.getCode()); updateRecord.setUpdateDate(new Date()); - wxCardSpendMapper.updateByPrimaryKeySelective(updateRecord); + wxCardSpendMapper.updateById(updateRecord); } @@ -509,7 +510,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { cardSpend.setCreateDate(curDate); cardSpend.setUpdateDate(curDate); try { - wxCardSpendMapper.insertSelective(cardSpend); + wxCardSpendMapper.insert(cardSpend); } catch (Exception e) { logger.error("card spend insert error"); return; @@ -520,7 +521,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { cardInfo1.setRemainingShareFeeAmount(0); cardInfo1.setUpdateDate(curDate); try { - wxCardInfoMapper.updateByPrimaryKeySelective(cardInfo1); + wxCardInfoMapper.updateById(cardInfo1); } catch (Exception e) { logger.error("card info remaining error"); return; @@ -552,14 +553,14 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { final IdWorker idWorker = IdWorker.get(); Date curDate = new Date(); // 1. get card info - WxCardInfo cardInfo = wxCardInfoMapper.selectByPrimaryKey(record.getCardId()); + WxCardInfo cardInfo = wxCardInfoMapper.selectById(record.getCardId()); if (cardInfo == null) { logger.error("card not found: " + record.getCardId()); throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); } // 2. coupon Integer subsidyRate = 0; - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(cardInfo.getCouponId()); + WxCoupon coupon = wxCouponMapper.selectById(cardInfo.getCouponId()); if (coupon == null) { logger.error("card's coupon not found: " + cardInfo.getCouponId()); throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); @@ -574,7 +575,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxPayAccount payAccountQ = new WxPayAccount(); payAccountQ.setTenantId(record.getTenantId()); try { - payAccount = payAccountMapper.selectOne(payAccountQ); + payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { logger.error("获取payAccount error: " + record.getTenantId()); throw new MallinkException(ErrorCode.SYS_MCH_NOT_FOUND); @@ -588,7 +589,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { cardSpendQ.setPosOrderId(record.getPosOrderId()); cardSpendQ.setPayStatus(EnumCardSpendStatus.PREV_PAY.getCode()); try { - oldCardSpend = wxCardSpendMapper.selectOne(cardSpendQ); + oldCardSpend = wxCardSpendMapper.selectOne(new QueryWrapper(cardSpendQ)); } catch (Exception e) { logger.error(e.getMessage()); } @@ -623,7 +624,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { record.setCreateDate(curDate); record.setUpdateDate(curDate); try { - wxCardSpendMapper.insertSelective(record); + wxCardSpendMapper.insert(record); } catch (Exception e) { logger.error("card spend insert error"); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "卡消费插入出错"); @@ -638,7 +639,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); } try { - wxCardInfoMapper.updateByPrimaryKeySelective(cardInfo); + wxCardInfoMapper.updateById(cardInfo); } catch (Exception e) { String errMessage = "消费卡信息更新出错: " + cardInfo.getId(); logger.error(errMessage); @@ -660,7 +661,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } // 2. coupon Integer subsidyRate = 0; - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(cardInfo.getCouponId()); + WxCoupon coupon = wxCouponMapper.selectById(cardInfo.getCouponId()); if (coupon == null) { logger.error("card's coupon not found: " + cardInfo.getCouponId()); throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); @@ -671,7 +672,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxPayAccount payAccountQ = new WxPayAccount(); payAccountQ.setTenantId(record.getTenantId()); try { - payAccount = payAccountMapper.selectOne(payAccountQ); + payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { logger.error("获取payAccount error: " + record.getTenantId()); throw new MallinkException(ErrorCode.SYS_MCH_NOT_FOUND); @@ -698,7 +699,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { updateCardInfo.setSupportTransfer(EnumCouponTransfer.YES.getCode()); } try { - wxCardInfoMapper.updateByPrimaryKeySelective(updateCardInfo); + wxCardInfoMapper.updateById(updateCardInfo); } catch (Exception e) { String errMessage = "卡信息更新出错"; logger.error(errMessage); @@ -730,14 +731,14 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { updateCardSpend.setPayStatus(EnumCardSpendStatus.NOT_PAY.getCode()); updateCardSpend.setUpdateDate(curDate); try { - wxCardSpendMapper.updateByPrimaryKeySelective(updateCardSpend); + wxCardSpendMapper.updateById(updateCardSpend); } catch (Exception e) { logger.error("card spend update error: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "card spend 插入出错!"); } // 2. update coupon card status - WxCardInfo cardInfo = wxCardInfoMapper.selectByPrimaryKey(record.getCardId()); + WxCardInfo cardInfo = wxCardInfoMapper.selectById(record.getCardId()); if (cardInfo == null) { logger.error("card not found: " + record.getCardId()); throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); @@ -748,7 +749,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } } - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(cardInfo.getCouponId()); + // 2. coupon + Integer subsidyRate = 0; + WxCoupon coupon = wxCouponMapper.selectById(cardInfo.getCouponId()); if (coupon == null) { logger.error("card's coupon not found: " + cardInfo.getCouponId()); throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); @@ -759,7 +762,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxPayAccount payAccountQ = new WxPayAccount(); payAccountQ.setTenantId(record.getTenantId()); try { - payAccount = payAccountMapper.selectOne(payAccountQ); + payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { logger.error("获取payAccount error: " + record.getTenantId()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "获取payAccount失败"); @@ -800,7 +803,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); try { - wxMerchantSubsidyMapper.insertSelective(merchantSubsidy); + wxMerchantSubsidyMapper.insert(merchantSubsidy); } catch (Exception e) { logger.error("merchantSubsidy info insert error"); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "merchantSubsidy info 插入出错!"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java index 483ed57be..c7af3feeb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java @@ -26,7 +26,7 @@ public class WxChannelServiceImpl implements WxChannelService { @Override public WxChannel getById(Long id) { - return wxChannelMapper.selectByPrimaryKey(id); + return wxChannelMapper.selectById(id); } @Override @@ -35,15 +35,15 @@ public class WxChannelServiceImpl implements WxChannelService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxChannelMapper.insertSelective(record); + wxChannelMapper.insert(record); } else { - wxChannelMapper.updateByPrimaryKeySelective(record); + wxChannelMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxChannelMapper.deleteByPrimaryKey(id); + wxChannelMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java index b6f29c17c..182ec0649 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java @@ -1,7 +1,9 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxComponentVerifyTicket; import com.iformall.mapper.WxComponentVerifyTicketMapper; import com.iformall.service.WxComponentVerifyTicketService; @@ -9,7 +11,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; @Service public class WxComponentVerifyTicketServiceImpl implements WxComponentVerifyTicketService { @@ -26,7 +27,7 @@ public class WxComponentVerifyTicketServiceImpl implements WxComponentVerifyTick @Override public WxComponentVerifyTicket getById(Long id) { - return wxComponentVerifyTicketMapper.selectByPrimaryKey(id); + return wxComponentVerifyTicketMapper.selectById(id); } @Override @@ -35,23 +36,23 @@ public class WxComponentVerifyTicketServiceImpl implements WxComponentVerifyTick try { WxComponentVerifyTicket ctQ = new WxComponentVerifyTicket(); ctQ.setComponentAppid(record.getComponentAppid()); - wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(ctQ); + wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(new QueryWrapper(ctQ)); } catch (Exception e) { logger.error(e.getMessage()); } if (wxComponentVerifyTicket == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxComponentVerifyTicketMapper.insertSelective(record); + wxComponentVerifyTicketMapper.insert(record); } else { record.setId(wxComponentVerifyTicket.getId()); - wxComponentVerifyTicketMapper.updateByPrimaryKeySelective(record); + wxComponentVerifyTicketMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxComponentVerifyTicketMapper.deleteByPrimaryKey(id); + wxComponentVerifyTicketMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java index d927af7c9..de2b51441 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java @@ -34,7 +34,7 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { @Override public WxCouponActionLog getById(Long id) { - return wxCouponActionLogMapper.selectByPrimaryKey(id); + return wxCouponActionLogMapper.selectById(id); } @Override @@ -43,15 +43,15 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCouponActionLogMapper.insertSelective(record); + wxCouponActionLogMapper.insert(record); } else { - wxCouponActionLogMapper.updateByPrimaryKeySelective(record); + wxCouponActionLogMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCouponActionLogMapper.deleteByPrimaryKey(id); + wxCouponActionLogMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java index 1c4807150..564e751cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java @@ -26,22 +26,22 @@ public class WxCouponCarServiceImpl implements WxCouponCarService { @Override public WxCouponCar getById(Long id) { - return wxCouponCarMapper.selectByPrimaryKey(id); + return wxCouponCarMapper.selectById(id); } @Override public void save(WxCouponCar record) { - wxCouponCarMapper.insertSelective(record); + wxCouponCarMapper.insert(record); } @Override public void update(WxCouponCar record) { - wxCouponCarMapper.updateByPrimaryKey(record); + wxCouponCarMapper.updateById(record); } @Override public void deleteById(Long id) { - wxCouponCarMapper.deleteByPrimaryKey(id); + wxCouponCarMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 6fd63f643..8e1b4b6b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -61,7 +61,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Override public WxCouponChannel getById(Long id) { - return wxCouponChannelMapper.selectByPrimaryKey(id); + return wxCouponChannelMapper.selectById(id); } @Override @@ -70,7 +70,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCouponChannelMapper.insertSelective(record); + wxCouponChannelMapper.insert(record); return new ResultData(record); } else { if (record.getCouponId() != null && record.getStatus() != null) { @@ -109,7 +109,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } } record.setUpdateDate(new Date()); - wxCouponChannelMapper.updateByPrimaryKeySelective(record); + wxCouponChannelMapper.updateById(record); } return new ResultData(); } @@ -270,7 +270,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { if(map!=null && map.get("url") !=null) { String url = map.get("url"); couponChannel.setQrCode(url); - wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + wxCouponChannelMapper.updateById(couponChannel); } return vo; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 3b983a92b..a95ac83d8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -68,7 +68,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { @Override public WxCouponInject getById(Long id) { - return couponInjectMapper.selectByPrimaryKey(id); + return couponInjectMapper.selectById(id); } @Override @@ -80,16 +80,16 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { record.setId(idWorker.nextId()); record.setCreateTime(curDate); record.setUpdateTime(curDate); - couponInjectMapper.insertSelective(record); + couponInjectMapper.insert(record); } else { record.setUpdateTime(curDate); - couponInjectMapper.updateByPrimaryKeySelective(record); + couponInjectMapper.updateById(record); } } @Override public void deleteById(Long id) { - couponInjectMapper.deleteByPrimaryKey(id); + couponInjectMapper.deleteById(id); } @Override @@ -164,7 +164,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { record.setCouponName(wxCoupon.getTitle()); record.setSendAmount(userList.size()); - couponInjectMapper.insertSelective(record); + couponInjectMapper.insert(record); if(record.getSendType().equals(EnumCouponInjectSendType.IMMEDIATE.getCode())) { List sentUsers = sendCoupon(wxCoupon, userList, record); if (sentUsers.size() > 0) { @@ -175,7 +175,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { record.setStatus(EnumCouponInjectStatus.SEND_FAILED.getCode()); } record.setSendAmount(sentUsers.size()); - couponInjectMapper.updateByPrimaryKeySelective(record); + couponInjectMapper.updateById(record); } return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 6e4a3380a..1830db9c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -124,7 +125,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public WxCouponOrder getById(Long id) { - return wxCouponOrderMapper.selectByPrimaryKey(id); + return wxCouponOrderMapper.selectById(id); } @Override @@ -133,28 +134,28 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCouponOrderMapper.insertSelective(record); + wxCouponOrderMapper.insert(record); } else { - wxCouponOrderMapper.updateByPrimaryKeySelective(record); + wxCouponOrderMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCouponOrderMapper.deleteByPrimaryKey(id); + wxCouponOrderMapper.deleteById(id); } @Override public ResultData listOnDateAsPage(Long bUserId, String date, Integer pageIndex, Integer pageSize, boolean isVerified) { - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId.longValue()); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(bUserId.longValue()); if (wxMerchantBUser == null) { logger.error("核销员不存在:" + bUserId); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchantBUser.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(wxMerchantBUser.getMerchantId()); if (wxMerchant == null) { logger.error("商户不存在:" + bUserId); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); @@ -238,13 +239,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData detailBUserVo(Long bUserId, String couponOrderId) { - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(bUserId); if (wxMerchantBUser == null) { logger.error("用户不存在:" + bUserId); throw new MallinkException(ErrorCode.USER_IS_EMPTY); } - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchantBUser.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(wxMerchantBUser.getMerchantId()); if (wxMerchant == null) { logger.error("商户不存在:" + bUserId); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); @@ -308,7 +309,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { public WxCouponOrder verify(WxCouponOrder couponOrder, WxMerchantBUser bUser) { // 1. 获取券信息 - WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(couponOrder.getCouponId()); + WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId()); if (wxCoupon == null) { logger.error("券: coupon-" + wxCoupon.getId() + "不存在" + "couponOrder-" + couponOrder.getId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); @@ -359,7 +360,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // 成长值 try { - WxOrder order = wxOrderMapper.selectByPrimaryKey(couponOrder.getOrderId()); + WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); wxScoreRulesService.addScore2(EnumScoreType.CONSUMPTION, order, wxCoupon.getBusiness()); } catch (Exception e) { logger.error("成长值:" + e.getMessage()); @@ -440,7 +441,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxPayOrder.setTenantId(couponOrder.getTenantId()); wxPayOrder.setOrderId(couponOrder.getOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); - wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); + wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); @@ -474,7 +475,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { couponMerchantQ.setMerchantId(merchantId); WxCouponMerchant couponMerchant; try { - couponMerchant = wxCouponMerchantMapper.selectOne(couponMerchantQ); + couponMerchant = wxCouponMerchantMapper.selectOne(new QueryWrapper(couponMerchantQ)); }catch (Exception e) { logger.error("查找所属卡券商户错误: " + "CouponId:" + couponMerchantQ.getProductId(), " merchantId:" + merchantId ); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); @@ -488,14 +489,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // coupon WxCoupon coupon; try { - coupon = wxCouponMapper.selectByPrimaryKey(couponOrder.getCouponId()); + coupon = wxCouponMapper.selectById(couponOrder.getCouponId()); }catch (Exception e) { logger.error("查找卡券错误: " + "CouponId:" + couponMerchantQ.getProductId()); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); } WxAppinfo wxAppinfo = wxAppinfoService.getCAppInfo(couponOrder.getTenantId()); - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(wxAppinfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(wxAppinfo.getPayId()); Integer subsidyNum = coupon.getSubsidyNum(); if (subsidyNum == null || subsidyNum.intValue() == 0) { @@ -532,7 +533,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantSubsidy.setCreateDate(new Date()); merchantSubsidy.setUpdateDate(new Date()); try { - wxMerchantSubsidyMapper.insertSelective(merchantSubsidy); + wxMerchantSubsidyMapper.insert(merchantSubsidy); } catch (Exception e) { logger.error("数据库插入错误:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -543,7 +544,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public boolean sendCouponAfterVerify(WxCouponOrder couponOrder, WxMerchantBUser bUser) { // 核销发券 - WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(couponOrder.getOrderId()); + WxOrder wxOrder = wxOrderMapper.selectById(couponOrder.getOrderId()); if (wxOrder != null) { try { return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.COUPON_VERIFY, wxOrder); @@ -557,7 +558,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public boolean sendCouponAfterMicroPay(String tenantId, Long orderId, Long cUserId) { // B端刷卡支付发券 - WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); + WxOrder wxOrder = wxOrderMapper.selectById(orderId); if (wxOrder != null) { try { return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, wxOrder); @@ -576,25 +577,25 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public void sendVerifyMsg(WxCouponOrder couponOrder, WxMerchantBUser bUser, boolean hadSentCoupon) { // 1. get order info - WxOrder order = wxOrderMapper.selectByPrimaryKey(couponOrder.getOrderId()); + WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); if (order == null) { logger.error("找不到订单信息"); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } // 2. get coupon info - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(couponOrder.getCouponId()); + WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId()); if (coupon == null) { logger.error("找不到券信息"); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); } // 3. merchant info - WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(bUser.getMerchantId()); + WxMerchant merchant = wxMerchantMapper.selectById(bUser.getMerchantId()); if (merchant == null) { logger.error("找不到商户信息"); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } // 4. get user info - WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); + WxCUser user = wxCUserMapper.selectById(order.getCUserId()); if (user == null) { logger.error("找不到C端用户"); throw new MallinkException(ErrorCode.USER_IS_EMPTY); @@ -651,7 +652,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { payOrderQ.setTenantId(couponOrder.getTenantId()); payOrderQ.setOrderId(order.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); - List payList = wxPayOrderMapper.select(payOrderQ); + List payList = wxPayOrderMapper.selectList(new QueryWrapper(payOrderQ)); if (payList.size() > 0) { payOrder = payList.get(0); } @@ -852,7 +853,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData cardDetailCUserVo(Long ownerId, String couponOrderId) { - WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(ownerId); + WxCUser wxCuser = wxCUserMapper.selectById(ownerId); if (wxCuser == null) { logger.error("用户不存在:" + ownerId); throw new MallinkException(ErrorCode.USER_IS_EMPTY); @@ -882,7 +883,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } //转赠人是否存在 Long cUserId = record.getCUserId(); - WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); + WxCUser wxCuser = wxCUserMapper.selectById(cUserId); if (wxCuser == null) { logger.info("转赠人不存在:" + cUserId); return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "转赠人不存在"); @@ -917,7 +918,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { try { record.setCUserId(null); record.setUpdateDate(new Date()); - wxCouponOrderMapper.updateByPrimaryKeySelective(record); + wxCouponOrderMapper.updateById(record); } catch (Exception e) { logger.info("更新卡拥有者信息失败"); throw new MallinkException(ErrorCode.CARD_TRANSFER_INVALID); @@ -935,7 +936,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } //转赠人是否存在 Long cUserId = record.getCUserId(); - WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); + WxCUser wxCuser = wxCUserMapper.selectById(cUserId); if (wxCuser == null) { logger.info("转赠人不存在:" + cUserId); return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "转赠人不存在"); @@ -978,7 +979,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { Date date = new Date(); wxCardTransferInfo.setCreateDate(date); wxCardTransferInfo.setUpdateDate(date); - wxCardTransferInfoMapper.insertSelective(wxCardTransferInfo); + wxCardTransferInfoMapper.insert(wxCardTransferInfo); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java index 0df169311..abfad82a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java @@ -29,7 +29,7 @@ public class WxCouponSendConfigServiceImpl implements WxCouponSendConfigService @Override public WxCouponSendConfig getById(Long id) { - return wxCouponSendConfigMapper.selectByPrimaryKey(id); + return wxCouponSendConfigMapper.selectById(id); } @Override @@ -39,21 +39,21 @@ public class WxCouponSendConfigServiceImpl implements WxCouponSendConfigService final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateTime(new Date()); - wxCouponSendConfigMapper.insertSelective(record); + wxCouponSendConfigMapper.insert(record); } else { record.setUpdateTime(new Date()); - wxCouponSendConfigMapper.updateByPrimaryKeySelective(record); + wxCouponSendConfigMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCouponSendConfigMapper.deleteByPrimaryKey(id); + wxCouponSendConfigMapper.deleteById(id); } @Override public void update(WxCouponSendConfig record) { - wxCouponSendConfigMapper.updateByPrimaryKeySelective(record); + wxCouponSendConfigMapper.updateById(record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 765ac0730..9b20b955f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -1,12 +1,12 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; -import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.MpAppMsg; @@ -108,7 +108,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { @Override public WxCouponSend getById(Long id) { - return wxCouponSendMapper.selectByPrimaryKey(id); + return wxCouponSendMapper.selectById(id); } @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @@ -128,9 +128,9 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCouponSendMapper.insertSelective(record); + wxCouponSendMapper.insert(record); } else { - wxCouponSendMapper.updateByPrimaryKeySelective(record); + wxCouponSendMapper.updateById(record); } } @@ -168,7 +168,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { //couponMerchantQ.setProductId(record.getCouponId()); //couponMerchantQ.setMerchantId(Long.parseLong(merchantIdStr)); //couponMerchantQ.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); - //WxCouponMerchant couponMerchant = wxCouponMerchantMapper.selectOne(couponMerchantQ); + //WxCouponMerchant couponMerchant = wxCouponMerchantMapper.selectOne(new QueryWrapper(couponMerchantQ); //if (Objects.isNull(couponMerchant)) { // throw new MallinkException(ErrorCode.COUPON_MERCHANT_NOT_FOUND); //} @@ -211,12 +211,12 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { wxCouponService.backRemainInventory(queryById.getId(), wxCouponOfDb.getRemainInventory(), merchantRemain); } } - wxCouponSendMapper.updateByPrimaryKeySelective(record); + wxCouponSendMapper.updateById(record); } @Override public void deleteById(Long id) { - wxCouponSendMapper.deleteByPrimaryKey(id); + wxCouponSendMapper.deleteById(id); } private boolean isConditionAllowed(WxCouponSend wxCouponSend, Object param) { @@ -253,7 +253,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { try { JSONObject jo = JSONObject.parseObject(wxCouponSend.getConditions()); - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(wxOrder.getProductId()); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(wxOrder.getProductId()); if (wxMerchantBUser.getMerchantId() != null && wxMerchantBUser.getMerchantId().equals(jo.getLong("id"))) { @@ -367,7 +367,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { wxCouponActionLogService.addOne(tenantId, send.getCouponId(), couponOrder.getId(), type.getCode(), send.getId()); // 查找cUser - WxCUser user = wxCUserMapper.selectByPrimaryKey(cUserId); + WxCUser user = wxCUserMapper.selectById(cUserId); if (user == null) { continue; } @@ -558,14 +558,14 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { JSONObject couponSendJo = new JSONObject(); couponSendJo.put(WxCouponSend.KEY_BEFOREDAYS, beforeDays); couponSendQuery.setConditions(couponSendJo.toJSONString()); - wxCouponSendMapper.insertSelective(couponSendQuery); + wxCouponSendMapper.insert(couponSendQuery); } @Override public WxCouponSend getConfig(Integer sendType, String tenantId) { WxCouponSend couponSendQuery = createCouponSendQuery(sendType, tenantId) ; //读取会员生日券配置信息 - List wxCouponSendList = wxCouponSendMapper.select(couponSendQuery); + List wxCouponSendList = wxCouponSendMapper.selectList(new QueryWrapper(couponSendQuery)); if (CollectionUtils.isEmpty(wxCouponSendList)) { //配置不存在,添加默认配置 insertCouponSend(0, couponSendQuery); @@ -603,7 +603,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void handSel(WxCouponSend wxCouponSend, Object cUserId) { - WxCUser cu = wxCUserMapper.selectByPrimaryKey(cUserId); + WxCUser cu = wxCUserMapper.selectById((Long)cUserId); if (Objects.isNull(cu)) { throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); } @@ -612,7 +612,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); } - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cu.getId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cu.getId()); if (Objects.isNull(wxCUserBasicInfo)) { throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index a26b7c95e..9d871034d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -14,7 +15,6 @@ import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; -import com.iformall.exception.BizMessageException; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; @@ -154,7 +154,7 @@ import java.util.stream.Collectors; @Override public WxCoupon getById(Long id) { - return wxCouponMapper.selectByPrimaryKey(id); + return wxCouponMapper.selectById(id); } @Override @@ -310,7 +310,7 @@ import java.util.stream.Collectors; cm.setUpdateDate(new Date()); cm.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); wxCouponMerchantDtoList.add(wxCouponMerchantDto); - wxCouponMerchantMapper.insertSelective(cm); + wxCouponMerchantMapper.insert(cm); }); if (wxCouponMerchantDtoList.stream() .mapToInt(WxCouponMerchantDto::getBusiness).distinct().count() > 1) { @@ -328,12 +328,12 @@ import java.util.stream.Collectors; record.setCreateDate(new Date()); record.setUpdateDate(new Date()); - wxCouponMapper.insertSelective(record); + wxCouponMapper.insert(record); } else { if(record.getInventory() != null && record.getRemainInventory() != null) { // 库存修改检查 - WxCoupon oldCoupon = wxCouponMapper.selectByPrimaryKey(record.getId()); + WxCoupon oldCoupon = wxCouponMapper.selectById(record.getId()); if (Objects.equals(oldCoupon.getRemainInventory(), record.getRemainInventory())) { // 库存未变, 不更新库存 record.setRemainInventory(null); @@ -356,19 +356,19 @@ import java.util.stream.Collectors; WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); cm.setMerchantId(wxCouponMerchantDto.getMerchantId()); cm.setProductId(record.getId()); - WxCouponMerchant rcm = wxCouponMerchantMapper.selectOne(cm); + WxCouponMerchant rcm = wxCouponMerchantMapper.selectOne(new QueryWrapper<>(cm)); if (rcm != null) { rcm.setParameter(wxCouponMerchantDto.getParameter()); rcm.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); rcm.setUpdateDate(new Date()); - wxCouponMerchantMapper.updateByPrimaryKeySelective(rcm); + wxCouponMerchantMapper.updateById(rcm); }else { cm.setId(idWorker.nextId()); cm.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); cm.setParameter(wxCouponMerchantDto.getParameter()); cm.setCreateDate(new Date()); cm.setUpdateDate(new Date()); - wxCouponMerchantMapper.insertSelective(cm); + wxCouponMerchantMapper.insert(cm); } wxCouponMerchantDtoList.add(wxCouponMerchantDto); oldList.removeIf( @@ -379,7 +379,7 @@ import java.util.stream.Collectors; oldList.stream().forEach(old->{ old.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_INVALID.getCode()); old.setUpdateDate(new Date()); - wxCouponMerchantMapper.updateByPrimaryKeySelective(old); + wxCouponMerchantMapper.updateById(old); }); if (wxCouponMerchantDtoList.stream() @@ -413,7 +413,7 @@ import java.util.stream.Collectors; } record.setUpdateDate(new Date()); - wxCouponMapper.updateByPrimaryKeySelective(record); + wxCouponMapper.updateById(record); } return new ResultData(record.getId()); @@ -421,7 +421,7 @@ import java.util.stream.Collectors; @Override public void deleteById(Long id) { - wxCouponMapper.deleteByPrimaryKey(id); + wxCouponMapper.deleteById(id); } @Override @@ -551,7 +551,7 @@ import java.util.stream.Collectors; // 3. check 新的有效期是否合适 // 4. 更新库存及有效期 boolean bChanged = false; - WxCoupon oldCoupon = wxCouponMapper.selectByPrimaryKey(wxCoupon.getId()); + WxCoupon oldCoupon = wxCouponMapper.selectById(wxCoupon.getId()); if(oldCoupon == null) { logger.error(ErrorCode.COUPON_IS_EMPTY.getMessage()); return new ResultData(ErrorCode.COUPON_IS_EMPTY); @@ -639,7 +639,7 @@ import java.util.stream.Collectors; @Override public void update(WxCoupon record) { - wxCouponMapper.updateByPrimaryKeySelective(record); + wxCouponMapper.updateById(record); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java index 289146c80..ca83f54ea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java @@ -26,7 +26,7 @@ public class WxCouponTypeServiceImpl implements WxCouponTypeService { @Override public WxCouponType getById(Long id) { - return wxCouponTypeMapper.selectByPrimaryKey(id); + return wxCouponTypeMapper.selectById(id); } @Override @@ -35,15 +35,15 @@ public class WxCouponTypeServiceImpl implements WxCouponTypeService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxCouponTypeMapper.insertSelective(record); + wxCouponTypeMapper.insert(record); } else { - wxCouponTypeMapper.updateByPrimaryKeySelective(record); + wxCouponTypeMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxCouponTypeMapper.deleteByPrimaryKey(id); + wxCouponTypeMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 6f13ce0ce..02ff3a1f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -192,21 +192,21 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override public WxCreditHistory getById(Long id) { - return wxCreditHistoryMapper.selectByPrimaryKey(id); + return wxCreditHistoryMapper.selectById(id); } @Override public void creditUsercheck(Long cUserId) { - WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(cUserId); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cUserId); + WxCUser wxCUser = wxCUserMapper.selectById(cUserId); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId); UserUtil.creditUserCheck(wxCUser, wxCUserBasicInfo); } @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxCreditHistory saveOrUpdate(WxCreditHistory record) { - WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(record.getCUserId()); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); + WxCUser wxCUser = wxCUserMapper.selectById(record.getCUserId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId()); if (wxCUser == null && wxCUserBasicInfo == null) { //验证此用户是否存在 throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); @@ -260,13 +260,13 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateDate(new Date()); - wxCreditHistoryMapper.insertSelective(record); + wxCreditHistoryMapper.insert(record); //将计算出来新的总积分 更新到两张用户表里 if (wxCUser != null) { WxCUser wxCUserNew = new WxCUser(); wxCUserNew.setId(wxCUser.getId()); wxCUserNew.setCredit(record.getCreditAmount()); - wxCUserMapper.updateByPrimaryKeySelective(wxCUserNew); + wxCUserMapper.updateById(wxCUserNew); } if (wxCUserBasicInfo != null) { WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo(); @@ -276,11 +276,11 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (hasBirthDateCredit) { wxCUserBasicInfoNew.setScoreDate(new Date()); } - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfoNew); + wxCUserBasicInfoMapper.updateById(wxCUserBasicInfoNew); } } else { - //wxCreditHistoryMapper.updateByPrimaryKeySelective(record); + //wxCreditHistoryMapper.updateById(record); } } return record; @@ -297,7 +297,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { wxCreditHistory = creditHistories.get(0); } if (wxCreditHistory != null) { - num = wxCreditHistoryMapper.deleteByPrimaryKey(wxCreditHistory.getId()); + num = wxCreditHistoryMapper.deleteById(wxCreditHistory.getId()); if (num != 1) { String errMessage = "删除积分历史出错"; logger.error(errMessage + wxCreditHistory.toString()); @@ -308,33 +308,33 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return 0; } // 2. user - WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(record.getCUserId()); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); + WxCUser wxCUser = wxCUserMapper.selectById(record.getCUserId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId()); if (wxCUser != null) { WxCUser wxCUserNew = new WxCUser(); wxCUserNew.setId(wxCUser.getId()); wxCUserNew.setCredit(wxCUser.getCredit() - wxCreditHistory.getCreditNum()); wxCUserNew.setUpdateDate(new Date()); - wxCUserMapper.updateByPrimaryKeySelective(wxCUserNew); + wxCUserMapper.updateById(wxCUserNew); } if (wxCUserBasicInfo != null) { WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo(); wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId()); wxCUserBasicInfoNew.setCredit(wxCUserBasicInfo.getCredit() - wxCreditHistory.getCreditNum()); wxCUserBasicInfoNew.setUpdateDate(new Date()); - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfoNew); + wxCUserBasicInfoMapper.updateById(wxCUserBasicInfoNew); } return num; } @Override public void deleteById(Long id) { - wxCreditHistoryMapper.deleteByPrimaryKey(id); + wxCreditHistoryMapper.deleteById(id); } @Override public Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId,String tenantId) { - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(merchantId); + WxMerchant wxMerchant = wxMerchantMapper.selectById(merchantId); Map creditMap = Maps.newHashMap(); if (wxMerchant != null && wxMerchant.getBusinessId() != null) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); @@ -346,8 +346,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { wxCreditHistory.setSpend(new BigDecimal(spendStr).multiply(new BigDecimal(100)).intValue()); credit = payAddCredit(wxCreditHistory); if (Objects.nonNull(userId)) { - WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(userId); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(userId); + WxCUser wxCUser = wxCUserMapper.selectById(userId); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(userId); creditNew = CreditUtil.calUserCredit(credit, wxCUser, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper); } else { creditNew = credit; @@ -445,7 +445,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } private int infoAddCredit(WxCreditHistory record) { - WxCUser user = wxCUserMapper.selectByPrimaryKey(record.getCUserId()); + WxCUser user = wxCUserMapper.selectById(record.getCUserId()); if (user == null || checkCompleteInfoScoreCount(user) > 0) return 0; // 1. 获取score rules diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDataRuleTargetServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDataRuleTargetServiceImpl.java index d9a2b3404..76e359d9a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDataRuleTargetServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDataRuleTargetServiceImpl.java @@ -34,7 +34,7 @@ public class WxDataRuleTargetServiceImpl implements WxDataRuleTargetService { @Override public List getList() { - List wxDataRuleTargets = wxDataRuleTargetMapper.selectAll(); + List wxDataRuleTargets = wxDataRuleTargetMapper.selectList(null); List targets = wxDataRuleTargets.stream() .filter(t -> t.getParent().equals(0L)).collect(Collectors.toList()); for (WxDataRuleTarget parentTarget : targets) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java index 968f53b23..30a31682b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java @@ -27,7 +27,7 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService @Override public WxDateAmountRecord getById(Long id) { - return wxDateAmountRecordMapper.selectByPrimaryKey(id); + return wxDateAmountRecordMapper.selectById(id); } @Override @@ -36,15 +36,15 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxDateAmountRecordMapper.insertSelective(record); + wxDateAmountRecordMapper.insert(record); } else { - wxDateAmountRecordMapper.updateByPrimaryKeySelective(record); + wxDateAmountRecordMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxDateAmountRecordMapper.deleteByPrimaryKey(id); + wxDateAmountRecordMapper.deleteById(id); } @@ -62,13 +62,13 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService if (list.size() > 0){ list.get(0).setPayPrice(amount.getPayPrice()); list.get(0).setUpdateDate(new Date()); - wxDateAmountRecordMapper.updateByPrimaryKeySelective(list.get(0)); + wxDateAmountRecordMapper.updateById(list.get(0)); }else{ final IdWorker idWorker = IdWorker.get(); amount.setId(idWorker.nextId()); amount.setUpdateDate(new Date()); amount.setCreateDate(new Date()); - wxDateAmountRecordMapper.insertSelective(amount); + wxDateAmountRecordMapper.insert(amount); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index e345ec635..be3370a2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -43,7 +43,7 @@ public class WxDeviceServiceImpl implements WxDeviceService { @Override public WxDevice getById(Long id) { - return wxDeviceMapper.selectByPrimaryKey(id); + return wxDeviceMapper.selectById(id); } @@ -86,7 +86,7 @@ public class WxDeviceServiceImpl implements WxDeviceService { record.setCreateDate(new Date()); record.setUpdateDate(new Date()); record.setConfig(getDefaultConfig(record.getType())); - wxDeviceMapper.insertSelective(record); + wxDeviceMapper.insert(record); } else { record.setUpdateDate(new Date()); if (record.getConfig() != null && record.getType() != null){ @@ -94,7 +94,7 @@ public class WxDeviceServiceImpl implements WxDeviceService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } } - wxDeviceMapper.updateByPrimaryKeySelective(record); + wxDeviceMapper.updateById(record); } return new ResultData(); } @@ -102,7 +102,7 @@ public class WxDeviceServiceImpl implements WxDeviceService { @Override public void deleteById(Long id) { - wxDeviceMapper.deleteByPrimaryKey(id); + wxDeviceMapper.deleteById(id); } @Override public List findList(WxDevice wxDevice) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java index efafad6b6..081d7c974 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java @@ -27,9 +27,9 @@ public class WxFlowRecordServiceImpl implements WxFlowRecordService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxFlowRecordMapper.insertSelective(record); + wxFlowRecordMapper.insert(record); } else { - wxFlowRecordMapper.updateByPrimaryKeySelective(record); + wxFlowRecordMapper.updateById(record); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 6b1e9be95..04c4a85f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -145,7 +145,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxRentContractService.updateApplyStatus(rent); //如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约) - WxRentContract record = wxRentContractMapper.selectByPrimaryKey(businessId); + WxRentContract record = wxRentContractMapper.selectById(businessId); if(record.getMerchantId()!=null && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { wxRentContractService.updateRentContractStatus(businessId); } @@ -293,11 +293,11 @@ public class WxFlowServiceImpl implements WxFlowService { if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { //作废 wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); - wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); + wxCouponMapper.updateById(wxCoupon); } } wxCoupon.setApprovalType(operateType); - wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); + wxCouponMapper.updateById(wxCoupon); }else if(EnumFlowKey.SETTLE.getCode().equals(flowType)){ WxBillSettle wxBillSettle = new WxBillSettle(); wxBillSettle.setId(businessId); @@ -319,8 +319,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),null); wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),null); } - - wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); + wxBillSettleMapper.updateById(wxBillSettle); } } @@ -555,7 +554,7 @@ public class WxFlowServiceImpl implements WxFlowService { public boolean isBill(Integer flowType){ if(EnumFlowKey.BILL.getCode().equals(flowType) ||EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)){ - return true; + return true; } return false; } @@ -968,7 +967,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ wxMsgRecord.setModelType(EnumMsgModel.FLOW_C_APPLY_NODIFY.getCode()); - WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + WxCoupon wxCoupon = this.wxCouponMapper.selectById(businessId); msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); msgReplaceMap.put("name",wxCoupon.getTitle()); }else if(isSettle(flowType)){ @@ -995,7 +994,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ mailMsg.setModelType(EnumMailMsgModel.MAIL_C_APPLY_NODIFY.getCode()); - WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + WxCoupon wxCoupon = this.wxCouponMapper.selectById(businessId); msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); msgReplaceMap.put("name",wxCoupon.getTitle()); }else if(isSettle(flowType)){ @@ -1032,7 +1031,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ wxMsgRecord.setModelType(EnumMsgModel.FLOW_C_PASS_NODIFY.getCode()); - WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + WxCoupon wxCoupon = this.wxCouponMapper.selectById(businessId); msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); msgReplaceMap.put("name",wxCoupon.getTitle()); }else if(isSettle(flowType)){ @@ -1059,7 +1058,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ mailMsg.setModelType(EnumMailMsgModel.MAIL_C_PASS_NODIFY.getCode()); - WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + WxCoupon wxCoupon = this.wxCouponMapper.selectById(businessId); msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); msgReplaceMap.put("name",wxCoupon.getTitle()); }else if(isSettle(flowType)){ @@ -1185,7 +1184,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract", businessId.toString()); } else if (isCoupon(flowType)) { wxMsgRecord.setModelType(EnumMsgModel.FLOW_C_REJECT_NODIFY.getCode()); - WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + WxCoupon wxCoupon = this.wxCouponMapper.selectById(businessId); msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); msgReplaceMap.put("name",wxCoupon.getTitle()); }else if (isSettle(flowType)) { @@ -1220,7 +1219,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ mailMsg.setModelType(EnumMailMsgModel.MAIL_C_REJECT_NODIFY.getCode()); - WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + WxCoupon wxCoupon = this.wxCouponMapper.selectById(businessId); msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); msgReplaceMap.put("name",wxCoupon.getTitle()); }else if(isSettle(flowType)){ @@ -1431,10 +1430,10 @@ public class WxFlowServiceImpl implements WxFlowService { if(wxFlowModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxFlowModel.setId(idWorker.nextId()); - wxFlowModelMapper.insertSelective(wxFlowModel); + wxFlowModelMapper.insert(wxFlowModel); }else{ wxFlowModel.setUpdateDate(new Date()); - wxFlowModelMapper.updateByPrimaryKeySelective(wxFlowModel); + wxFlowModelMapper.updateById(wxFlowModel); } return new ResultData(); } @@ -1490,7 +1489,7 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData findModelById(WxFlowModel wxFlowModel) { - return new ResultData(wxFlowModelMapper.selectByPrimaryKey(wxFlowModel.getId())); + return new ResultData(wxFlowModelMapper.selectById(wxFlowModel.getId())); } @Override @@ -1502,7 +1501,7 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(Result.ERROR, "该流程模板在使用中,须先停用正在\n" + "使用该模板的审批类型。"); } - wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); + wxFlowModelMapper.deleteById(wxFlowModel.getId()); return new ResultData(); } @@ -1514,7 +1513,7 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData updateConfig(WxFlowConfig wxFlowConfig) { wxFlowConfig.setUpdateDate(new Date()); - wxFlowConfigMapper.updateByPrimaryKeySelective(wxFlowConfig); + wxFlowConfigMapper.updateById(wxFlowConfig); return new ResultData(); } @@ -1528,4 +1527,3 @@ public class WxFlowServiceImpl implements WxFlowService { } } - diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index be7e1426c..c2f3d6724 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -3,7 +3,11 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponChannelVo; @@ -15,19 +19,17 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.mapper.WxGameActionLogMapper; +import com.iformall.mapper.WxGameMapper; import com.iformall.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.iformall.mapper.WxGameMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.*; + @Service public class WxGameServiceImpl implements WxGameService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -86,7 +88,7 @@ public class WxGameServiceImpl implements WxGameService { @Override public WxGame getOneGame(WxGame wxGame) { try { - WxGame record = wxGameMapper.selectOne(wxGame); + WxGame record = wxGameMapper.selectOne(new QueryWrapper(wxGame)); if (record != null) { record.setGameTemplate(wxGameTemplateService.getById(record.getGameId())); record.setCouponIdsList(getParams(record)); @@ -108,7 +110,7 @@ public class WxGameServiceImpl implements WxGameService { if (orderId != 0) { try { - wxCouponOrder = wxCouponOrderMapper.selectOne(wxCouponOrder); + wxCouponOrder = wxCouponOrderMapper.selectOne(new QueryWrapper(wxCouponOrder)); } catch (Exception e) { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } @@ -124,14 +126,14 @@ public class WxGameServiceImpl implements WxGameService { wxGameActionLog.setCouponOrderId(wxCouponOrder.getOrderId()); wxGameActionLog.setId(idWorker.nextId()); wxGameActionLog.setCreateTime(new Date()); - wxGameActionLogMapper.insertSelective(wxGameActionLog); + wxGameActionLogMapper.insert(wxGameActionLog); return new ResultData(); } @Override public ResultData getCount(Long gameId, Long userId) { - WxGame wxGame = wxGameMapper.selectByPrimaryKey(gameId); + WxGame wxGame = wxGameMapper.selectById(gameId); if (wxGame == null) return new ResultData(ErrorCode.GAME_NOT_FOUND); @@ -190,7 +192,7 @@ public class WxGameServiceImpl implements WxGameService { @Override public WxGame getById(Long id) { - WxGame game = wxGameMapper.selectByPrimaryKey(id); + WxGame game = wxGameMapper.selectById(id); if (game != null) { game.setGameTemplate(wxGameTemplateService.getById(game.getGameId())); game.setCouponIdsList(getParams(game)); @@ -205,12 +207,12 @@ public class WxGameServiceImpl implements WxGameService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxGameMapper.insertSelective(record); + wxGameMapper.insert(record); } else { - wxGameMapper.updateByPrimaryKeySelective(record); + wxGameMapper.updateById(record); } - record = wxGameMapper.selectByPrimaryKey(record); + record = wxGameMapper.selectById(record); if (record.getStatus().equals(EnumGameStatus.STATUS_THROW_IN.getCode())) { addOrUpdateCouponChannelBatch(JSONArray.parseArray(record.getCouponIds()), record); } else { @@ -230,7 +232,7 @@ public class WxGameServiceImpl implements WxGameService { for (WxCouponChannel ch : wxCouponChannels) { ch.setStatus(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); ch.setUpdateDate(new Date()); - wxCouponChannelMapper.updateByPrimaryKeySelective(ch); + wxCouponChannelMapper.updateById(ch); } } } @@ -265,7 +267,7 @@ public class WxGameServiceImpl implements WxGameService { for (WxCouponChannel wxCouponChannel : wxCouponChannelsMap.values()) { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); wxCouponChannel.setUpdateDate(new Date()); - wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannel); + wxCouponChannelMapper.updateById(wxCouponChannel); } } } @@ -290,7 +292,7 @@ public class WxGameServiceImpl implements WxGameService { wxCouponChannel.setBeginTime(record.getValidStartDate()); wxCouponChannel.setEndTime(record.getValidEndDate()); wxCouponChannel.setUpdateDate(new Date()); - wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannel); + wxCouponChannelMapper.updateById(wxCouponChannel); wxCouponChannelsMap.remove(couponId); } else { // 不存在的新增 @@ -308,7 +310,7 @@ public class WxGameServiceImpl implements WxGameService { wxCouponChannel.setSubTargetId(record.getId()); final IdWorker idWorker = IdWorker.get(); wxCouponChannel.setId(idWorker.nextId()); - wxCouponChannelMapper.insertSelective(wxCouponChannel); + wxCouponChannelMapper.insert(wxCouponChannel); String pageUrl = "pages/index/index"; WxCouponChannel couponChannel = new WxCouponChannel(); @@ -320,13 +322,13 @@ public class WxGameServiceImpl implements WxGameService { if(map!=null && map.get("url") !=null) { String url = map.get("url"); couponChannel.setQrCode(url); - wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + wxCouponChannelMapper.updateById(couponChannel); } } } @Override public void deleteById(Long id) { - wxGameMapper.deleteByPrimaryKey(id); + wxGameMapper.deleteById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameTemplateServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameTemplateServiceImpl.java index e9037b47b..5e1eae685 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameTemplateServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameTemplateServiceImpl.java @@ -33,7 +33,7 @@ public class WxGameTemplateServiceImpl implements WxGameTemplateService { @Override public WxGameTemplate getById(Long id) { - return wxGameTemplateMapper.selectByPrimaryKey(id); + return wxGameTemplateMapper.selectById(id); } @Override @@ -42,15 +42,15 @@ public class WxGameTemplateServiceImpl implements WxGameTemplateService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxGameTemplateMapper.insertSelective(record); + wxGameTemplateMapper.insert(record); } else { - wxGameTemplateMapper.updateByPrimaryKeySelective(record); + wxGameTemplateMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxGameTemplateMapper.deleteByPrimaryKey(id); + wxGameTemplateMapper.deleteById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java index bea48efa8..3e0c50bd4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java @@ -26,22 +26,22 @@ public class WxGroupServiceImpl implements WxGroupService { @Override public WxGroup getById(String id) { - return wxGroupMapper.selectByPrimaryKey(id); + return wxGroupMapper.selectById(id); } @Override public void saveOrUpdate(WxGroup record) { if (record.getId() == null) { record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - wxGroupMapper.insertSelective(record); + wxGroupMapper.insert(record); } else { - wxGroupMapper.updateByPrimaryKeySelective(record); + wxGroupMapper.updateById(record); } } @Override public void deleteById(String id) { - wxGroupMapper.deleteByPrimaryKey(id); + wxGroupMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 90baa0c1e..41fc8c6e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -1,8 +1,10 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxLevelConfig; @@ -16,7 +18,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; @@ -73,7 +74,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { WxLevelMerchant wxLevelMerchantParam = new WxLevelMerchant(); wxLevelMerchantParam.setLevelId(l.getId()); wxLevelMerchantParam.setMerchantId(merchantId); - WxLevelMerchant wxLevelMerchant = wxLevelMerchantapper.selectOne(wxLevelMerchantParam); + WxLevelMerchant wxLevelMerchant = wxLevelMerchantapper.selectOne(new QueryWrapper(wxLevelMerchantParam)); l.setCount(wxLevelMerchant != null? wxLevelMerchant.getDiscount().longValue():DEFAULT_MERCHANT_DISCOUNT); }); return list; @@ -87,17 +88,17 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { WxLevelMerchant wxLevelMerchantParam = new WxLevelMerchant(); wxLevelMerchantParam.setLevelId(l.getId()); wxLevelMerchantParam.setMerchantId(merchantId); - WxLevelMerchant wxLevelMerchant = wxLevelMerchantapper.selectOne(wxLevelMerchantParam); + WxLevelMerchant wxLevelMerchant = wxLevelMerchantapper.selectOne(new QueryWrapper(wxLevelMerchantParam)); if (wxLevelMerchant != null) { wxLevelMerchant.setCreateDate(new Date()); wxLevelMerchant.setDiscount(l.getCount().intValue()); - wxLevelMerchantapper.updateByPrimaryKeySelective(wxLevelMerchant); + wxLevelMerchantapper.updateById(wxLevelMerchant); }else { wxLevelMerchantParam.setId(idWorker.nextId()); wxLevelMerchantParam.setCreateDate(new Date()); wxLevelMerchantParam.setTenantId(tenantId); wxLevelMerchantParam.setDiscount(l.getCount().intValue()); - wxLevelMerchantapper.insertSelective(wxLevelMerchantParam); + wxLevelMerchantapper.insert(wxLevelMerchantParam); } }); @@ -119,7 +120,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Override public WxLevelConfig getById(Long id) { - return wxLevelConfigMapper.selectByPrimaryKey(id); + return wxLevelConfigMapper.selectById(id); } @Override @@ -128,9 +129,9 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxLevelConfigMapper.insertSelective(record); + wxLevelConfigMapper.insert(record); } else { - wxLevelConfigMapper.updateByPrimaryKeySelective(record); + wxLevelConfigMapper.updateById(record); } } @@ -177,7 +178,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Override public void deleteById(Long id) { - wxLevelConfigMapper.deleteByPrimaryKey(id); + wxLevelConfigMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java index c9f70f001..9eabee186 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java @@ -50,7 +50,7 @@ public class WxMallApplyServiceImpl implements WxMallApplyService { @Override public WxMallApply getById(String id) { - return wxMallApplyMapper.selectByPrimaryKey(id); + return wxMallApplyMapper.selectById(id); } @Override @@ -70,16 +70,16 @@ public class WxMallApplyServiceImpl implements WxMallApplyService { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setApplyDate(new Date()); - wxMallApplyMapper.insertSelective(record); + wxMallApplyMapper.insert(record); } else { - wxMallApplyMapper.updateByPrimaryKeySelective(record); + wxMallApplyMapper.updateById(record); } return new ResultData(200,"操作成功",true); } @Override public void deleteById(String id) { - wxMallApplyMapper.deleteByPrimaryKey(id); + wxMallApplyMapper.deleteById(id); } @Override @@ -133,7 +133,7 @@ public class WxMallApplyServiceImpl implements WxMallApplyService { // Date expiredate=new Date(currentTime); // wxMsgValidationcode.setExpiretime(expiredate); // wxMsgValidationcode.setCreatetime(createtime); -// wxMsgValidationcodeMapper.insertSelective(wxMsgValidationcode); +// wxMsgValidationcodeMapper.insert(wxMsgValidationcode); // return new ResultData(Result.SUCCESS,"发送成功"); // } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index 48ddd4fa0..fb0f156b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -36,7 +36,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { @Override public WxMallBuilding getById(Long id) { - return wxMallBuildingMapper.selectByPrimaryKey(id); + return wxMallBuildingMapper.selectById(id); } @Override @@ -45,15 +45,15 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxMallBuildingMapper.insertSelective(record); + wxMallBuildingMapper.insert(record); } else { - wxMallBuildingMapper.updateByPrimaryKeySelective(record); + wxMallBuildingMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMallBuildingMapper.deleteByPrimaryKey(id); + wxMallBuildingMapper.deleteById(id); } @Override @@ -110,7 +110,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { mallBuilding.setTenantId(record.getTenantId()); mallBuilding.setName(record.getBuilding()); mallBuilding.setFloorNumber(floors.length); - wxMallBuildingMapper.insertSelective(mallBuilding); + wxMallBuildingMapper.insert(mallBuilding); // 楼层 for(String floor: floors) { @@ -120,7 +120,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { mallFloor.setBuildingId(mallBuilding.getId()); mallFloor.setFloorName(floor); mallFloor.setBackgroundImg(Constant.floor_back_img); - wxMallFloorMapper.insertSelective(mallFloor); + wxMallFloorMapper.insert(mallFloor); } } @@ -135,7 +135,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { if (record.getOperatingArea() != null) { mallFloor.setOperatingArea(record.getOperatingArea()); } - wxMallFloorMapper.updateByPrimaryKeySelective(mallFloor); + wxMallFloorMapper.updateById(mallFloor); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java index 40ee471c6..a9800980e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java @@ -28,7 +28,7 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { @Override public WxMallFloor getById(Long id) { - return wxMallFloorMapper.selectByPrimaryKey(id); + return wxMallFloorMapper.selectById(id); } @Override @@ -37,15 +37,15 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxMallFloorMapper.insertSelective(record); + wxMallFloorMapper.insert(record); } else { - wxMallFloorMapper.updateByPrimaryKeySelective(record); + wxMallFloorMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMallFloorMapper.deleteByPrimaryKey(id); + wxMallFloorMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 2b72a7b41..de91fb30f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -58,7 +58,7 @@ public class WxMallServiceImpl implements WxMallService { WxMall mall = operations.get(key); return mall; } - WxMall mall = wxMallMapper.selectByPrimaryKey(id); + WxMall mall = wxMallMapper.selectById(id); // 插入缓存 operations.set(key, mall, 3600, TimeUnit.SECONDS); return mall; @@ -77,7 +77,7 @@ public class WxMallServiceImpl implements WxMallService { record.setTenantId(String.valueOf(record.getId())); } - int ret = wxMallMapper.insertSelective(record); + int ret = wxMallMapper.insert(record); String key = Constant.MALL_KEY_PREV + String.valueOf(record.getId()); // 缓存已存在,删除 @@ -91,7 +91,7 @@ public class WxMallServiceImpl implements WxMallService { @Override public int update(WxMall record) { - int ret = wxMallMapper.updateByPrimaryKeySelective(record); + int ret = wxMallMapper.updateById(record); String key = Constant.MALL_KEY_PREV + String.valueOf(record.getId()); // 缓存已存在,删除 @@ -105,7 +105,7 @@ public class WxMallServiceImpl implements WxMallService { @Override public void deleteById(Long id) { - wxMallMapper.deleteByPrimaryKey(id); + wxMallMapper.deleteById(id); String key = Constant.MALL_KEY_PREV + String.valueOf(id); // 缓存已存在,删除 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 0d7cfdab3..90eeb3d79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -46,7 +46,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { @Override public WxMerchantBUser getById(Long id) { - return wxMerchantBUserMapper.selectByPrimaryKey(id); + return wxMerchantBUserMapper.selectById(id); } @Override @@ -72,19 +72,19 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { Date date = new Date(); record.setCreateDate(date); record.setUpdateDate(date); - wxMerchantBUserMapper.insertSelective(record); + wxMerchantBUserMapper.insert(record); return id; } else { Date date = new Date(); record.setUpdateDate(date); - wxMerchantBUserMapper.updateByPrimaryKeySelective(record); + wxMerchantBUserMapper.updateById(record); return record.getId(); } } @Override public void deleteById(Long id) { - wxMerchantBUserMapper.deleteByPrimaryKey(id); + wxMerchantBUserMapper.deleteById(id); } @Override @@ -120,7 +120,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { bUser = list.get(0); bUser.setUserPwd(pwd); try { - wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); + wxMerchantBUserMapper.updateById(bUser); } catch (Exception e) { logger.error("db failed: 商户-" + bUser.getId() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java index 1324873b2..b81e671fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -49,7 +50,7 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill @Override public WxMerchantPowerBillConfig getById(Long id) { - return wxMerchantPowerBillConfigMapper.selectByPrimaryKey(id); + return wxMerchantPowerBillConfigMapper.selectById(id); } @Override @@ -62,13 +63,13 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill if (config.getBuildWay().equals(EnumPowerBillBuildWay.METER.getCode())) { WxPowerBillAutoConfig wxPowerBillAutoConfig = new WxPowerBillAutoConfig(); wxPowerBillAutoConfig.setTenantId(config.getTenantId()); - WxPowerBillAutoConfig powerBillAutoConfig = wxPowerBillAutoConfigMapper.selectOne(wxPowerBillAutoConfig); + WxPowerBillAutoConfig powerBillAutoConfig = wxPowerBillAutoConfigMapper.selectOne(new QueryWrapper(wxPowerBillAutoConfig)); if (powerBillAutoConfig == null) { return new ResultData(ErrorCode.POWER_BILL_CONFIGU_NOT_FOUND); } config.setPrice(powerBillAutoConfig.getUnitPrice()); } - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(config.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(config.getMerchantId()); if (wxMerchant == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } @@ -78,17 +79,17 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill config.setId(idWorker.nextId()); config.setCreateDate(date); config.setUpdateDate(date); - wxMerchantPowerBillConfigMapper.insertSelective(config); + wxMerchantPowerBillConfigMapper.insert(config); } else { config.setUpdateDate(date); - wxMerchantPowerBillConfigMapper.updateByPrimaryKeySelective(config); + wxMerchantPowerBillConfigMapper.updateById(config); } return new ResultData(); } @Override public void deleteById(Long id) { - wxMerchantPowerBillConfigMapper.deleteByPrimaryKey(id); + wxMerchantPowerBillConfigMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index ee76e9acf..e26d4b530 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -138,7 +139,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public WxMerchant getById(Long id) { - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id); + WxMerchant wxMerchant = wxMerchantMapper.selectById(id); if(wxMerchant==null){ return null; } @@ -212,7 +213,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public void deleteById(Long id) { - wxMerchantMapper.deleteByPrimaryKey(id); + wxMerchantMapper.deleteById(id); } @@ -229,7 +230,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Transactional(rollbackFor = {Exception.class}) @Override public void disable(Long id) { - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id); + WxMerchant wxMerchant = wxMerchantMapper.selectById(id); if (wxMerchant == null) { logger.info("未发现要停用的商户"); return; @@ -241,18 +242,18 @@ public class WxMerchantServiceImpl implements WxMerchantService { } wxMerchant.setStatus(EnumMerchantStatus.NOT_VALID.getCode()); - wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); + wxMerchantMapper.updateById(wxMerchant); //是否有租赁合同 WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setMerchantId(id); - long countRentContract = wxRentContractMapper.select(wxRentContract).parallelStream(). + long countRentContract = wxRentContractMapper.selectList(new QueryWrapper<>(wxRentContract)).parallelStream(). filter(c -> c.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || c.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || c.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); //是否有物业合同 WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setMerchantId(id); - long countPropertyContract = wxPropertyContractMapper.select(wxPropertyContract).parallelStream(). + long countPropertyContract = wxPropertyContractMapper.selectList(new QueryWrapper<>(wxPropertyContract)).parallelStream(). filter(c -> c.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || c.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || c.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); @@ -265,13 +266,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShopQuery); for (WxMerchantShop wxMerchantShop : wxMerchantShopList) { wxMerchantShop.setIsDel(EnumDelStatus.DEL.getCode()); - wxMerchantShopMapper.updateByPrimaryKeySelective(wxMerchantShop); + wxMerchantShopMapper.updateById(wxMerchantShop); //更新商铺状态 WxShop wxShop = new WxShop(); wxShop.setTenantId(wxMerchant.getTenantId()); wxShop.setId(wxMerchantShop.getShopId()); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); - wxShopMapper.updateByPrimaryKeySelective(wxShop); + wxShopMapper.updateById(wxShop); } } //解绑用户 @@ -280,7 +281,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); for (WxMerchantBUser wxMerchantBUser : wxMerchantBUserMapperList) { wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); - wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); + wxMerchantBUserMapper.updateById(wxMerchantBUser); } //作废卡券 WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); @@ -318,20 +319,20 @@ public class WxMerchantServiceImpl implements WxMerchantService { //更新商铺 for (long shopid : shopidlist) { - WxShop shop = wxShopMapper.selectByPrimaryKey(shopid); + WxShop shop = wxShopMapper.selectById(shopid); if (shop.getStatus().equals(EnumShopStatus.RENT.getCode())) { return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shop.getShopNumber() + " 已出租"); } WxMerchantShop wxMerchantShop = new WxMerchantShop(); wxMerchantShop.setShopId(shopid); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - int count = wxMerchantShopMapper.selectCount(wxMerchantShop); + int count = wxMerchantShopMapper.selectCount(new QueryWrapper(wxMerchantShop)); if (count > 0) { return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shop.getShopNumber() + " 已出租"); } //更新商铺状态 shop.setStatus(EnumShopStatus.RENT.getCode()); - wxShopMapper.updateByPrimaryKeySelective(shop); + wxShopMapper.updateById(shop); //关联表插入 wxMerchantShop.setId(idWorker.nextId()); wxMerchantShop.setMerchantId(merchantId); @@ -341,7 +342,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date shopdate = new Date(); wxMerchantShop.setUpdateDate(shopdate); wxMerchantShop.setCreateDate(shopdate); - wxMerchantShopMapper.insertSelective(wxMerchantShop); + wxMerchantShopMapper.insert(wxMerchantShop); } wxMerchant.setId(merchantId); @@ -364,11 +365,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setCoverPicture(JSONArray.toJSONString(strList)); } } - wxMerchantMapper.insertSelective(wxMerchant); + wxMerchantMapper.insert(wxMerchant); //关联合同 if (wxMerchant.getRentContractId() != null) { - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxMerchant.getRentContractId()); + WxRentContract wxRentContract = wxRentContractMapper.selectById(wxMerchant.getRentContractId()); if (wxRentContract == null) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } @@ -382,7 +383,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } else { wxRentContract.setStatus(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()); } - wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); + wxRentContractMapper.updateById(wxRentContract); //预览账单改为正式,并写入商户id(租赁合同需要绑定商户才变成已签约) WxBillRent billRent = new WxBillRent(); billRent.setRentContractId(wxMerchant.getRentContractId()); @@ -418,7 +419,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if(wxMerchant.getIsDel() != null && wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { // 停用商户 - WxMerchant oldMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant.getId()); + WxMerchant oldMerchant = wxMerchantMapper.selectById(wxMerchant.getId()); if(!oldMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())){ // 停车商户 logger.error("停车商户不能被删除"); @@ -432,7 +433,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } Date date = new Date(); wxMerchant.setUpdateDate(date); - wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); + wxMerchantMapper.updateById(wxMerchant); return new ResultData(Result.SUCCESS, "商户更新成功"); } catch (Exception e) { logger.error("db failed: 商户更新失败, e:" + e.getMessage()); @@ -489,12 +490,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date date = new Date(); record.setCreateDate(date); record.setUpdateDate(date); - wxMerchantCorpMapper.insertSelective(record); + wxMerchantCorpMapper.insert(record); }else{ WxMerchantCorp record = wxMerchant.getWxMerchantCorp(); Date date = new Date(); record.setUpdateDate(date); - wxMerchantCorpMapper.updateByPrimaryKeySelective(record); + wxMerchantCorpMapper.updateById(record); } } catch (Exception e) { logger.error("db failed: 操作法人信息失败, e:" + e.getMessage()); @@ -523,12 +524,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date date = new Date(); record.setCreateDate(date); record.setUpdateDate(date); - wxMerchantTaxMapper.insertSelective(record); + wxMerchantTaxMapper.insert(record); }else{ WxMerchantTax record = wxMerchant.getWxMerchantTax(); Date date = new Date(); record.setUpdateDate(date); - wxMerchantTaxMapper.updateByPrimaryKeySelective(record); + wxMerchantTaxMapper.updateById(record); } } catch (Exception e) { logger.error("db failed: 操作税务信息失败, e:" + e.getMessage()); @@ -561,7 +562,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); for (WxMerchantBUser wxMerchantBUser : wxMerchantBUserMapperList) { wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); - wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); + wxMerchantBUserMapper.updateById(wxMerchantBUser); } final IdWorker idWorker = IdWorker.get(); //保存商户关联用户 @@ -576,7 +577,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setCreateDate(date); user.setUpdateDate(date); user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); - wxMerchantBUserMapper.insertSelective(user); + wxMerchantBUserMapper.insert(user); } else {//有id的更新 user.setMerchantId(wxMerchant.getId()); user.setTenantId(wxMerchant.getTenantId()); @@ -584,7 +585,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date date = new Date(); user.setUpdateDate(date); user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); - wxMerchantBUserMapper.updateByPrimaryKeySelective(user); + wxMerchantBUserMapper.updateById(user); } } return new ResultData(Result.SUCCESS, "账号操作成功"); @@ -600,7 +601,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); + wxMerchantMapper.updateById(wxMerchant); wxLevelConfigService.batchSaveByMerchantId(wxMerchant.getTenantId(), wxMerchant.getId(), wxMerchant.getLevelConfigList()); } catch (Exception e) { logger.error("db failed: 账号操作失败, e:" + e.getMessage()); @@ -619,7 +620,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public WxMerchant findOne(WxMerchant wxMerchant) { - return wxMerchantMapper.selectOne(wxMerchant); + return wxMerchantMapper.selectOne(new QueryWrapper(wxMerchant)); } @Override @@ -663,20 +664,20 @@ public class WxMerchantServiceImpl implements WxMerchantService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未选择要置顶的商户"); } wxMerchant.setTopTime(new Date()); - wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); + wxMerchantMapper.updateById(wxMerchant); return new ResultData(Result.SUCCESS, "操作成功"); } @Override public ResultData useAccount(WxProfitSharingReceiver wxProfitSharingReceiver) { - WxProfitSharingReceiver profitSharingReceiver = wxProfitSharingReceiverMapper.selectByPrimaryKey(wxProfitSharingReceiver.getId()); + WxProfitSharingReceiver profitSharingReceiver = wxProfitSharingReceiverMapper.selectById(wxProfitSharingReceiver.getId()); profitSharingReceiver.setIsUse(wxProfitSharingReceiver.getIsUse()); profitSharingReceiver.setUpdateTime(new Date()); - wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(profitSharingReceiver); + wxProfitSharingReceiverMapper.updateById(profitSharingReceiver); Long merchantId = profitSharingReceiver.getMerchantId(); String accout = profitSharingReceiver.getReceiverAccount(); - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(merchantId); + WxMerchant wxMerchant = wxMerchantMapper.selectById(merchantId); String linkPhone = wxMerchant.getLinkPhone(); String merchantName = wxMerchant.getName(); String tenantId = wxProfitSharingReceiver.getTenantId(); @@ -706,7 +707,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setIsDel(EnumDelStatus.NOT_DEL.getCode()); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); - List merchantList = wxMerchantMapper.select(wxMerchant); + List merchantList = wxMerchantMapper.selectList(new QueryWrapper(wxMerchant)); if (merchantList.size() == 1) return Optional.of(merchantList.get(0)); return Optional.empty(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java index 784526732..756d37600 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java @@ -53,7 +53,7 @@ public class WxMerchantShopServiceImpl implements WxMerchantShopService { @Override public WxMerchantShop getById(Long id) { - return wxMerchantShopMapper.selectByPrimaryKey(id); + return wxMerchantShopMapper.selectById(id); } @Override @@ -62,15 +62,15 @@ public class WxMerchantShopServiceImpl implements WxMerchantShopService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxMerchantShopMapper.insertSelective(record); + wxMerchantShopMapper.insert(record); } else { - wxMerchantShopMapper.updateByPrimaryKeySelective(record); + wxMerchantShopMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMerchantShopMapper.deleteByPrimaryKey(id); + wxMerchantShopMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 1ba74daef..49f4a8cd6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -42,7 +42,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Override public WxMerchantSubsidy getById(Long id) { - return wxMerchantSubsidyMapper.selectByPrimaryKey(id); + return wxMerchantSubsidyMapper.selectById(id); } @Override @@ -51,9 +51,9 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxMerchantSubsidyMapper.insertSelective(record); + wxMerchantSubsidyMapper.insert(record); } else { - int num = wxMerchantSubsidyMapper.updateByPrimaryKeySelective(record); + int num = wxMerchantSubsidyMapper.updateById(record); return new ResultData(num); } return new ResultData(); @@ -71,7 +71,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Override public void deleteById(Long id) { - wxMerchantSubsidyMapper.deleteByPrimaryKey(id); + wxMerchantSubsidyMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 5c0cc42bb..da6b48867 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -56,7 +56,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public WxMerchantTradeDaily getById(Long id) { - return wxMerchantTradeDailyMapper.selectByPrimaryKey(id); + return wxMerchantTradeDailyMapper.selectById(id); } @Override @@ -67,16 +67,16 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ record.setId(idWorker.nextId()); record.setCreateDate(new Date()); record.setUpdateDate(new Date()); - wxMerchantTradeDailyMapper.insertSelective(record); + wxMerchantTradeDailyMapper.insert(record); } else { record.setUpdateDate(new Date()); - wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(record); + wxMerchantTradeDailyMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMerchantTradeDailyMapper.deleteByPrimaryKey(id); + wxMerchantTradeDailyMapper.deleteById(id); } @Override @@ -111,7 +111,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily = tradeList.get(0); wxMerchantTradeDaily.setTradeAmt(volume+""); wxMerchantTradeDaily.setUpdateDate(new Date()); - wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); + wxMerchantTradeDailyMapper.updateById(wxMerchantTradeDaily); return new ResultData(wxMerchantTradeDaily); } @@ -150,7 +150,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt()+""); wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount()); wxMerchantTradeDaily.setProof(tradeDaily.getProof()); - wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); + wxMerchantTradeDailyMapper.updateById(wxMerchantTradeDaily); return new ResultData(wxMerchantTradeDaily); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index 746d4e2e2..3dedc0bce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -45,7 +45,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { @Override public WxMsgCallback getById(Long id) { - return wxMsgCallbackMapper.selectByPrimaryKey(id); + return wxMsgCallbackMapper.selectById(id); } @Override @@ -53,15 +53,15 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxMsgCallbackMapper.insertSelective(record); + wxMsgCallbackMapper.insert(record); } else { - wxMsgCallbackMapper.updateByPrimaryKeySelective(record); + wxMsgCallbackMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMsgCallbackMapper.deleteByPrimaryKey(id); + wxMsgCallbackMapper.deleteById(id); } @Override @@ -75,7 +75,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { List wxMsgCallbacks = JSONArray.parseArray(param.get("item"), WxMsgCallback.class); wxMsgConfig = list.get(0); wxMsgConfig.setRemains(wxMsgConfig.getRemains() - wxMsgCallbacks.size()); - //wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig); + //wxMsgConfigMapper.updateById(wxMsgConfig); final IdWorker idWorker = IdWorker.get(); for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) { WxMsgCallback callback=wxMsgCallbackMapper.queryCallbackByBatchNoAndPhone(wxMsgCallback); @@ -92,7 +92,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { callback.setEndtime(wxMsgCallback.getEndtime()); callback.setCallbackId(wxMsgCallback.getId()); callback.setUpdatetime(new Date()); - wxMsgCallbackMapper.updateByPrimaryKeySelective(callback); + wxMsgCallbackMapper.updateById(callback); }else{ Long callbackId = wxMsgCallback.getId(); wxMsgCallback.setId(idWorker.nextId()); @@ -100,7 +100,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgCallback.setTenantId(tenantId); wxMsgCallback.setSign(param.get("sign")); wxMsgCallback.setCreatetime(new Date()); - wxMsgCallbackMapper.insertSelective(wxMsgCallback); + wxMsgCallbackMapper.insert(wxMsgCallback); } } }else{ @@ -119,7 +119,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgModel.setTenantId(tenantId); wxMsgModel = wxMsgModelMapper.findList(wxMsgModel).get(0); wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); - wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); + wxMsgModelMapper.updateById(wxMsgModel); } else { logger.info("短信营销模板回调SIGN校验失败"); } @@ -136,7 +136,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgModel.setTenantId(tenantId); wxMsgModel = wxMsgValidationcodeModelMapper.findList(wxMsgModel).get(0); wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); - wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(wxMsgModel); + wxMsgValidationcodeModelMapper.updateById(wxMsgModel); }else{ logger.info("短信验证码回调SIGN校验失败"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java index aa73fbfac..2b8be4db2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java @@ -1,7 +1,9 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxMsgConfig; import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.service.WxMsgConfigService; @@ -9,9 +11,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; - -import java.util.List; @Service public class WxMsgConfigServiceImpl implements WxMsgConfigService { @@ -28,7 +27,7 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService { @Override public WxMsgConfig getById(Long id) { - return wxMsgConfigMapper.selectByPrimaryKey(id); + return wxMsgConfigMapper.selectById(id); } @Override @@ -37,20 +36,20 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxMsgConfigMapper.insertSelective(record); + wxMsgConfigMapper.insert(record); } else { - wxMsgConfigMapper.updateByPrimaryKeySelective(record); + wxMsgConfigMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMsgConfigMapper.deleteByPrimaryKey(id); + wxMsgConfigMapper.deleteById(id); } @Override public WxMsgConfig findObject(WxMsgConfig wxMsgConfig) { - return wxMsgConfigMapper.selectOne(wxMsgConfig); + return wxMsgConfigMapper.selectOne(new QueryWrapper(wxMsgConfig)); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java index e2ceea8d7..29a6f3410 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java @@ -40,7 +40,7 @@ public class WxMsgLimitServiceImpl implements WxMsgLimitService { setLimitNum(record); // 保存 record.setId(idWorker.nextId()); - wxMsgLimitMapper.insertSelective(record); + wxMsgLimitMapper.insert(record); } private WxMsgLimit setLimitNum(WxMsgLimit record) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index 8e189fc01..84dc8326e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -39,7 +39,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { @Override public WxMsgModel getById(Long id) { - return wxMsgModelMapper.selectByPrimaryKey(id); + return wxMsgModelMapper.selectById(id); } @Override @@ -84,12 +84,12 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(2);//审核中 - wxMsgModelMapper.insertSelective(wxMsgModel); + wxMsgModelMapper.insert(wxMsgModel); } else { String data = jsonObjectResult.get("data").toString(); wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setStatus(2);//审核中 - wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); + wxMsgModelMapper.updateById(wxMsgModel); } return new ResultData(Result.SUCCESS, "创建模板成功"); } else if (ret.equals(EnumMsgModelStatus.REPEAT.getCode().toString())) { @@ -99,9 +99,9 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { wxMsgModel.setTenantId(wxMsgModel.getTenantId()); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(1); - wxMsgModelMapper.insertSelective(wxMsgModel); + wxMsgModelMapper.insert(wxMsgModel); } else { - wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); + wxMsgModelMapper.updateById(wxMsgModel); } } else if (ret.equals(EnumMsgModelStatus.SINATURE_CONTENT_ERROR.getCode().toString())) { return new ResultData(ErrorCode.MSG_SIGNATURE_CONTENT_ERROR.getCode(), "短信签名或内容错误"); @@ -119,7 +119,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { @Override public void deleteById(Long id) { - wxMsgModelMapper.deleteByPrimaryKey(id); + wxMsgModelMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index 714ff5b00..45d22ab59 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -57,6 +57,6 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { @Override public void update(WxMsgRecord record) { - wxMsgRecordMapper.update(record); + wxMsgRecordMapper.updateByBaseMsg(record); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 526fdcbe0..cc0c061d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -86,7 +86,7 @@ public class WxMsgServiceImpl implements WxMsgService { @Override public WxMsg getById(Long id) { - WxMsg wxMsg = wxMsgMapper.selectByPrimaryKey(id); + WxMsg wxMsg = wxMsgMapper.selectById(id); Map params = new HashMap<>(); params.put("msgId", wxMsg.getId().toString()); params.put("status", "1"); @@ -100,7 +100,7 @@ public class WxMsgServiceImpl implements WxMsgService { } @Async - private ResultData saveOrUpdate(WxMsg wxMsg, WxMsgConfig wxMsgConfig) { + public ResultData saveOrUpdate(WxMsg wxMsg, WxMsgConfig wxMsgConfig) { //新增记录 if (wxMsg.getId() == null) { @@ -109,7 +109,7 @@ public class WxMsgServiceImpl implements WxMsgService { final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); wxMsg.setCreatetime(new Date()); - wxMsgMapper.insertSelective(wxMsg); + wxMsgMapper.insert(wxMsg); return new ResultData(Result.SUCCESS, "已保存到草稿箱"); } @@ -134,14 +134,14 @@ public class WxMsgServiceImpl implements WxMsgService { long id = idWorker.nextId(); wxMsg.setId(id); wxMsg.setCreatetime(new Date()); - wxMsgMapper.insertSelective(wxMsg); + wxMsgMapper.insert(wxMsg); return new ResultData(Result.SUCCESS, "短信会在预设时间发送", id); } } else { //草稿 if (wxMsg.getStatus().equals(EnumMsgStatus.MSG_STATUS_DRAFT.getCode())) { - wxMsgMapper.updateByPrimaryKeySelective(wxMsg); + wxMsgMapper.updateById(wxMsg); return new ResultData(Result.SUCCESS, "已保存到草稿箱"); } @@ -161,7 +161,7 @@ public class WxMsgServiceImpl implements WxMsgService { } else { //定时 wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_NOT_SEND.getCode()); - wxMsgMapper.updateByPrimaryKeySelective(wxMsg); + wxMsgMapper.updateById(wxMsg); return new ResultData(Result.SUCCESS, "短信会在预设时间发送"); } @@ -170,7 +170,7 @@ public class WxMsgServiceImpl implements WxMsgService { @Override public void deleteById(Long id) { - wxMsgMapper.deleteByPrimaryKey(id); + wxMsgMapper.deleteById(id); } @Override @@ -312,7 +312,7 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); wxMsgCallback.setStatusMsg(EnumMsgSendStatus.MSG_SENDING.getMessage()); wxMsgCallback.setCreatetime(new Date()); - wxMsgCallbackMapper.insertSelective(wxMsgCallback); + wxMsgCallbackMapper.insert(wxMsgCallback); } logger.info("营销短信发送时主动添加回调记录结束..."); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java index 1687208cd..d51dbac75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java @@ -28,7 +28,7 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { @Override public WxMsgSignature getById(Long id) { - return wxMsgSignatureMapper.selectByPrimaryKey(id); + return wxMsgSignatureMapper.selectById(id); } @Override @@ -38,15 +38,15 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreatetime(new Date()); - wxMsgSignatureMapper.insertSelective(record); + wxMsgSignatureMapper.insert(record); } else { - wxMsgSignatureMapper.updateByPrimaryKeySelective(record); + wxMsgSignatureMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMsgSignatureMapper.deleteByPrimaryKey(id); + wxMsgSignatureMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index d971cdb52..094132949 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -39,7 +39,7 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM @Override public WxMsgValidationcodeModel getById(String id) { - return wxMsgValidationcodeModelMapper.selectByPrimaryKey(id); + return wxMsgValidationcodeModelMapper.selectById(id); } @Override @@ -85,12 +85,12 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(2);//审核中 - wxMsgValidationcodeModelMapper.insertSelective(wxMsgModel); + wxMsgValidationcodeModelMapper.insert(wxMsgModel); } else { String data = jsonObjectResult.get("data").toString(); wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setStatus(2);//审核中 - wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(wxMsgModel); + wxMsgValidationcodeModelMapper.updateById(wxMsgModel); } return new ResultData(Result.SUCCESS, "创建模板成功"); } else if (ret.equals(EnumMsgModelStatus.REPEAT.getCode().toString())) { @@ -100,9 +100,9 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM wxMsgModel.setTenantId(wxMsgModel.getTenantId()); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(1); - wxMsgValidationcodeModelMapper.insertSelective(wxMsgModel); + wxMsgValidationcodeModelMapper.insert(wxMsgModel); } else { - wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(wxMsgModel); + wxMsgValidationcodeModelMapper.updateById(wxMsgModel); } } else if (ret.equals(EnumMsgModelStatus.SINATURE_CONTENT_ERROR.getCode().toString())) { return new ResultData(ErrorCode.MSG_SIGNATURE_CONTENT_ERROR.getCode(), "短信签名或内容错误"); @@ -121,11 +121,11 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM @Override public void deleteById(String id) { - wxMsgValidationcodeModelMapper.deleteByPrimaryKey(id); + wxMsgValidationcodeModelMapper.deleteById(id); } @Override public void update(WxMsgValidationcodeModel record) { - wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(record); + wxMsgValidationcodeModelMapper.updateById(record); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index 06ec46fb4..a5cfa4419 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -6,7 +6,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxMsgCallback; +import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; import com.iformall.mapper.*; @@ -18,7 +19,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; + +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service @@ -57,7 +61,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic @Override public WxMsgValidationcode getById(Long id) { - return wxMsgValidationcodeMapper.selectByPrimaryKey(id); + return wxMsgValidationcodeMapper.selectById(id); } @Override @@ -66,15 +70,15 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxMsgValidationcodeMapper.insertSelective(record); + wxMsgValidationcodeMapper.insert(record); } else { - wxMsgValidationcodeMapper.updateByPrimaryKeySelective(record); + wxMsgValidationcodeMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxMsgValidationcodeMapper.deleteByPrimaryKey(id); + wxMsgValidationcodeMapper.deleteById(id); } @@ -125,7 +129,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic wxMsgCallback.setMsgId(wxmsg.getId()); wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); wxMsgCallback.setCreatetime(new Date()); - wxMsgCallbackMapper.insertSelective(wxMsgCallback); + wxMsgCallbackMapper.insert(wxMsgCallback); logger.info("验证码发送时主动添加回调记录结束..."); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index e2f5cd181..a01aad3c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -74,7 +75,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { if (!orderGroupId.equals(notOrderGroupId)) { // 非首次拼团 // 参与拼团 - WxOrderGroup wxOrderGroup = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); + WxOrderGroup wxOrderGroup = wxOrderGroupMapper.selectById(orderGroupId); if(wxOrderGroup.getRemainPeople() < endPeople + 1) { logger.info(">>>>>>>>>>>>参团失败 修改订单状态后定时退款 团单号" + orderGroupId); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); @@ -94,7 +95,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { order.setPressEndDate(wxOrderGroup.getExpiredDate()); order.setOrderGroupId(wxOrderGroup.getId()); try { - wxOrderMapper.updateByPrimaryKey(order); + wxOrderMapper.updateById(order); } catch (Exception e) { logger.error("更新订单信息失败", e); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); @@ -123,7 +124,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { } wxOrderGroup.setExpiredDate(expiredDate); try { - wxOrderGroupMapper.insertSelective(wxOrderGroup); + wxOrderGroupMapper.insert(wxOrderGroup); } catch (Exception e) { logger.error("创建拼团信息失败", e); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); @@ -133,7 +134,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { order.setPressEndDate(expiredDate); order.setOrderGroupId(groupId); try { - wxOrderMapper.updateByPrimaryKeySelective(order); + wxOrderMapper.updateById(order); } catch (Exception e) { logger.error("更新订单信息失败", e); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); @@ -176,20 +177,21 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { } // 拼团成功后,取消待支付订单 wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); - list = wxOrderMapper.select(wxOrder); + list = wxOrderMapper.selectList(new QueryWrapper(wxOrder)); for (WxOrder temp : list) { //去库存 wxOrderService.updateOrderStatus(temp); //拼团取消 temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); - wxOrderMapper.updateByPrimaryKeySelective(temp); + wxOrderMapper.updateById(temp); } } @Override public ResultData queryRemainOne(WxOrderGroup wxOrderGroup, Long userId) { //取过期时间最大的数据 - WxOrderGroup group = wxOrderGroupMapper.select(wxOrderGroup).parallelStream() + List list = wxOrderGroupMapper.selectList(new QueryWrapper(wxOrderGroup)); + WxOrderGroup group = list.parallelStream() .filter(o -> !o.getUserId().equals(userId) && o.getExpiredDate().after(new Date())) .max(Comparator.comparing(WxOrderGroup::getExpiredDate)) .orElse(null); @@ -227,14 +229,14 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { @Override @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) public ResultData toOrderGroup(WxOrderGroup wxOrderGroup) { - WxOrder orderTemp = wxOrderMapper.selectByPrimaryKey(wxOrderGroup.getOrderId()); + WxOrder orderTemp = wxOrderMapper.selectById(wxOrderGroup.getOrderId()); if (orderTemp == null) { return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); } if (orderTemp.getOrderGroupId().equals(notOrderGroupId)) { return new ResultData(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); } - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(orderTemp.getCouponChannelId()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(orderTemp.getCouponChannelId()); if (wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); } @@ -257,7 +259,8 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { wxOrder = new WxOrder(); wxOrder.setOrderGroupId(wxOrderGroup.getId()); wxOrder.setTenantId(wxOrderGroup.getTenantId()); - List orderList = wxOrderMapper.select(wxOrder).parallelStream().filter(o -> { + List orderList = wxOrderMapper.selectList(new QueryWrapper(wxOrder)); + orderList = orderList.parallelStream().filter(o -> { return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) || @@ -266,7 +269,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { if (!orderList.isEmpty()) { List userList = new ArrayList<>(); for (WxOrder order : orderList) { - WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); + WxCUser user = wxCUserMapper.selectById(order.getCUserId()); if (user != null) { userList.add(user); } @@ -297,11 +300,12 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { order.setTenantId(wxOrderGroup.getTenantId()); order.setCUserId(wxOrderGroup.getUserId()); order.setOrderGroupId(wxOrderGroup.getId()); - long count = wxOrderMapper.select(order).parallelStream().filter(o -> { + List list = wxOrderMapper.selectList(new QueryWrapper(order)); + long count = list.parallelStream().filter(o -> { return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); }).count(); - WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(wxOrderGroup.getId()); + WxOrderGroup group = wxOrderGroupMapper.selectById(wxOrderGroup.getId()); Map result = new HashMap<>(2); result.put("attend", count > 0 ? true : false); result.put("status", group.getStatus()); @@ -312,9 +316,9 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { @Override public void updateGroupStatus(WxOrderGroup wxOrderGroup) { Long id = wxOrderGroup.getId(); - WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(id); + WxOrderGroup group = wxOrderGroupMapper.selectById(id); if (group != null && group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode())) { - WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(wxOrderGroup.getCouponId()); + WxCoupon wxCoupon = wxCouponMapper.selectById(wxOrderGroup.getCouponId()); Integer status = wxCoupon.getStatus(); if (status.equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) { group.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); @@ -331,7 +335,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { @Override public List findList(WxOrderGroup group) { - return wxOrderGroupMapper.select(group); + return wxOrderGroupMapper.selectList(new QueryWrapper(group)); } @Override @@ -344,7 +348,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { public void returnMoney(WxOrderGroup group) { //券失效或拼团超时 修改 拼团的状态 - wxOrderGroupMapper.updateByPrimaryKeySelective(group); + wxOrderGroupMapper.updateById(group); WxOrder order = new WxOrder(); order.setTenantId(group.getTenantId()); order.setOrderGroupId(group.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index 51f37c429..518db19c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -1,11 +1,11 @@ package com.iformall.service.impl; -import java.text.SimpleDateFormat; -import java.util.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.SmartAppMsg; import com.iformall.enums.*; @@ -24,7 +24,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; @Service public class WxOrderPressServiceImpl implements WxOrderPressService { @@ -56,7 +59,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { @Override public WxOrderPress getById(Long id) { - return wxOrderPressMapper.selectByPrimaryKey(id); + return wxOrderPressMapper.selectById(id); } @Override @@ -65,15 +68,15 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxOrderPressMapper.insertSelective(record); + wxOrderPressMapper.insert(record); } else { - wxOrderPressMapper.updateByPrimaryKeySelective(record); + wxOrderPressMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxOrderPressMapper.deleteByPrimaryKey(id); + wxOrderPressMapper.deleteById(id); } @@ -86,7 +89,9 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { orderPressQ.setTenantId(order.getTenantId()); orderPressQ.setOrderId(order.getId()); orderPressQ.setUserId(cUserId); - int count = wxOrderPressMapper.selectCount(orderPressQ); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(orderPressQ); + int count = wxOrderPressMapper.selectCount(new QueryWrapper(queryWrapper)); if(count >= 1) { logger.error("用户已参与砍价: " + cUserId); throw new MallinkException(ErrorCode.COUPON_PRESS_IS_EXIST); @@ -107,7 +112,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { try { // 保存订单 - wxOrderPressMapper.insertSelective(orderPress); + wxOrderPressMapper.insert(orderPress); } catch (RuntimeException e) { logger.error("保存砍价记录Error:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -128,7 +133,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { orderUpdatePress.setUpdateDate(new Date()); try { // 保存订单 - wxOrderMapper.updateByPrimaryKeySelective(orderUpdatePress); + wxOrderMapper.updateById(orderUpdatePress); } catch (RuntimeException e) { logger.error("更新订单Error:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -146,7 +151,9 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { orderPressQ.setTenantId(order.getTenantId()); orderPressQ.setOrderId(order.getId()); orderPressQ.setUserId(cUserId); - int count = wxOrderPressMapper.selectCount(orderPressQ); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(orderPressQ); + int count = wxOrderPressMapper.selectCount(new QueryWrapper(queryWrapper)); if(count >= 1) { logger.info("用户已参与砍价: " + cUserId); return EnumOrderPressStatus.HAD_JOIN.getCode(); @@ -161,19 +168,19 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { */ private void sendPressComplateMsg(WxOrder orderUpdatePress) { // 1. get order info - WxOrder order = wxOrderMapper.selectByPrimaryKey(orderUpdatePress.getId()); + WxOrder order = wxOrderMapper.selectById(orderUpdatePress.getId()); if (order == null) { logger.error("找不到订单信息"); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } // 2. get coupon info - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(order.getProductId()); + WxCoupon coupon = wxCouponMapper.selectById(order.getProductId()); if (order == null) { logger.error("找不到券信息"); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); } // 3. get user info - WxCUser user = userMapper.selectByPrimaryKey(order.getCUserId()); + WxCUser user = userMapper.selectById(order.getCUserId()); if (user == null) { logger.error("找不到C端用户"); throw new MallinkException(ErrorCode.USER_IS_EMPTY); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 02e9de7e0..b52f549cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -126,13 +127,13 @@ public class WxOrderServiceImpl implements WxOrderService { @Override public ResultData microPayListOnDateAsPage(Long bUserId, Integer type, String date, Integer pageIndex, Integer pageSize) { - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId.longValue()); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(bUserId.longValue()); if (wxMerchantBUser == null) { logger.error("B端用户不存在:" + bUserId); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchantBUser.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(wxMerchantBUser.getMerchantId()); if (wxMerchant == null) { logger.error("商户不存在:" + bUserId); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); @@ -497,7 +498,7 @@ public class WxOrderServiceImpl implements WxOrderService { } WxCoupon coupon = null; try { - coupon = wxCouponMapper.selectByPrimaryKey(couponId); + coupon = wxCouponMapper.selectById(couponId); } catch (Exception e) { logger.error("券未找到, e:" + e.getMessage()); redisLock.unlock(couponIdStr, timeStr); @@ -545,7 +546,7 @@ public class WxOrderServiceImpl implements WxOrderService { } // 检查商户 - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(user.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(user.getMerchantId()); if (wxMerchant == null) { logger.error("商户不存在, merchantId: " + user.getMerchantId()); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); @@ -585,7 +586,7 @@ public class WxOrderServiceImpl implements WxOrderService { try { // 保存订单 - wxOrderMapper.insertSelective(record); + wxOrderMapper.insert(record); } catch (RuntimeException e) { logger.error("保存订单:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); @@ -621,7 +622,7 @@ public class WxOrderServiceImpl implements WxOrderService { try { // 保存订单 - wxOrderMapper.insertSelective(record); + wxOrderMapper.insert(record); } catch (RuntimeException e) { logger.error("保存订单:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); @@ -687,7 +688,7 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrder.setUpdateDate(curr); couponOrder.setCouponPrice(order.getPayment()); - wxCouponOrderMapper.insertSelective(couponOrder); + wxCouponOrderMapper.insert(couponOrder); /// 储值卡信息添加 if (isCard) { @@ -697,7 +698,7 @@ public class WxOrderServiceImpl implements WxOrderService { payOrderQ.setTenantId(user.getTenantId()); payOrderQ.setOrderId(order.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); - payOrder = wxPayOrderMapper.selectOne(payOrderQ); + payOrder = wxPayOrderMapper.selectOne(new QueryWrapper(payOrderQ)); } catch (Exception e) { logger.error("payOrder not found:" + e.getMessage()); } @@ -721,11 +722,11 @@ public class WxOrderServiceImpl implements WxOrderService { cardInfo.setSupportTransfer(coupon.getSupportTransfer()); //检查卡是否下架,如果是,不可转赠 - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(order.getCouponChannelId()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(order.getCouponChannelId()); if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); } - wxCardInfoMapper.insertSelective(cardInfo); + wxCardInfoMapper.insert(cardInfo); } return couponOrder; } @@ -736,7 +737,7 @@ public class WxOrderServiceImpl implements WxOrderService { // check 用户状态 WxCUser user = null; try { - user = wxCUserMapper.selectByPrimaryKey(userId); + user = wxCUserMapper.selectById(userId); } catch (Exception e) { logger.error("userId : " + userId + ", e: " + e.getMessage()); } @@ -747,7 +748,7 @@ public class WxOrderServiceImpl implements WxOrderService { // 检查券状态 String couponIdStr = String.valueOf(couponId); - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(couponId); + WxCoupon coupon = wxCouponMapper.selectById(couponId); if (coupon == null) { logger.error("券不存在, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); @@ -796,7 +797,7 @@ public class WxOrderServiceImpl implements WxOrderService { // 保存订单 try { - wxOrderMapper.insertSelective(record); + wxOrderMapper.insert(record); } catch (Exception e) { logger.error("保存订单:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_SAVE_ERR.getCode(), coupon.getTitle() + ErrorCode.ORDER_SAVE_ERR.getMessage()); @@ -819,13 +820,13 @@ public class WxOrderServiceImpl implements WxOrderService { public int couponOrderSuccess(WxOrder updateOrder) { Date currentDate = new Date(); // 检查券相关 - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(updateOrder.getProductId()); + WxCoupon coupon = wxCouponMapper.selectById(updateOrder.getProductId()); if (coupon == null) { logger.error("券不存在, couponId: " + updateOrder.getProductId()); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); } // 检查用户 - WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getCUserId()); + WxCUser user = wxCUserMapper.selectById(updateOrder.getCUserId()); if (user == null) { logger.error("用户不存在, userId: " + updateOrder.getCUserId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY); @@ -844,7 +845,7 @@ public class WxOrderServiceImpl implements WxOrderService { updateT.setUpdateDate(currentDate); int ret = 0; try { - ret = wxOrderMapper.updateByPrimaryKeySelective(updateT); + ret = wxOrderMapper.updateById(updateT); } catch (Exception e) { logger.error("订单更新失败:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR); @@ -875,7 +876,7 @@ public class WxOrderServiceImpl implements WxOrderService { @Override public void sendOrderSuccessActionMsg(WxOrder updateOrder) { // 检查券相关 - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(updateOrder.getProductId()); + WxCoupon coupon = wxCouponMapper.selectById(updateOrder.getProductId()); if (coupon == null) { logger.error("券不存在, couponId: " + updateOrder.getProductId()); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); @@ -885,7 +886,7 @@ public class WxOrderServiceImpl implements WxOrderService { throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); } // 检查用户 - WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getCUserId()); + WxCUser user = wxCUserMapper.selectById(updateOrder.getCUserId()); if (user == null) { logger.error("用户不存在, userId: " + updateOrder.getCUserId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY); @@ -949,19 +950,19 @@ public class WxOrderServiceImpl implements WxOrderService { public int microPayOrderSuccess(WxOrder updateOrder) { Date currentDate = new Date(); // C端用户 - WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getCUserId()); + WxCUser user = wxCUserMapper.selectById(updateOrder.getCUserId()); if (user == null) { logger.error("用户不存在, userId: " + updateOrder.getCUserId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY); } // B端用户 - WxMerchantBUser bUser = wxMerchantBUserMapper.selectByPrimaryKey(updateOrder.getProductId()); + WxMerchantBUser bUser = wxMerchantBUserMapper.selectById(updateOrder.getProductId()); if (bUser == null) { logger.error("B端用户不存在, bUserId: " + updateOrder.getProductId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY); } // 基于B端User查找merchant - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(bUser.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(bUser.getMerchantId()); if (wxMerchant == null) { logger.error("商户不存在, merchantId: " + bUser.getMerchantId()); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); @@ -972,7 +973,7 @@ public class WxOrderServiceImpl implements WxOrderService { updateOrder.setUpdateDate(currentDate); int ret = 0; try { - ret = wxOrderMapper.updateByPrimaryKey(updateOrder); + ret = wxOrderMapper.updateById(updateOrder); } catch (Exception e) { logger.error("订单更新失败:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR); @@ -995,7 +996,7 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setTenantId(user.getTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); if (updateOrder.getCouponChannelId() != null) { - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(updateOrder.getCouponChannelId()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId()); creditHistory.setCouponId(wxCouponChannel.getCouponId()); } creditHistory.setBusinessId(wxMerchant.getBusinessId()); @@ -1058,7 +1059,7 @@ public class WxOrderServiceImpl implements WxOrderService { refOrder.setUpdateDate(currentDate); int ret = 0; try { - ret = wxOrderMapper.updateByPrimaryKeySelective(refOrder); + ret = wxOrderMapper.updateById(refOrder); } catch (Exception e) { logger.error("订单状态更新失败, e:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR); @@ -1116,7 +1117,7 @@ public class WxOrderServiceImpl implements WxOrderService { payOrderQ.setTenantId(order.getTenantId()); payOrderQ.setOrderId(order.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); - List payOrders = wxPayOrderMapper.select(payOrderQ); + List payOrders = wxPayOrderMapper.selectList(new QueryWrapper(payOrderQ)); // 3. wx pay order close for (WxPayOrder payOrder : payOrders) { @@ -1133,7 +1134,7 @@ public class WxOrderServiceImpl implements WxOrderService { @Override public WxOrder getById(Long id) { - return wxOrderMapper.selectByPrimaryKey(id); + return wxOrderMapper.selectById(id); } @Override @@ -1142,15 +1143,15 @@ public class WxOrderServiceImpl implements WxOrderService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxOrderMapper.insertSelective(record); + wxOrderMapper.insert(record); } else { - wxOrderMapper.updateByPrimaryKeySelective(record); + wxOrderMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxOrderMapper.deleteByPrimaryKey(id); + wxOrderMapper.deleteById(id); } @Override @@ -1178,9 +1179,9 @@ public class WxOrderServiceImpl implements WxOrderService { wxPayOrder.setId(payOrderId); wxPayOrder.setOrderId(orderId); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); - wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); - WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(wxOrder.getProductId()); + wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); + WxOrder wxOrder = wxOrderMapper.selectById(orderId); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(wxOrder.getProductId()); if (wxPayOrder != null && wxMerchantBUser != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { @@ -1464,7 +1465,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setCreateDate(curr); record.setUpdateDate(curr); // 保存订单 - wxOrderMapper.insertSelective(record); + wxOrderMapper.insert(record); } private void userCouponMerchantCheck(WxCUser user, WxCoupon coupon) throws MallinkException { @@ -1593,7 +1594,7 @@ public class WxOrderServiceImpl implements WxOrderService { orderPress.setFirst(EnumOrderPressType.FIRST.getCode()); int lPressValue = PressUtils.stateLessPressValue(total, left_total, coupon.getPressLimitNum(), 0); orderPress.setPressValue(lPressValue); - wxOrderPressMapper.insertSelective(orderPress); + wxOrderPressMapper.insert(orderPress); // 更新订单砍价信息 WxOrder orderUpdatePress = new WxOrder(); orderUpdatePress.setId(record.getId()); @@ -1601,7 +1602,7 @@ public class WxOrderServiceImpl implements WxOrderService { orderUpdatePress.setPressCurrentValue(left_total - orderPress.getPressValue()); orderUpdatePress.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); orderUpdatePress.setUpdateDate(new Date()); - wxOrderMapper.updateByPrimaryKeySelective(orderUpdatePress); + wxOrderMapper.updateById(orderUpdatePress); } private Long saveNoFreeOrder(WxOrder record, WxCUser user, WxCoupon coupon, boolean isPress) { @@ -1639,12 +1640,12 @@ public class WxOrderServiceImpl implements WxOrderService { record.setPressEndDate(pressEndDate); record.setPressCurrentValue(coupon.getPrice() - coupon.getSalePrice()); } - wxOrderMapper.insertSelective(record); + wxOrderMapper.insert(record); return orderNumber; } private void checkOrderGroup(WxCUser user, Long orderGroupId) { - WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); + WxOrderGroup group = wxOrderGroupMapper.selectById(orderGroupId); if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { logger.error("下订单拼团人数已满>>>" + orderGroupId); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); @@ -1653,7 +1654,7 @@ public class WxOrderServiceImpl implements WxOrderService { order.setOrderGroupId(group.getId()); order.setCUserId(user.getId()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); - long count = wxOrderMapper.selectCount(order); + long count = wxOrderMapper.selectCount(new QueryWrapper(order)); if (count > 0) { logger.error("重复的拼团>>>" + orderGroupId); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_UNPAID); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java index fa1f93781..51a9f1095 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java @@ -27,7 +27,7 @@ public class WxParkServiceImpl implements WxParkService { @Override public WxPark getById(Long id) { - return wxParkMapper.selectByPrimaryKey(id); + return wxParkMapper.selectById(id); } @Override @@ -44,15 +44,15 @@ public class WxParkServiceImpl implements WxParkService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxParkMapper.insertSelective(record); + wxParkMapper.insert(record); } else { - wxParkMapper.updateByPrimaryKeySelective(record); + wxParkMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxParkMapper.deleteByPrimaryKey(id); + wxParkMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java index 0e9f4d71e..ccac8df3d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -26,14 +27,14 @@ public class WxPayAccountBillServiceImpl implements WxPayAccountBillService { @Override public WxPayAccountBill getById(Long id) { - return wxPayAccountBillMapper.selectByPrimaryKey(id); + return wxPayAccountBillMapper.selectById(id); } @Override public WxPayAccountBill getByTenantId(String tenantId) { WxPayAccountBill payAccountBillQ = new WxPayAccountBill(); payAccountBillQ.setTenantId(tenantId); - return wxPayAccountBillMapper.selectOne(payAccountBillQ); + return wxPayAccountBillMapper.selectOne(new QueryWrapper(payAccountBillQ)); } @Override @@ -42,15 +43,15 @@ public class WxPayAccountBillServiceImpl implements WxPayAccountBillService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxPayAccountBillMapper.insertSelective(record); + wxPayAccountBillMapper.insert(record); } else { - wxPayAccountBillMapper.updateByPrimaryKeySelective(record); + wxPayAccountBillMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxPayAccountBillMapper.deleteByPrimaryKey(id); + wxPayAccountBillMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java index 761c77a6a..dfc86df20 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java @@ -26,7 +26,7 @@ public class WxPayAccountServiceImpl implements WxPayAccountService { @Override public WxPayAccount getById(Long id) { - return wxPayAccountMapper.selectByPrimaryKey(id); + return wxPayAccountMapper.selectById(id); } @Override @@ -35,15 +35,15 @@ public class WxPayAccountServiceImpl implements WxPayAccountService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxPayAccountMapper.insertSelective(record); + wxPayAccountMapper.insert(record); } else { - wxPayAccountMapper.updateByPrimaryKeySelective(record); + wxPayAccountMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxPayAccountMapper.deleteByPrimaryKey(id); + wxPayAccountMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index be45ebdb1..3d6a0345b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -2,11 +2,15 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxBillSettle; +import com.iformall.domain.po.WxPayAccountBill; +import com.iformall.domain.po.WxPayBill; import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -115,7 +119,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { return new ResultData(ErrorCode.BILL_OWE_ZERO); } //获取支付账户信息 - WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appInfo.getPayBillId()); + WxPayAccountBill payAccount = wxPayAccountBillMapper.selectById(appInfo.getPayBillId()); Date currentDate = new Date(); String payBillNo; WxPayBill billParam= new WxPayBill(); @@ -141,7 +145,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); record.setShare(isShare.getCode()); - int sqlRow = wxPayBillMapper.insertSelective(record); + int sqlRow = wxPayBillMapper.insert(record); if (sqlRow != 1) { logger.error("pay bill insert error: " + JSONObject.toJSONString(record)); throw new MallinkException(ErrorCode.DB_FAIL); @@ -154,7 +158,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { //更新订单状态为支付中 wxPayBill.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); wxPayBill.setUpdateTime(currentDate); - int sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(wxPayBill); + int sqlRow = wxPayBillMapper.updateById(wxPayBill); if (sqlRow != 1) { logger.error("pay bill update error: " + wxPayBill.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -168,7 +172,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { if(resultData.code!=Result.SUCCESS){ return new ResultData(ErrorCode.ORDER_IS_FAIL); } - record=wxPayBillMapper.selectByPrimaryKey(wxPayBill.getId()); + record = wxPayBillMapper.selectById(wxPayBill.getId()); record.setOpenId(openId); //创建新的订单号 payBillNo = record.getId()+DateUtils.getSystemTime("yyMMddHHmmss"); @@ -178,7 +182,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setPayBillNo(payBillNo); record.setPayAmount((Long) bill.get("owe")); record.setUpdateTime(currentDate); - sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(record); + sqlRow = wxPayBillMapper.updateById(record); if (sqlRow != 1) { logger.error("pay bill update error: " + JSONObject.toJSONString(record)); throw new MallinkException(ErrorCode.DB_FAIL); @@ -192,7 +196,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { if (resultData.code != Result.SUCCESS) { return new ResultData(ErrorCode.ORDER_IS_FAIL); } - record = wxPayBillMapper.selectByPrimaryKey(wxPayBill.getId()); + record = wxPayBillMapper.selectById(wxPayBill.getId()); //创建新的订单号 payBillNo = record.getId() + DateUtils.getSystemTime("yyMMddHHmmss"); record.setPayTimeStart(currentDate); @@ -201,7 +205,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setPayBillNo(payBillNo); record.setPayAmount((Long) bill.get("owe")); record.setUpdateTime(currentDate); - sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(record); + sqlRow = wxPayBillMapper.updateById(record); if (sqlRow != 1) { logger.error("pay bill update error: " + JSONObject.toJSONString(record)); throw new MallinkException(ErrorCode.DB_FAIL); @@ -233,7 +237,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { if(resultData.code!=Result.SUCCESS){ return new ResultData(ErrorCode.ORDER_IS_FAIL); } - record=wxPayBillMapper.selectByPrimaryKey(wxPayBill.getId()); + record = wxPayBillMapper.selectById(wxPayBill.getId()); //创建新的订单号 payBillNo = record.getId()+DateUtils.getSystemTime("yyMMddHHmmss"); record.setPayTimeStart(currentDate); @@ -242,7 +246,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setPayBillNo(payBillNo); record.setPayAmount((Long) bill.get("owe")); record.setUpdateTime(currentDate); - sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(record); + sqlRow = wxPayBillMapper.updateById(record); if (sqlRow != 1) { logger.error("pay bill update error: " + JSONObject.toJSONString(record)); throw new MallinkException(ErrorCode.DB_FAIL); @@ -293,7 +297,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setPrepayId(prepay_id); record.setUpdateTime(new Date()); try { - wxPayBillMapper.updateByPrimaryKeySelective(record); + wxPayBillMapper.updateById(record); } catch (Exception e) { logger.error("pay bill update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -334,7 +338,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { } record.setUpdateTime(new Date()); try { - wxPayBillMapper.updateByPrimaryKeySelective(record); + wxPayBillMapper.updateById(record); } catch (Exception e) { logger.error("pay bill update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -345,7 +349,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { private String wechatPayBillQuery(WxAppinfo appInfo, WxPayBill record) { // get payAccount - WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appInfo.getPayBillId()); + WxPayAccountBill payAccount = wxPayAccountBillMapper.selectById(appInfo.getPayBillId()); if (payAccount.getType().equals(EnumPayMode.MCH.getCode())) { // 普通商户号模式 WxPayOrderQ payBillQ = new WxPayOrderQ(); @@ -442,7 +446,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { private String wechatPayBillClose(WxAppinfo appInfo, WxPayBill record) { // get payAccount - WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appInfo.getPayBillId()); + WxPayAccountBill payAccount = wxPayAccountBillMapper.selectById(appInfo.getPayBillId()); if (payAccount.getType().equals(EnumPayMode.MCH.getCode())) { // 普通商户号模式 WxPayOrderQ payBillC = new WxPayOrderQ(); @@ -510,7 +514,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { if ("SUCCESS".equals(result_code)) { try { record.setPayBillStatus(EnumPayStatus.PAY_STATUS_CANCEL.getCode()); - wxPayBillMapper.updateByPrimaryKeySelective(record); + wxPayBillMapper.updateById(record); } catch (Exception e) { logger.error("pay bill update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -527,7 +531,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayBillMapper.updateByPrimaryKeySelective(record); + wxPayBillMapper.updateById(record); } catch (Exception e) { logger.error("pay bill update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -577,7 +581,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { isNormal = false; } - WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appinfo.getPayBillId()); + WxPayAccountBill payAccount = wxPayAccountBillMapper.selectById(appinfo.getPayBillId()); if (payAccount == null) { throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); } @@ -612,7 +616,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { String payBillNo = paramMap.get("out_trade_no"); String timEndStr = paramMap.get("time_end"); Long payBillId = Long.valueOf(payBillNo.substring(0,payBillNo.length()-12)); - WxPayBill payBill = wxPayBillMapper.selectByPrimaryKey(payBillId); + WxPayBill payBill = wxPayBillMapper.selectById(payBillId); if (payBill == null) { logger.warn("notify bill, wxpay check pay bill not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); @@ -661,14 +665,14 @@ public class WxPayBillServiceImpl implements WxPayBillService { @Override public WxPayBill getById(Long id) { - return wxPayBillMapper.selectByPrimaryKey(id); + return wxPayBillMapper.selectById(id); } @Override public void updatePayBillStatus(WxPayBill payBill) { try { logger.info("更新支付订单"); - wxPayBillMapper.updateByPrimaryKeySelective(payBill); + wxPayBillMapper.updateById(payBill); }catch (MallinkException e){ logger.info("更新支付订单失败"); throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR); @@ -677,7 +681,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { @Override public WxPayBill queryPayBill(WxPayBill payBill) { - List select = wxPayBillMapper.select(payBill); + List select = wxPayBillMapper.selectList(new QueryWrapper(payBill)); if(select.size()>0){ return select.get(0); } @@ -695,7 +699,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { try { record.setUpdateTime(currentDate); record.setTransactionId(transactionId); - wxPayBillMapper.updateByPrimaryKeySelective(record); + wxPayBillMapper.updateById(record); WxBillAll wxBillAll = new WxBillAll(); wxBillAll.setId(record.getBillId()); List> bills = wxBillAllMapper.listData(wxBillAll); @@ -729,7 +733,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { updateBill.setPayBillStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); updateBill.setTransactionId(transactionId); try { - wxPayBillMapper.updateByPrimaryKeySelective(updateBill); + wxPayBillMapper.updateById(updateBill); } catch (Exception e) { logger.error("支付订单数据库更新失败: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); @@ -768,7 +772,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { WxAppinfo appinfoQ = new WxAppinfo(); appinfoQ.setTenantId(bill.get("tenantId").toString()); appinfoQ.setType(EnumAppType.B.getCode()); - List appList = wxAppinfoMapper.select(appinfoQ); + List appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); if (appList.size() > 0) { appInfo = appList.get(0); } @@ -780,7 +784,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { payBillQ.setBillId(record.getBillId()); WxPayBill updateBill; try { - updateBill = wxPayBillMapper.selectOne(payBillQ); + updateBill = wxPayBillMapper.selectOne(new QueryWrapper(payBillQ)); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); @@ -792,7 +796,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { payBillQ = new WxPayBill(); payBillQ.setTenantId(bill.get("tenantId").toString()); payBillQ.setBillId(record.getBillId()); - List payBills = wxPayBillMapper.select(payBillQ); + List payBills = wxPayBillMapper.selectList(new QueryWrapper(payBillQ)); for (WxPayBill payBill : payBills) { if(payBill.getPayTimeEnd().before(new Date())){ payBillClose(appInfo, payBill); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 003c319d5..b18e7117f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -113,7 +114,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { try { // 1. check 订单 - WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + WxOrder order = wxOrderMapper.selectById(record.getOrderId()); if (order == null) { logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); @@ -127,14 +128,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { orderParams.setOrderGroupId(order.getOrderGroupId()); orderParams.setCUserId(user.getId()); orderParams.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); - int count = wxOrderMapper.selectCount(orderParams); + int count = wxOrderMapper.selectCount(new QueryWrapper(orderParams)); if (count > 0) { logger.error("重复的拼团>>>" + order); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_ATTEND); } } - WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(order.getProductId()); + WxCoupon wxCoupon = wxCouponMapper.selectById(order.getProductId()); if (wxCoupon.getType().equals(EnumCouponType.COUPON_GROUP.getCode()) && wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) { logger.error("券已经下架了>>>" + order.getProductId()); @@ -167,7 +168,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (order.getPaymentType() != EnumPayType.PAY_PAYMENT.getCode()) { return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.getShare().intValue() > 0) { isShare = EnumPayShare.YES; } @@ -177,7 +178,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { WxPayOrder payOrderParams = new WxPayOrder(); payOrderParams.setOrderId(order.getId()); payOrderParams.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); - int count = wxPayOrderMapper.selectCount(payOrderParams); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(payOrderParams); + int count = wxPayOrderMapper.selectCount(new QueryWrapper(queryWrapper)); if (count > 0) { logger.error("已支付>>>" + order); throw new MallinkException(ErrorCode.PAY_ORDER_EXIST); @@ -239,7 +242,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } - int sqlRow = wxPayOrderMapper.insertSelective(record); + int sqlRow = wxPayOrderMapper.insert(record); if (sqlRow != 1) { logger.error("pay order insert error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -279,7 +282,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setPrepayId(prepay_id); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -311,7 +314,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -359,7 +362,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setPrepayId(prepay_id); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -392,7 +395,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -417,7 +420,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { try { // 1. check 订单 - WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + WxOrder order = wxOrderMapper.selectById(record.getOrderId()); if (order == null) { logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); @@ -429,7 +432,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (order.getPaymentType() != EnumPayType.PAY_PAYMENT.getCode()) { return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.getShare().intValue() > 0) { isShare = EnumPayShare.YES; } @@ -472,7 +475,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } - int sqlRow = wxPayOrderMapper.insertSelective(record); + int sqlRow = wxPayOrderMapper.insert(record); if (sqlRow != 1) { logger.error("pay order insert error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -527,7 +530,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -539,7 +542,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -598,7 +601,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -610,7 +613,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -628,7 +631,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { private String wechatPayOrderQuery(WxAppinfo appInfo, WxPayOrder record) { // get payAccount - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.getType() == EnumPayMode.MCH.getCode()) { // 普通商户号模式 WxPayOrderQ payOrderQ = new WxPayOrderQ(); @@ -686,14 +689,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (StringUtils.isBlank(record.getPayOrderNo())) record.setPayOrderNo(String.valueOf(record.getId())); - WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(record.getId()); + WxPayOrder payOrder = wxPayOrderMapper.selectById(record.getId()); if (payOrder != null) { record.setPayOrderStatus(payOrder.getPayOrderStatus()); } else { return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), "payOrder not found"); } - WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + WxOrder order = wxOrderMapper.selectById(record.getOrderId()); if (order == null) { return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), "Order not found"); } @@ -764,7 +767,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -776,7 +779,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -794,7 +797,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { private String wechatPayOrderClose(WxAppinfo appInfo, WxPayOrder record) { // get payAccount - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.getType() == EnumPayMode.MCH.getCode()) { // 普通商户号模式 WxPayOrderQ payOrderC = new WxPayOrderQ(); @@ -861,7 +864,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_CANCEL.getCode()); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order 关单:{} 成功", record.getId()); } @@ -877,7 +880,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -889,7 +892,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -905,7 +908,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { private String wechatPayOrderReverse(WxAppinfo appInfo, WxPayOrder record) { // get payAccount - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.getType() == EnumPayMode.MCH.getCode()) { // 普通商户号模式 WxPayOrderQ payOrderC = new WxPayOrderQ(); @@ -974,7 +977,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_REVERSE.getCode()); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -985,7 +988,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); order.setUpdateDate(new Date()); try { - wxOrderMapper.updateByPrimaryKeySelective(order); + wxOrderMapper.updateById(order); } catch (Exception e) { logger.error("order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -1002,7 +1005,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -1014,7 +1017,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -1064,7 +1067,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { isNormal = false; } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appinfo.getPayId()); if (payAccount == null) { throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); } @@ -1099,7 +1102,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { String payOrderNo = paramMap.get("out_trade_no"); String timEndStr = paramMap.get("time_end"); Long payOrderId = Long.valueOf(payOrderNo); - WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); + WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId); if (payOrder == null) { logger.warn("notify order, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); @@ -1159,7 +1162,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { updateT.setId(record.getId()); updateT.setUpdateTime(currentDate); updateT.setTransactionId(transactionId); - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -1171,7 +1174,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { "is paid success , orderId : " + record.getOrderId()); return; } - WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + WxOrder order = wxOrderMapper.selectById(record.getOrderId()); if (order == null) { logger.error("pay success handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); @@ -1187,14 +1190,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { updateOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); updateOrder.setTransactionId(transactionId); try { - wxPayOrderMapper.updateByPrimaryKeySelective(updateOrder); + wxPayOrderMapper.updateById(updateOrder); } catch (Exception e) { logger.error("支付订单数据库更新失败: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); } Long productId = order.getProductId(); - WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(productId); + WxCoupon wxCoupon = wxCouponMapper.selectById(productId); if(wxCoupon != null) { if (isOrderGroupCoupon(record, wxCoupon)) { // 如果是Coupon是拼团, 创建拼团信息, 不创建COUPON_ORDER @@ -1204,7 +1207,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("参团失败" + e.getMessage()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); order.setUpdateDate(new Date()); - wxOrderMapper.updateByPrimaryKeySelective(order); + wxOrderMapper.updateById(order); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); } } else { @@ -1242,7 +1245,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setUpdateTime(currentDate); record.setTransactionId(transactionId); record.setFailReason(""); - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("更新transactionId: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -1255,7 +1258,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return; } - WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + WxOrder order = wxOrderMapper.selectById(record.getOrderId()); if (order == null) { logger.error("pay success handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); @@ -1301,7 +1304,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { updateOrder.setTransactionId(transactionId); updateOrder.setFailReason(""); try { - wxPayOrderMapper.updateByPrimaryKeySelective(updateOrder); + wxPayOrderMapper.updateById(updateOrder); } catch (Exception e) { logger.error("支付订单数据库更新失败: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); @@ -1362,13 +1365,13 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { "is complete, orderId : " + record.getOrderId()); return; } - WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + WxOrder order = wxOrderMapper.selectById(record.getOrderId()); if (order == null) { logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } if (order.getType().equals(EnumOrderType.COUPON.getCode())) { - WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); + WxCUser user = wxCUserMapper.selectById(order.getCUserId()); if (user == null) { logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); throw new MallinkException(ErrorCode.USER_IS_EMPTY); @@ -1415,7 +1418,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { // 支付订单未成功,返回异常 record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_FAIL.getCode()); try { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } catch (Exception e) { logger.error("支付订单失败状态更新异常: " + e.getMessage()); } @@ -1474,13 +1477,13 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override public void handlePayOrderStatusUpdateFree(WxPayOrder record) { //检查数据合理性 - WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + WxOrder order = wxOrderMapper.selectById(record.getOrderId()); if (order == null) { logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } if (order.getType().equals(EnumOrderType.COUPON.getCode())) { - WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); + WxCUser user = wxCUserMapper.selectById(order.getCUserId()); if (user == null) { logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); throw new MallinkException(ErrorCode.USER_IS_EMPTY); @@ -1493,7 +1496,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { WxAppinfo appinfoQ = new WxAppinfo(); appinfoQ.setTenantId(tenentId); appinfoQ.setType(EnumAppType.C.getCode()); - List appList = wxAppinfoMapper.select(appinfoQ); + List appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); if (appList.size() > 0) { appInfo = appList.get(0); } @@ -1508,7 +1511,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override public WxPayOrder getById(Long id) { - return wxPayOrderMapper.selectByPrimaryKey(id); + return wxPayOrderMapper.selectById(id); } @Override @@ -1526,14 +1529,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxPayOrderMapper.insertSelective(record); + wxPayOrderMapper.insert(record); } else { - wxPayOrderMapper.updateByPrimaryKeySelective(record); + wxPayOrderMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxPayOrderMapper.deleteByPrimaryKey(id); + wxPayOrderMapper.deleteById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java index 83c0aa9e7..0c6df8fe8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -42,7 +43,7 @@ public class WxPowerBillAutoConfigServiceImpl implements WxPowerBillAutoConfigSe public WxPowerBillAutoConfig getConfig(String tenantId) { WxPowerBillAutoConfig wxPowerBillAutoConfig = new WxPowerBillAutoConfig(); wxPowerBillAutoConfig.setTenantId(tenantId); - return wxPowerBillAutoConfigMapper.selectOne(wxPowerBillAutoConfig); + return wxPowerBillAutoConfigMapper.selectOne(new QueryWrapper(wxPowerBillAutoConfig)); } @Override @@ -54,10 +55,10 @@ public class WxPowerBillAutoConfigServiceImpl implements WxPowerBillAutoConfigSe config.setId(idWorker.nextId()); config.setCreateDate(date); config.setUpdateDate(date); - wxPowerBillAutoConfigMapper.insertSelective(config); + wxPowerBillAutoConfigMapper.insert(config); } else { config.setUpdateDate(date); - wxPowerBillAutoConfigMapper.updateByPrimaryKeySelective(config); + wxPowerBillAutoConfigMapper.updateById(config); } return new ResultData(config); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java index a3b13c391..9ef819a19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java @@ -45,18 +45,18 @@ public class WxPrepaymentServiceImpl implements WxPrepaymentService { wxPrepayment.setId(idWorker.nextId()); wxPrepayment.setTotalAmount(wxPrepayment.getLastPayAmount()); wxPrepayment.setRemainAmount(wxPrepayment.getLastPayAmount()); - wxPrepaymentMapper.insertSelective(wxPrepayment); + wxPrepaymentMapper.insert(wxPrepayment); addPrepaymentHistory(wxPrepayment); } @Override public void payAgain(WxPrepayment record) { - WxPrepayment wxPrepayment = wxPrepaymentMapper.selectByPrimaryKey(record.getId()); + WxPrepayment wxPrepayment = wxPrepaymentMapper.selectById(record.getId()); long remainAmout = wxPrepayment.getRemainAmount() + record.getLastPayAmount(); long totalAmount = wxPrepayment.getTotalAmount() + record.getLastPayAmount(); wxPrepayment.setRemainAmount(remainAmout); wxPrepayment.setTotalAmount(totalAmount); - wxPrepaymentMapper.updateByPrimaryKeySelective(wxPrepayment); + wxPrepaymentMapper.updateById(wxPrepayment); addPrepaymentHistory(wxPrepayment); } @@ -71,7 +71,7 @@ public class WxPrepaymentServiceImpl implements WxPrepaymentService { wxPrepaymentHistory.setRemainAmount(wxPrepayment.getRemainAmount()); wxPrepaymentHistory.setOperationType(wxPrepayment.getOperationType()); wxPrepaymentHistory.setOperator(wxPrepayment.getOperator()); - wxPrepaymentHistoryMapper.insertSelective(wxPrepaymentHistory); + wxPrepaymentHistoryMapper.insert(wxPrepaymentHistory); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 40ce54dad..287f7044a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -104,12 +105,12 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ private WxAppinfo getAppinfo(Long cUserId) { WxAppinfo wxAppinfo = new WxAppinfo(); - WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(cUserId); + WxCUser wxCUser = wxCUserMapper.selectById(cUserId); if (wxCUser == null) throw new MallinkException(ErrorCode.USER_IS_EMPTY); wxAppinfo.setAppId(wxCUser.getAppId()); - wxAppinfo = wxAppinfoMapper.selectOne(wxAppinfo); + wxAppinfo = wxAppinfoMapper.selectOne(new QueryWrapper(wxAppinfo)); if (wxAppinfo == null) throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); @@ -127,9 +128,9 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(sharingOrder.getOrderId()); + WxPayOrder payOrder = wxPayOrderMapper.selectById(sharingOrder.getOrderId()); WxAppinfo appInfo = getAppinfo(payOrder.getCUserId()); - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); List receivers; @@ -189,7 +190,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_REQ_FAILED.getCode()); sharingOrder.setErrorMsg("REDO:"+ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getMessage()); sharingOrder.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(sharingOrder); + wxProfitSharingOrderMapper.updateById(sharingOrder); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED); } @@ -201,14 +202,14 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_REQ_FAILED.getCode()); sharingOrder.setErrorMsg("REDO:"+returnMap.get("return_msg")); sharingOrder.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(sharingOrder); + wxProfitSharingOrderMapper.updateById(sharingOrder); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(), returnMap.get("return_msg")); } if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ sharingOrder.setErrorMsg("REDO:"+ErrorCode.PROFIT_SHARING_RETURN_INVALID.getMessage()); sharingOrder.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(sharingOrder); + wxProfitSharingOrderMapper.updateById(sharingOrder); return new ResultData(ErrorCode.PROFIT_SHARING_RETURN_INVALID.getCode()); } @@ -217,7 +218,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); sharingOrder.setUpdateTime(new Date()); sharingOrder.setErrorMsg("REDO:"+returnMap.get("err_code_des")); - wxProfitSharingOrderMapper.updateByPrimaryKey(sharingOrder); + wxProfitSharingOrderMapper.updateById(sharingOrder); return new ResultData(ErrorCode.PROFIT_SHARING_APPLY_FAILED.getCode(), returnMap.get("err_code_des")); } @@ -225,9 +226,9 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); sharingOrder.setErrorMsg("REDO:重试分账成功"); sharingOrder.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(sharingOrder); + wxProfitSharingOrderMapper.updateById(sharingOrder); for (WxProfitSharingResult result:resultList) { - wxProfitSharingResultMapper.insertSelective(result); + wxProfitSharingResultMapper.insert(result); } return new ResultData(returnMap); @@ -245,7 +246,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } WxAppinfo appInfo = getAppinfo(sharingOrderDto.getCUserId()); - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); //准备分账列表 WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver(); @@ -293,7 +294,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingOrder record = new WxProfitSharingOrder(); record.setOrderId(sharingOrderDto.getOrderId()); - record = wxProfitSharingOrderMapper.selectOne(record); + record = wxProfitSharingOrderMapper.selectOne(new QueryWrapper(record)); if (record == null) { //创建分账订单 Date currentDate = new Date(); @@ -311,7 +312,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setPayTimeEnd(sharingOrderDto.getPayTimeEnd()); record.setType(sharingOrderDto.getType()); - wxProfitSharingOrderMapper.insertSelective(record); + wxProfitSharingOrderMapper.insert(record); } @@ -358,7 +359,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ psCmd.setReceivers(receivers.toJSONString()); record.setReceivers(receivers.toJSONString()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); String response; try { @@ -375,7 +376,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_REQ_FAILED.getCode()); record.setErrorMsg(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getMessage()); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED); } @@ -387,14 +388,14 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_REQ_FAILED.getCode()); record.setErrorMsg(returnMap.get("return_msg")); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(), returnMap.get("return_msg")); } if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ record.setErrorMsg(ErrorCode.PROFIT_SHARING_RETURN_INVALID.getMessage()); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_RETURN_INVALID.getCode()); } @@ -403,16 +404,16 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); record.setUpdateTime(new Date()); record.setErrorMsg(returnMap.get("err_code_des")); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_APPLY_FAILED.getCode(), returnMap.get("err_code_des")); } record.setSharingOrderNo(returnMap.get("order_id")); record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); for (WxProfitSharingResult result:resultList) { - wxProfitSharingResultMapper.insertSelective(result); + wxProfitSharingResultMapper.insert(result); } return new ResultData(returnMap); @@ -427,24 +428,24 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxAppinfo appInfo; if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()) ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode())){ - WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); + WxPayOrder wxPayOrder = wxPayOrderMapper.selectById(wxProfitSharingOrder.getOrderId()); if (wxPayOrder == null) return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); appInfo = getAppinfo(wxPayOrder.getCUserId()); } else if(wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()) ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode())){ - WxCardSpend wxCardSpend = wxCardSpendMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); + WxCardSpend wxCardSpend = wxCardSpendMapper.selectById(wxProfitSharingOrder.getOrderId()); if (wxCardSpend == null) return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); appInfo = getAppinfo(wxCardSpend.getOwnerId()); } else { return new ResultData(ErrorCode.PROFIT_SHARING_QUERY_UNKNOWN_TYPE); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); //是否已创建分账订单 record.setOrderId(wxProfitSharingOrder.getOrderId()); - record = wxProfitSharingOrderMapper.selectOne(record); + record = wxProfitSharingOrderMapper.selectOne(new QueryWrapper(record)); if (record == null) return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); @@ -485,7 +486,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setSharingStatus((Integer) statusMap.get(returnMap.get("status"))); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); String receivers = returnMap.get("receivers"); @@ -508,7 +509,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ for (i = 0; i < wxProfitSharingResultList.size(); i++) { WxProfitSharingResult wxProfitSharingResult = wxProfitSharingResultList.get(i); WxProfitSharingReceiver wxProfitSharingReceiver = wxProfitSharingReceiverMapper - .selectByPrimaryKey(wxProfitSharingResult.getSharingReceiverId()); + .selectById(wxProfitSharingResult.getSharingReceiverId()); if (wxProfitSharingReceiver == null) continue; if (res.getString("type").equals(EnumProfitSharingReceiverType.getEnum(wxProfitSharingReceiver.getReceiverType()).getMessage()) @@ -518,7 +519,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ wxProfitSharingResult.setSharingStatus(resultStatusMap.getIntValue(res.getString("result"))); wxProfitSharingResult.setFailedReason(res.getString("fail_reason")); wxProfitSharingResult.setDescription(des.toJSONString()); - wxProfitSharingResultMapper.updateByPrimaryKey(wxProfitSharingResult); + wxProfitSharingResultMapper.updateById(wxProfitSharingResult); break; } } @@ -543,12 +544,12 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ wxProfitSharingResult.setDescription(des.toJSONString()); if (wxProfitSharingResult.getId() != null) { wxProfitSharingResult.setUpdateTime(new Date()); - wxProfitSharingResultMapper.updateByPrimaryKeySelective(wxProfitSharingResult); + wxProfitSharingResultMapper.updateById(wxProfitSharingResult); } else { wxProfitSharingResult.setCreateTime(new Date()); wxProfitSharingResult.setUpdateTime(new Date()); wxProfitSharingResult.setId(IdWorker.get().nextId()); - wxProfitSharingResultMapper.insertSelective(wxProfitSharingResult); + wxProfitSharingResultMapper.insert(wxProfitSharingResult); } } } @@ -569,7 +570,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } WxAppinfo appInfo = getAppinfo(sharingOrderDto.getCUserId()); - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); //分账检查是否已创建分账订单 @@ -588,7 +589,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setPayTimeStart(sharingOrderDto.getPayTimeStart()); record.setPayTimeEnd(sharingOrderDto.getPayTimeEnd()); record.setType(sharingOrderDto.getType()); - wxProfitSharingOrderMapper.insertSelective(record); + wxProfitSharingOrderMapper.insert(record); //分账提交 WxProfitSharingFinishP psFCmd = new WxProfitSharingFinishP(); @@ -611,7 +612,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_REQ_FAILED.getCode()); record.setErrorMsg(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getMessage()); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED); } @@ -623,14 +624,14 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_REQ_FAILED.getCode()); record.setErrorMsg(returnMap.get("return_msg")); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(), returnMap.get("return_msg")); } if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ record.setErrorMsg(ErrorCode.PROFIT_SHARING_RETURN_INVALID.getMessage()); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_RETURN_INVALID.getCode()); } @@ -639,14 +640,14 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); record.setUpdateTime(new Date()); record.setErrorMsg(returnMap.get("err_code_des")); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(ErrorCode.PROFIT_SHARING_APPLY_FAILED.getCode(), returnMap.get("err_code_des")); } record.setSharingOrderNo(returnMap.get("order_id")); record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateByPrimaryKey(record); + wxProfitSharingOrderMapper.updateById(record); return new ResultData(returnMap); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index 9e3434863..796d9e227 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -70,7 +71,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv @Override public WxProfitSharingReceiver getById(Long id) { - return wxProfitSharingReceiverMapper.selectByPrimaryKey(id); + return wxProfitSharingReceiverMapper.selectById(id); } @Override @@ -79,15 +80,15 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxProfitSharingReceiverMapper.insertSelective(record); + wxProfitSharingReceiverMapper.insert(record); } else { - wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(record); + wxProfitSharingReceiverMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxProfitSharingReceiverMapper.deleteByPrimaryKey(id); + wxProfitSharingReceiverMapper.deleteById(id); } @@ -98,8 +99,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv receiver.setMerchantId(merchant.getId()); receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); - - return wxProfitSharingReceiverMapper.selectOne(receiver); + return wxProfitSharingReceiverMapper.selectOne(new QueryWrapper(receiver)); } @@ -111,7 +111,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv appInfo.setType(EnumAppType.C.getCode()); appInfo = wxAppinfoMapper.findList(appInfo).get(0); - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); receiver.setTenantId(merchant.getTenantId()); receiver.setMerchantId(merchant.getId()); @@ -170,7 +170,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage()); } - wxProfitSharingReceiverMapper.insertSelective(receiver); + wxProfitSharingReceiverMapper.insert(receiver); //添加成功才删除账户 for (WxProfitSharingReceiver delReceiver : delList) { @@ -180,7 +180,8 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv WxProfitSharingReceiver wxProfitSharingReceiver = new WxProfitSharingReceiver(); wxProfitSharingReceiver.setMerchantId(receiver.getMerchantId()); wxProfitSharingReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); - int size = wxProfitSharingReceiverMapper.select(receiver).size(); + + int size = wxProfitSharingReceiverMapper.selectList(new QueryWrapper(receiver)).size(); if (size == 0) { //发送添加短信 @@ -252,9 +253,9 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv appInfo.setType(EnumAppType.C.getCode()); appInfo = wxAppinfoMapper.findList(appInfo).get(0); - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); - receiver = wxProfitSharingReceiverMapper.selectByPrimaryKey(receiver.getId()); + receiver = wxProfitSharingReceiverMapper.selectById(receiver.getId()); if (receiver == null) return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); @@ -308,7 +309,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if (returnMap.get("err_code").contains("USER_NOT_EXIST")) { receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); receiver.setUpdateTime(new Date()); - wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); + wxProfitSharingReceiverMapper.updateById(receiver); } logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + returnMap.get("err_code_des")); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), returnMap.get("err_code_des")); @@ -322,12 +323,13 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); receiver.setUpdateTime(new Date()); - wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); + wxProfitSharingReceiverMapper.updateById(receiver); //发送短信 if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId()); } + return new ResultData(); } @@ -339,19 +341,18 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv oldReceiver.setMerchantId(merchant.getId()); oldReceiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); oldReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); - List delList = wxProfitSharingReceiverMapper.select(oldReceiver); + List delList = wxProfitSharingReceiverMapper.selectList(new QueryWrapper(oldReceiver)); oldReceiver.setReceiverAccount(receiver.getReceiverAccount()); oldReceiver.setReceiverType(receiver.getReceiverType()); oldReceiver.setTrueName(receiver.getTrueName()); - - oldReceiver = wxProfitSharingReceiverMapper.selectOne(oldReceiver); + oldReceiver = wxProfitSharingReceiverMapper.selectOne(new QueryWrapper(oldReceiver)); if (oldReceiver == null) { return addReceiver(merchant, receiver, delList); } else { oldReceiver.setParameter(receiver.getParameter()); oldReceiver.setUpdateTime(new Date()); - wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(oldReceiver); + wxProfitSharingReceiverMapper.updateById(oldReceiver); } return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java index e3a362f22..a8658f102 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java @@ -26,7 +26,7 @@ public class WxProfitSharingResultServiceImpl implements WxProfitSharingResultSe @Override public WxProfitSharingResult getById(Long id) { - return wxProfitSharingResultMapper.selectByPrimaryKey(id); + return wxProfitSharingResultMapper.selectById(id); } @Override @@ -35,15 +35,15 @@ public class WxProfitSharingResultServiceImpl implements WxProfitSharingResultSe //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxProfitSharingResultMapper.insertSelective(record); + wxProfitSharingResultMapper.insert(record); } else { - wxProfitSharingResultMapper.updateByPrimaryKeySelective(record); + wxProfitSharingResultMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxProfitSharingResultMapper.deleteByPrimaryKey(id); + wxProfitSharingResultMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 01d05bb16..c6c52870d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -91,7 +92,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService public Map getById(Long id) { Map result = new HashMap<>(); - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(id); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(id); if (wxPropertyContract == null) { throw new MallinkException(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } @@ -153,7 +154,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService result.put("wxPropertyContract", wxPropertyContract); //关联的商户 if (wxPropertyContract.getMerchantId() != null) { - WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxPropertyContract.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(wxPropertyContract.getMerchantId()); result.put("wxMerchant", wxMerchant); } else { result.put("wxMerchant", null); @@ -181,7 +182,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //押金状态 WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); wxBillPropertyDeposit.setPropertyContractId(id); - List select = wxBillPropertyDepositMapper.select(wxBillPropertyDeposit); + List select = wxBillPropertyDepositMapper.selectList(new QueryWrapper(wxBillPropertyDeposit)); if (!select.isEmpty()) { result.put("depositStatus", select.get(0).getStatus()); } @@ -262,7 +263,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "shopId不能为空"); } - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getRentContractId()); + WxRentContract wxRentContract = wxRentContractMapper.selectById(record.getRentContractId()); if (wxRentContract != null) { if (wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || @@ -276,7 +277,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId不能为空"); } if (record.getOperationType().equals(EnumContractOperationType.PART.getCode())) { - WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(record.getMerchantId()); + WxMerchant merchant = wxMerchantMapper.selectById(record.getMerchantId()); if (merchant == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } @@ -314,7 +315,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) { WxPropertyContract propertyContractQuery = new WxPropertyContract(); propertyContractQuery.setRentContractId(record.getRentContractId()); - int propertyContractCount = wxPropertyContractMapper.selectCount(propertyContractQuery); + int propertyContractCount = wxPropertyContractMapper.selectCount(new QueryWrapper(propertyContractQuery)); if (propertyContractCount > 0) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); } @@ -336,7 +337,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); try { - wxPropertyContractMapper.insertSelective(record); + wxPropertyContractMapper.insert(record); } catch (Exception e) { logger.error("保存物业合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -369,7 +370,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(record.getId()); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(record.getId()); if (wxPropertyContract == null) { return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } @@ -386,7 +387,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); } try { - wxPropertyContractMapper.updateByPrimaryKeySelective(record); + wxPropertyContractMapper.updateById(record); } catch (Exception e) { logger.error("更新物业合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -434,7 +435,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService WxPropertyContract updateRentContract = new WxPropertyContract(); updateRentContract.setId(record.getId()); updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); - wxPropertyContractMapper.updateByPrimaryKeySelective(updateRentContract); + wxPropertyContractMapper.updateById(updateRentContract); } return new ResultData(Result.SUCCESS, message, record); @@ -445,7 +446,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (id == null) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id); + WxPropertyContract record = wxPropertyContractMapper.selectById(id); //更新合同状态为签约 WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setId(id); @@ -454,7 +455,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } else { wxPropertyContract.setStatus(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()); } - wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); + wxPropertyContractMapper.updateById(wxPropertyContract); //建立账单 if (record.getMerchantId() != null && record.getReceivePeriod() != null && @@ -480,7 +481,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Transactional(rollbackFor = {Exception.class}) public void buildDeposit(WxPropertyContract record) { Long propertyContractId = record.getId(); - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(propertyContractId); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(propertyContractId); if (wxPropertyContract != null && wxPropertyContract.getDeposit() > 0) { //找到计租方式 int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; @@ -521,7 +522,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType()); wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract)); try { - wxBillPropertyDepositMapper.insertSelective(wxBillDeposit); + wxBillPropertyDepositMapper.insert(wxBillDeposit); } catch (Exception e) { logger.error("添加物业押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -872,14 +873,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public void deleteById(Long id) { - wxPropertyContractMapper.deleteByPrimaryKey(id); + wxPropertyContractMapper.deleteById(id); } @Override public void download(HttpServletRequest request, HttpServletResponse response, String tenantId) { String id = request.getParameter("id"); - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(id); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(id); String filesuffix = wxPropertyContract.getFilepath().substring(wxPropertyContract.getFilepath().lastIndexOf(".")); String filename = UUID.randomUUID() + filesuffix; @@ -931,14 +932,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public ResultData endRentContract(Long id) { - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(id); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(id); if (wxPropertyContract == null) { return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); try { wxPropertyContract.setUpdatetime(new Date()); - wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); + wxPropertyContractMapper.updateById(wxPropertyContract); } catch (MallinkException e) { logger.info("终止合同失败:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -970,10 +971,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } Map contractMap = contractData.get(0); - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(contractMap.get("id")); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById((Long) contractMap.get("id")); wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); try { - wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); + wxPropertyContractMapper.updateById(wxPropertyContract); } catch (MallinkException e) { logger.info("终止合同失败:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -987,7 +988,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "rentContractId不能为空"); } - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId); + WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId); if (wxRentContract != null) { WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setTenantId(wxRentContract.getTenantId()); @@ -996,7 +997,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } else { wxPropertyContract.setShopId(wxRentContract.getShopId()); } - List select = wxPropertyContractMapper.select(wxPropertyContract); + List select = wxPropertyContractMapper.selectList(new QueryWrapper(wxPropertyContract)); if (select.size() > 0) { long count = select.stream().filter(propertyContract -> propertyContract.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || propertyContract.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || @@ -1016,7 +1017,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxPropertyContract.setTenantId(record.getTenantId()); wxPropertyContract.setRentShopType(record.getRentShopType()); - int allCount = wxPropertyContractMapper.selectCount(wxPropertyContract); + int allCount = wxPropertyContractMapper.selectCount(new QueryWrapper(wxPropertyContract)); resultData.put("allCount", allCount); //作废合同 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java index 0b53dd8c0..31127da1a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java @@ -38,7 +38,7 @@ public class WxQuestionServiceImpl implements WxQuestionService { @Override public WxQuestion getById(Long id) { - return wxQuestionMapper.selectByPrimaryKey(id); + return wxQuestionMapper.selectById(id); } @Override @@ -47,15 +47,15 @@ public class WxQuestionServiceImpl implements WxQuestionService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxQuestionMapper.insertSelective(record); + wxQuestionMapper.insert(record); } else { - wxQuestionMapper.updateByPrimaryKeySelective(record); + wxQuestionMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxQuestionMapper.deleteByPrimaryKey(id); + wxQuestionMapper.deleteById(id); } @Override @@ -80,10 +80,10 @@ public class WxQuestionServiceImpl implements WxQuestionService { record.setId(idWorker.nextId()); record.setCreateTime(new Date()); record.setUpdateTime(new Date()); - wxQuestionConfigMapper.insertSelective(record); + wxQuestionConfigMapper.insert(record); } else { record.setUpdateTime(new Date()); - wxQuestionConfigMapper.updateByPrimaryKeySelective(record); + wxQuestionConfigMapper.updateById(record); } } @@ -94,10 +94,10 @@ public class WxQuestionServiceImpl implements WxQuestionService { record.setId(idWorker.nextId()); record.setCreateTime(new Date()); record.setUpdateTime(new Date()); - wxQuestionLogMapper.insertSelective(record); + wxQuestionLogMapper.insert(record); } else { record.setUpdateTime(new Date()); - wxQuestionLogMapper.updateByPrimaryKeySelective(record); + wxQuestionLogMapper.updateById(record); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 09ba62644..38fd638fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -235,7 +236,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { private boolean isMerchantOrder(WxOrder wxOrder, Long merchantId) { if (wxOrder.getType().equals(EnumOrderType.COUPON.getCode())) { - WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(wxOrder.getProductId()); + WxCoupon wxCoupon = wxCouponMapper.selectById(wxOrder.getProductId()); if (wxCoupon != null) { WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); wxCouponMerchant.setProductId(wxCoupon.getId()); @@ -246,7 +247,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } } } else if (wxOrder.getType().equals(EnumOrderType.MICROPAY.getCode())) { - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(wxOrder.getProductId()); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(wxOrder.getProductId()); if (wxMerchantBUser != null && wxMerchantBUser.equals(merchantId)) { return true; } @@ -264,13 +265,13 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData createRefundOrder(WxAppinfo appInfo, Long couponOrderId, EnumPayType payType, Long bUserId) { - WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectByPrimaryKey(couponOrderId); + WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectById(couponOrderId); if (wxCouponOrder == null) { logger.error("券ID不存在:" + couponOrderId); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); } - WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(wxCouponOrder.getOrderId()); + WxOrder wxOrder = wxOrderMapper.selectById(wxCouponOrder.getOrderId()); if (wxOrder == null) { logger.error("订单ID不存在:" + couponOrderId); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); @@ -283,7 +284,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } // B端用户退款检查一下商户 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(bUserId); if (wxMerchantBUser == null) { logger.error("操作员ID不存在:" + bUserId); throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_IS_NULL); @@ -335,7 +336,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { rOrder.setCreateDate(currentDate); rOrder.setUpdateDate(currentDate); try { - wxOrderMapper.insertSelective(rOrder); + wxOrderMapper.insert(rOrder); } catch (Exception e) { logger.error("退款订单保存出错: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "退款订单保存出错"); @@ -354,7 +355,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } wxCouponOrder.setUpdateDate(currentDate); try { - wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); + wxCouponOrderMapper.updateById(wxCouponOrder); } catch (Exception e) { logger.error("db failed: couponOrder-" + couponOrderId + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -402,7 +403,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 退款订单 try { - int sqlRow = wxRefundOrderMapper.insertSelective(record); + int sqlRow = wxRefundOrderMapper.insert(record); if (sqlRow != 1) { logger.error("退款订单数据库插入出错: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -411,7 +412,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("退款订单数据库插入出错: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (StringUtils.isBlank(payAccount.getApiKey())) { logger.error("支付密钥为空"); throw new MallinkException(ErrorCode.API_KEY_NOT_FOUND.getCode(), "支付密钥为空,请联系商城管理员"); @@ -487,7 +488,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -505,7 +506,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { @@ -566,7 +567,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -584,7 +585,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg); } } @@ -593,7 +594,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData createRefundOrderFromMicroPay(WxAppinfo appInfo, Long orderId, EnumPayType payType, Long bUserId) { - WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); + WxOrder wxOrder = wxOrderMapper.selectById(orderId); if (payType == EnumPayType.PAY_B_REFUND) { logger.info("B端发起退款: bUserId-" + bUserId); @@ -602,7 +603,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } // B端用户退款检查一下商户 - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(bUserId); if (wxMerchantBUser == null) { logger.error("操作员ID不存在:" + bUserId); throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_IS_NULL); @@ -643,7 +644,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { rOrder.setCreateDate(currentDate); rOrder.setUpdateDate(currentDate); try { - wxOrderMapper.insertSelective(rOrder); + wxOrderMapper.insert(rOrder); } catch (Exception e) { logger.error("退款订单保存出错: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "退款订单保存出错"); @@ -691,7 +692,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 退款订单 try { - int sqlRow = wxRefundOrderMapper.insertSelective(record); + int sqlRow = wxRefundOrderMapper.insert(record); if (sqlRow != 1) { logger.error("退款订单数据库插入出错: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -700,7 +701,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("退款订单数据库插入出错: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (StringUtils.isBlank(payAccount.getApiKey())) { logger.error("支付密钥为空"); throw new MallinkException(ErrorCode.API_KEY_NOT_FOUND.getCode(), "支付密钥为空,请联系商城管理员"); @@ -776,7 +777,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -794,7 +795,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { @@ -855,7 +856,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -873,7 +874,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg); } } @@ -887,7 +888,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { */ @Override public ResultData queryRefundOrder(WxAppinfo appInfo, WxRefundOrder record) { - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.getType() == EnumPayMode.MCH.getCode()) { Map paramMap = WxPayment.buildWeappRefundQueryMap( appInfo.getAppId(), payAccount.getMchId(), @@ -900,7 +901,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { String refund_id = returnMap.get("refund_id"); return new ResultData(Result.SUCCESS, "退款", returnMap); } else { - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); String errMsg = ""; JSONObject errObj = errorRefundReqMap.getJSONObject(result_no); if (errObj != null) { @@ -932,7 +933,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { errMsg = returnMap.get("return_msg"); record.setFailReason(errMsg); } - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } @@ -959,7 +960,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("未找到appid信息:" + appId); throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appinfo.getPayId()); if (payAccount == null) { logger.error("未找到mch_id信息:" + mchId); throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); @@ -985,7 +986,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { String payOrderNo = reqMap.get("out_trade_no"); Long payOrderId = Long.valueOf(payOrderNo); - WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); + WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId); if (payOrder == null) { logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); @@ -1003,7 +1004,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } String refundIdStr = reqMap.get("out_refund_no"); Long refundOrderId = Long.valueOf(refundIdStr); - WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId); + WxRefundOrder refundOrder = wxRefundOrderMapper.selectById(refundOrderId); if (refundOrder == null) { logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); @@ -1050,7 +1051,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("未找到appid信息:" + appId); throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appinfo.getPayId()); if (payAccount == null) { logger.error("未找到mch_id信息:" + mchId); throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); @@ -1083,7 +1084,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { return XmlUtil.getRequestXml(resultMap); } Long payOrderId = Long.valueOf(payOrderNo); - WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); + WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId); if (payOrder == null) { logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); @@ -1101,7 +1102,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } String refundIdStr = reqMap.get("out_refund_no"); Long refundOrderId = Long.valueOf(refundIdStr); - WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId); + WxRefundOrder refundOrder = wxRefundOrderMapper.selectById(refundOrderId); if (refundOrder == null) { logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); @@ -1165,7 +1166,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { return; } - WxOrder order = wxOrderMapper.selectByPrimaryKey(refundOrder.getOrderId()); + WxOrder order = wxOrderMapper.selectById(refundOrder.getOrderId()); if (order == null) { logger.error("pay success handle, order " + refundOrder.getOrderId() + " not found , refundId : " + refundOrder.getId()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); @@ -1181,7 +1182,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { updateOrder.setRefundId(refundId); // 修改退款订单状态 try { - wxRefundOrderMapper.updateByPrimaryKeySelective(updateOrder); + wxRefundOrderMapper.updateById(updateOrder); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -1224,7 +1225,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Override public WxRefundOrder getById(Long id) { - return wxRefundOrderMapper.selectByPrimaryKey(id); + return wxRefundOrderMapper.selectById(id); } @Override @@ -1233,27 +1234,27 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxRefundOrderMapper.insertSelective(record); + wxRefundOrderMapper.insert(record); } else { - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxRefundOrderMapper.deleteByPrimaryKey(id); + wxRefundOrderMapper.deleteById(id); } @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData returnMoney(WxAppinfo appInfo, Long orderId) { - WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); + WxOrder wxOrder = wxOrderMapper.selectById(orderId); final IdWorker idWorker = IdWorker.get(); Date currentDate = new Date(); // wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); // wxOrder.setUpdateDate(currentDate); // try { -// wxOrderMapper.updateByPrimaryKeySelective(wxOrder); +// wxOrderMapper.updateById(wxOrder); // } catch (Exception e) { // logger.error("订单修改出错: " + e.getMessage()); // throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单修改出错"); @@ -1301,7 +1302,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 退款订单 try { - int sqlRow = wxRefundOrderMapper.insertSelective(record); + int sqlRow = wxRefundOrderMapper.insert(record); if (sqlRow != 1) { logger.error("退款订单数据库插入出错: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -1310,7 +1311,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("退款订单数据库插入出错: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (StringUtils.isBlank(payAccount.getApiKey())) { logger.error("支付密钥为空"); throw new MallinkException(ErrorCode.API_KEY_NOT_FOUND.getCode(), "支付密钥为空,请联系商城管理员"); @@ -1380,7 +1381,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -1398,7 +1399,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { @@ -1452,7 +1453,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -1470,7 +1471,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKeySelective(record); + wxRefundOrderMapper.updateById(record); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg); } } @@ -1481,7 +1482,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { WxRefundOrder order = new WxRefundOrder(); order.setOrderId(orderId); order.setRefundOrderStatus(status); - return wxRefundOrderMapper.selectCount(order) > 0 ? true : false; + return wxRefundOrderMapper.selectCount(new QueryWrapper(order)) > 0 ? true : false; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9e68f65cc..7aca36643 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -124,7 +125,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public Map getById(Long id) { Map result = new HashMap<>(); - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); + WxRentContract wxRentContract = wxRentContractMapper.selectById(id); if (wxRentContract == null) { throw new MallinkException(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } @@ -226,7 +227,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //押金状态 WxBillDeposit wxBillDeposit = new WxBillDeposit(); wxBillDeposit.setRentContractId(id); - List select = wxBillDepositMapper.select(wxBillDeposit); + List select = wxBillDepositMapper.selectList(new QueryWrapper(wxBillDeposit)); if (!select.isEmpty()) { result.put("depositStatus", select.get(0).getStatus()); } @@ -457,7 +458,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shopNumber + " 已出租"); } } else { - WxShop wxShop = wxShopMapper.selectByPrimaryKey(shopId); + WxShop wxShop = wxShopMapper.selectById(shopId); if (wxShop == null) { return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除"); } @@ -484,7 +485,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Date tempDate = record.getRentalStartDate(); record.setRentalStartDate(oldRentStartDate); - wxRentContractMapper.insertSelective(record); + wxRentContractMapper.insert(record); record.setRentalStartDate(tempDate); } catch (Exception e) { logger.error("保存租赁合同信息失败,e:" + e.getMessage()); @@ -629,7 +630,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public ResultData getResultDataForUpdate(WxRentContract record, Long userId,int from,Date oldRentStartDate) { //更新租赁合同信息 - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getId()); + WxRentContract wxRentContract = wxRentContractMapper.selectById(record.getId()); if (wxRentContract == null) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } @@ -705,7 +706,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shopNumber + " 已出租"); } } else { - WxShop wxShop = wxShopMapper.selectByPrimaryKey(shopId); + WxShop wxShop = wxShopMapper.selectById(shopId); if (wxShop == null) { return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除"); } @@ -730,7 +731,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { try { Date tempDate = record.getRentalStartDate(); record.setRentalStartDate(oldRentStartDate); - wxRentContractMapper.updateByPrimaryKeySelective(record); + wxRentContractMapper.updateById(record); record.setRentalStartDate(tempDate); } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); @@ -743,7 +744,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Transactional(rollbackFor = {Exception.class}) @Override public void buildDeposit(WxMerchant wxMerchant, Long userId,Long rentContractId) { - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId); + WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId); if (wxRentContract != null && wxRentContract.getDeposit() > 0) { final IdWorker idWorker = IdWorker.get(); WxBillDeposit wxBillDeposit = new WxBillDeposit(); @@ -799,7 +800,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } try { - wxBillDepositMapper.insertSelective(wxBillDeposit); + wxBillDepositMapper.insert(wxBillDeposit); } catch (Exception e) { logger.error("添加押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -815,7 +816,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public void updateInvalidContract(Long rentContractId) { - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId); + WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId); if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { String rentInfo = wxRentContract.getRentInfo(); JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); @@ -838,7 +839,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { record.setRentShopType(wxRentContract.getRentShopType()); record.setStatus(EnumRentContractStatus.INVALID.getCode()); wxRentContractMapper.updateRentInvalidStatus(record); - List rentContractList = wxRentContractMapper.select(record); + List rentContractList = wxRentContractMapper.selectList(new QueryWrapper(record)); for (WxRentContract updateContract : rentContractList) { updateInvalidStatus(updateContract); } @@ -857,7 +858,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //查询rent_info 包括 shopId for (int i = 0; i < size; i++) { String shopId = split[i]; - WxShop wxShop = wxShopMapper.selectByPrimaryKey(shopId); + WxShop wxShop = wxShopMapper.selectById(shopId); WxRentContract wxRentContractQuery = new WxRentContract(); wxRentContractQuery.setTenantId(record.getTenantId()); String shopNumber = wxShop.getShopNumber(); @@ -1423,14 +1424,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Transactional(rollbackFor = {Exception.class}) @Override public ResultData deleteById(String id) { - wxRentContractMapper.deleteByPrimaryKey(id); + wxRentContractMapper.deleteById(id); return new ResultData(Result.SUCCESS, "删除租赁合同信息成功"); } @Override public void download(HttpServletRequest request, HttpServletResponse response, String tenantId) { String id = request.getParameter("id"); - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); + WxRentContract wxRentContract = wxRentContractMapper.selectById(id); String filesuffix = wxRentContract.getFilepath().substring(wxRentContract.getFilepath().lastIndexOf(".")); String filename = UUID.randomUUID() + filesuffix; String filepath = fmUploadDir; @@ -1481,14 +1482,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public ResultData endRentContract(Long id, Integer status) { - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); + WxRentContract wxRentContract = wxRentContractMapper.selectById(id); if (wxRentContract == null) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); try { wxRentContract.setUpdatetime(new Date()); - wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); + wxRentContractMapper.updateById(wxRentContract); //停用商户 wxMerchantService.disable(wxRentContract.getMerchantId()); //物业合同终止 @@ -1501,10 +1502,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { Map propertyContract = contractData.get(0); Long propertyContractId = (Long) propertyContract.get("id"); if (propertyContract != null && propertyContractId != null) { - WxPropertyContract propertyContractUpdate = wxPropertyContractMapper.selectByPrimaryKey(propertyContractId); + WxPropertyContract propertyContractUpdate = wxPropertyContractMapper.selectById(propertyContractId); propertyContractUpdate.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); propertyContractUpdate.setUpdatetime(new Date()); - wxPropertyContractMapper.updateByPrimaryKeySelective(propertyContractUpdate); + wxPropertyContractMapper.updateById(propertyContractUpdate); } } } @@ -1518,13 +1519,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updateMerchant(WxRentContract wxRentContract) { - WxRentContract record = wxRentContractMapper.selectByPrimaryKey(wxRentContract); + WxRentContract record = wxRentContractMapper.selectById(wxRentContract); if (wxRentContract == null) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } record.setMerchantId(wxRentContract.getMerchantId()); try { - wxRentContractMapper.updateByPrimaryKeySelective(record); + wxRentContractMapper.updateById(record); } catch (MallinkException e) { logger.info("关联合同商户失败:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -1545,7 +1546,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxRentContract.setTenantId(record.getTenantId()); wxRentContract.setRentShopType(record.getRentShopType()); - int allCount = wxRentContractMapper.selectCount(wxRentContract); + int allCount = wxRentContractMapper.selectCount(new QueryWrapper(wxRentContract)); resultData.put("allCount", allCount); //待签约 @@ -1587,7 +1588,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Map contract = rentContractData.get(i); Object merchantId = contract.get("merchantId"); if (merchantId != null) { - WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(merchantId); + WxMerchant merchant = wxMerchantMapper.selectById((Long) merchantId); Integer status = merchant.getStatus(); if (status.equals(EnumMerchantStatus.VALID.getCode())) { wxMerchantService.disable((Long) merchantId); @@ -1670,7 +1671,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (id == null) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - WxRentContract record = wxRentContractMapper.selectByPrimaryKey(id); + WxRentContract record = wxRentContractMapper.selectById(id); if (record == null) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } @@ -1682,7 +1683,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } else { wxRentContract.setStatus(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()); } - wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); + wxRentContractMapper.updateById(wxRentContract); //建立账单 if (record != null && record.getMerchantId() != null && @@ -1716,10 +1717,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setRentContractId(record.getId()); wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); - WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContract); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContract)); if (propertyContract != null) { propertyContract.setMerchantId(record.getMerchantId()); - wxPropertyContractMapper.updateByPrimaryKeySelective(propertyContract); + wxPropertyContractMapper.updateById(propertyContract); wxPropertyContractService.updatePropertyContractStatus(propertyContract.getId()); } } @@ -1728,7 +1729,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public Map getRentAndPropertyInfo(Long id) { logger.info("获取租赁物业合同数据>>>>>>id:" + id); Map result = new HashMap<>(); - WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); + WxRentContract wxRentContract = wxRentContractMapper.selectById(id); if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { JSONArray jsonArray = JSONArray.parseArray(wxRentContract.getRentInfo()); StringBuffer shopNumberStr = new StringBuffer(); @@ -1777,7 +1778,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { result.put("province", wxMall.getProvince()); result.put("city", wxMall.getCity()); //经营业态 - WxBusiness wxBusiness = wxBusinessMapper.selectByPrimaryKey(wxRentContract.getBusinessId()); + WxBusiness wxBusiness = wxBusinessMapper.selectById(wxRentContract.getBusinessId()); result.put("business", wxBusiness.getTitle()); //商户信息 @@ -1841,7 +1842,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Long brandId = wxRentContract.getBrand(); String brand = " "; if (brandId != null) { - WxBrand wxBrand = WxBrandMapper.selectByPrimaryKey(brandId); + WxBrand wxBrand = WxBrandMapper.selectById(brandId); if (wxBrand != null) { brand = wxBrand.getName(); } @@ -2426,7 +2427,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRentMapper.updateInvalidStatus(wxBillRent); //解绑商户和商铺关系 - WxRentContract rentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); + WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); if(rentContract != null && rentContract.getMerchantId() != null){ wxMerchantService.disable(rentContract.getMerchantId()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 5f11d9121..3f4cc33c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; @@ -53,7 +54,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract data.put("rent", rent); WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); wxPropertyContractQuery.setRentContractId(id); - WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContractQuery)); if (propertyContract != null) { List wxBillPropertyPreview = wxPropertyContractService.getWxBillPropertyPreview(propertyContract.getId()); propertyContract.setPreviewBillRentList(wxBillPropertyPreview); @@ -70,7 +71,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract data.put("rent", rent); WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); wxPropertyContractQuery.setRentContractId(id); - WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContractQuery)); if (propertyContract != null) { try { Map property = wxPropertyContractService.getById(propertyContract.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java index e6f67c6b6..158715596 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java @@ -28,7 +28,7 @@ public class WxScoreHistoryServiceImpl implements WxScoreHistoryService { @Override public WxScoreHistory getById(Long id) { - return wxScoreHistoryMapper.selectByPrimaryKey(id); + return wxScoreHistoryMapper.selectById(id); } @Override @@ -38,15 +38,15 @@ public class WxScoreHistoryServiceImpl implements WxScoreHistoryService { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateDate(new Date()); - wxScoreHistoryMapper.insertSelective(record); + wxScoreHistoryMapper.insert(record); } else { - wxScoreHistoryMapper.updateByPrimaryKeySelective(record); + wxScoreHistoryMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxScoreHistoryMapper.deleteByPrimaryKey(id); + wxScoreHistoryMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index d076227ac..584696c33 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -72,7 +72,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { //scoreRules.setId(idWorker.nextId()); //scoreRules.setRules(WxScoreRules.getScoreDefaultRules()); // - //wxScoreRulesMapper.insertSelective(scoreRules); + //wxScoreRulesMapper.insert(scoreRules); } // 插入缓存 scoreRulesRedisTemplate.opsForValue().set(key, scoreRules); @@ -146,7 +146,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { scoreRules.setId(idWorker.nextId()); scoreRules.setRules(WxScoreRules.getCreditDefaultRules()); scoreRules.setScale(WxScoreRules.DEFAULT_SCALE); - wxScoreRulesMapper.insertSelective(scoreRules); + wxScoreRulesMapper.insert(scoreRules); } // 插入缓存 @@ -163,9 +163,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxScoreRulesMapper.insertSelective(record); + wxScoreRulesMapper.insert(record); } else { - wxScoreRulesMapper.updateByPrimaryKeySelective(record); + wxScoreRulesMapper.updateById(record); } if (record != null && record.getType() == EnumScoreRules.SCORE.getCode()) { @@ -198,7 +198,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { history = histories.get(0); } if (history != null) { - num = wxScoreHistoryMapper.deleteByPrimaryKey(history.getId()); + num = wxScoreHistoryMapper.deleteById(history.getId()); if (num != 1) { logger.error("删除成长值历史出错"+ history.toString()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "删除成长值历史出错"); @@ -208,21 +208,21 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { return 0; } // 2. user score back - WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(record.getCUserId()); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); + WxCUser wxCUser = wxCUserMapper.selectById(record.getCUserId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId()); if (wxCUser != null) { WxCUser wxCUserNew = new WxCUser(); wxCUserNew.setId(wxCUser.getId()); wxCUserNew.setScore(wxCUser.getScore() - history.getScoreAmount()); wxCUserNew.setUpdateDate(new Date()); - wxCUserMapper.updateByPrimaryKeySelective(wxCUserNew); + wxCUserMapper.updateById(wxCUserNew); } if (wxCUserBasicInfo != null) { WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo(); wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId()); wxCUserBasicInfoNew.setPoins(wxCUserBasicInfo.getPoins()-history.getScoreAmount()); wxCUserBasicInfoNew.setUpdateDate(new Date()); - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfoNew); + wxCUserBasicInfoMapper.updateById(wxCUserBasicInfoNew); } return num; } @@ -256,7 +256,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { private void resetBasicUserScore(Long userId, int scoreNumber) { // 1. basicUser - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(userId); + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(userId); if(user == null) { return; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index 0800c0201..4c46e3260 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -53,7 +53,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { @Override public WxScreenAd getById(Long id) { - return wxScreenAdMapper.selectByPrimaryKey(id); + return wxScreenAdMapper.selectById(id); } @Override @@ -75,7 +75,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { } else if (record.getType().equals(EnumScreenAdType.CAMPAIGN.getCode())){ if (record.getTargetId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(record.getTargetId()); + WxCampaign wxCampaign = wxCampaignMapper.selectById(record.getTargetId()); if (wxCampaign == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); record.setCoverImg(wxCampaign.getCoverImg()); @@ -89,18 +89,18 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { record.setId(idWorker.nextId()); record.setCreateDate(new Date()); record.setUpdateDate(new Date()); - wxScreenAdMapper.insertSelective(record); + wxScreenAdMapper.insert(record); } else { record.setUpdateDate(new Date()); - wxScreenAdMapper.updateByPrimaryKeySelective(record); + wxScreenAdMapper.updateById(record); } return new ResultData(); } @Override public void deleteById(Long id) { - wxScreenAdMapper.deleteByPrimaryKey(id); + wxScreenAdMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 943d4d1e0..f5fedd963 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -66,7 +67,7 @@ public class WxShopServiceImpl implements WxShopService { @Override public WxShop getById(Long id) { - return wxShopMapper.selectByPrimaryKey(id); + return wxShopMapper.selectById(id); } @Override @@ -82,11 +83,11 @@ public class WxShopServiceImpl implements WxShopService { if (StringUtils.isBlank(record.getOperationArea()) || "0".equals(record.getOperationArea())) { record.setOperationArea(record.getBuildArea()); } - wxShopMapper.insertSelective(record); + wxShopMapper.insert(record); return new ResultData(Result.SUCCESS,"添加成功"); } else { record.setUpdateDate(new Date()); - wxShopMapper.updateByPrimaryKeySelective(record); + wxShopMapper.updateById(record); return new ResultData(Result.SUCCESS,"更新成功"); } } @@ -94,7 +95,7 @@ public class WxShopServiceImpl implements WxShopService { @Override public ResultData deleteById(Long id, Integer isAdmin) { //1、已出租不让删除 - WxShop wxShop = wxShopMapper.selectByPrimaryKey(id); + WxShop wxShop = wxShopMapper.selectById(id); if (wxShop == null) { return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND); } @@ -104,7 +105,7 @@ public class WxShopServiceImpl implements WxShopService { //2、是否关联过商户 WxMerchantShop wxMerchantShop = new WxMerchantShop(); wxMerchantShop.setShopId(wxShop.getId()); - List wxMerchantShops = wxMerchantShopMapper.select(wxMerchantShop); + List wxMerchantShops = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); if (isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { //3、合同 两种 都要查一下 存在时不能删除 @@ -118,10 +119,10 @@ public class WxShopServiceImpl implements WxShopService { !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); } else { - count = wxRentContractMapper.select(wxRentContract).parallelStream() - .filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && - !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && - !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); + List list = wxRentContractMapper.selectList(new QueryWrapper(wxRentContract)); + count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && + !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && + !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); } if (count > 0) { return new ResultData(ErrorCode.SHOP_CONTRACT_HAS_CONNECT); @@ -135,16 +136,16 @@ public class WxShopServiceImpl implements WxShopService { } //更新标记 wxShop.setIsDel(EnumDelStatus.DEL.getCode()); - wxShopMapper.updateByPrimaryKeySelective(wxShop); + wxShopMapper.updateById(wxShop); //关联表 for (int i = 0; i < count; i++) { WxMerchantShop updateMerchantShop = wxMerchantShops.get(i); updateMerchantShop.setIsDel(EnumDelStatus.DEL.getCode()); - wxMerchantShopMapper.updateByPrimaryKeySelective(updateMerchantShop); + wxMerchantShopMapper.updateById(updateMerchantShop); } } else { //无关联商铺直接删除 - wxShopMapper.deleteByPrimaryKey(id); + wxShopMapper.deleteById(id); } return new ResultData(Result.SUCCESS, "删除成功"); } @@ -186,6 +187,7 @@ public class WxShopServiceImpl implements WxShopService { return pageInfo; } + @Override public void exportShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response) { List list = wxShopMapper.findListWithMerchantMap(wxShop); String name = EnumRentShopType.SHOP.getCode().equals(wxShop.getType())?"店铺列表":"多经点位列表"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java index 234ab0df3..671d13bf2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java @@ -41,7 +41,7 @@ public class WxSubBusinessServiceImpl implements WxSubBusinessService { @Override public WxSubBusiness getById(Integer id) { - return wxSubBusinessMapper.selectByPrimaryKey(id); + return wxSubBusinessMapper.selectById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java index 547ebea7d..66fa7d8d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java @@ -90,7 +90,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { // 1. 获取c端小程序 WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId()); // 2. 获取payAccount - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.getShare().intValue() > 0) { isShare = EnumPayShare.YES; } @@ -119,7 +119,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { record.setShareAmount(share_amount); record.setShareRemainAmount(share_amount); try { - wxSubsidyMapper.insertSelective(record); + wxSubsidyMapper.insert(record); } catch (Exception e) { logger.error("wx_subsidy save fail" + e.getMessage()); return new ResultData(ErrorCode.DB_FAIL); @@ -168,7 +168,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { record.setCodeUrl(code_url); record.setUpdateTime(new Date()); try { - wxSubsidyMapper.updateByPrimaryKeySelective(record); + wxSubsidyMapper.updateById(record); } catch (Exception e) { logger.error("wx_subsidy update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -189,7 +189,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { } record.setUpdateTime(new Date()); try { - wxSubsidyMapper.updateByPrimaryKeySelective(record); + wxSubsidyMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -201,7 +201,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { record.setFailReason(errMsg); record.setUpdateTime(new Date()); try { - wxSubsidyMapper.updateByPrimaryKeySelective(record); + wxSubsidyMapper.updateById(record); } catch (Exception e) { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -249,7 +249,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { isNormal = false; } - WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); + WxPayAccount payAccount = wxPayAccountMapper.selectById(appinfo.getPayId()); if (payAccount == null) { throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); } @@ -286,7 +286,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { String openId = paramMap.get("sub_openid"); String timEndStr = paramMap.get("time_end"); Long payOrderId = Long.valueOf(payOrderNo); - WxSubsidy subsidy = wxSubsidyMapper.selectByPrimaryKey(payOrderId); + WxSubsidy subsidy = wxSubsidyMapper.selectById(payOrderId); if (subsidy == null) { logger.warn("notify order, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); @@ -317,7 +317,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { subsidy.setOpenId(openId); subsidy.setUpdateTime(new Date()); try { - wxSubsidyMapper.updateByPrimaryKeySelective(subsidy); + wxSubsidyMapper.updateById(subsidy); } catch (Exception e) { logger.error("wx_subsidy update exception"); } @@ -346,7 +346,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { @Override public WxSubsidy getById(Long id) { - return wxSubsidyMapper.selectByPrimaryKey(id); + return wxSubsidyMapper.selectById(id); } @Override @@ -355,15 +355,15 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxSubsidyMapper.insertSelective(record); + wxSubsidyMapper.insert(record); } else { - wxSubsidyMapper.updateByPrimaryKeySelective(record); + wxSubsidyMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxSubsidyMapper.deleteByPrimaryKey(id); + wxSubsidyMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java index 3d9cd61e3..99f784df3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java @@ -27,7 +27,7 @@ public class WxTagsGroupServiceImpl implements WxTagsGroupService { @Override public WxTagsGroup getById(Long id) { - return wxTagsGroupMapper.selectByPrimaryKey(id); + return wxTagsGroupMapper.selectById(id); } @Override @@ -36,15 +36,15 @@ public class WxTagsGroupServiceImpl implements WxTagsGroupService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxTagsGroupMapper.insertSelective(record); + wxTagsGroupMapper.insert(record); } else { - wxTagsGroupMapper.updateByPrimaryKeySelective(record); + wxTagsGroupMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxTagsGroupMapper.deleteByPrimaryKey(id); + wxTagsGroupMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java index 8f35a67cd..cfe715c35 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java @@ -39,7 +39,7 @@ public class WxTagsServiceImpl implements WxTagsService { @Override public WxTags getById(Long id) { - return wxTagsMapper.selectByPrimaryKey(id); + return wxTagsMapper.selectById(id); } @Override @@ -48,15 +48,15 @@ public class WxTagsServiceImpl implements WxTagsService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxTagsMapper.insertSelective(record); + wxTagsMapper.insert(record); } else { - wxTagsMapper.updateByPrimaryKeySelective(record); + wxTagsMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxTagsMapper.deleteByPrimaryKey(id); + wxTagsMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java index 586b67ad4..0aac07a14 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java @@ -28,7 +28,7 @@ public class WxTagsTypeServiceImpl implements WxTagsTypeService { @Override public WxTagsType getById(Long id) { - return wxTagsTypeMapper.selectByPrimaryKey(id); + return wxTagsTypeMapper.selectById(id); } @Override @@ -37,15 +37,15 @@ public class WxTagsTypeServiceImpl implements WxTagsTypeService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxTagsTypeMapper.insertSelective(record); + wxTagsTypeMapper.insert(record); } else { - wxTagsTypeMapper.updateByPrimaryKeySelective(record); + wxTagsTypeMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxTagsTypeMapper.deleteByPrimaryKey(id); + wxTagsTypeMapper.deleteById(id); } @Override public List findList(WxTagsType wxTagsType) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java index 0376b3bd7..4d96036d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -1,7 +1,9 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxTemplateMsg; import com.iformall.mapper.WxTemplateMsgMapper; import com.iformall.service.WxTemplateMsgService; @@ -9,7 +11,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import java.util.Date; @@ -28,12 +29,13 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { @Override public WxTemplateMsg getById(Long id) { - return wxTemplateMsgMapper.selectByPrimaryKey(id); + return wxTemplateMsgMapper.selectById(id); } @Override public WxTemplateMsg getByObj(WxTemplateMsg record) { - return wxTemplateMsgMapper.selectOne(record); + + return wxTemplateMsgMapper.selectOne(new QueryWrapper(record)); } @Override @@ -45,16 +47,16 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { record.setId(idWorker.nextId()); record.setCreateDate(curDate); record.setUpdateDate(curDate); - wxTemplateMsgMapper.insertSelective(record); + wxTemplateMsgMapper.insert(record); } else { record.setUpdateDate(curDate); - wxTemplateMsgMapper.updateByPrimaryKeySelective(record); + wxTemplateMsgMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxTemplateMsgMapper.deleteByPrimaryKey(id); + wxTemplateMsgMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 96e6d16d3..eda05196b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -73,7 +73,7 @@ public class WxTopicServiceImpl implements WxTopicService { WxTopic query = new WxTopic(); query.setTenantId(record.getTenantId()); if(record.getId() != null && record.getBeginTime() == null){ - WxTopic wt = wxTopicMapper.selectByPrimaryKey(record.getId()); + WxTopic wt = wxTopicMapper.selectById(record.getId()); query.setBeginTime(wt.getBeginTime()); query.setEndTime(wt.getEndTime()); }else{ @@ -96,7 +96,7 @@ public class WxTopicServiceImpl implements WxTopicService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxTopicMapper.insertSelective(record); + wxTopicMapper.insert(record); if(StringUtils.isNotBlank(record.getCouponIds())) { addCouponTopic(record); @@ -104,7 +104,7 @@ public class WxTopicServiceImpl implements WxTopicService { return new ResultData(Result.SUCCESS,"添加成功"); } else { record.setUpdatetime(new Date()); - wxTopicMapper.updateByPrimaryKeySelective(record); + wxTopicMapper.updateById(record); if(StringUtils.isNotBlank(record.getCouponIds())) { //优化:区分添加的和删除的 wxCouponChannelMapper.delByTopic(record); @@ -120,7 +120,7 @@ public class WxTopicServiceImpl implements WxTopicService { final IdWorker idWorker = IdWorker.get(); String[] couponArray = couponId.split("-"); //保存coupon_channel - WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(Long.parseLong(couponArray[1])); + WxCoupon wxCoupon = wxCouponMapper.selectById(Long.parseLong(couponArray[1])); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setId(idWorker.nextId()); wxCouponChannel.setBeginTime(record.getBeginTime()); @@ -133,7 +133,7 @@ public class WxTopicServiceImpl implements WxTopicService { wxCouponChannel.setType(wxCoupon.getType()); wxCouponChannel.setBusiness(wxCoupon.getBusiness()); wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); - wxCouponChannelMapper.insertSelective(wxCouponChannel); + wxCouponChannelMapper.insert(wxCouponChannel); String pageUrl = "pages/index/index"; WxCouponChannel couponChannel = new WxCouponChannel(); @@ -145,14 +145,14 @@ public class WxTopicServiceImpl implements WxTopicService { if(map!=null && map.get("url") !=null) { String url = map.get("url"); couponChannel.setQrCode(url); - wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + wxCouponChannelMapper.updateById(couponChannel); } } } @Override public WxTopic findById(WxTopic record) { - WxTopic wxTopic = wxTopicMapper.selectByPrimaryKey(record.getId()); + WxTopic wxTopic = wxTopicMapper.selectById(record.getId()); List wxCouponList = wxCouponMapper.findCouponByTopic(record); wxTopic.setCouponList(wxCouponList); String couponIds = ""; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java index 7e6442237..06b13b278 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java @@ -27,7 +27,7 @@ public class WxUserChannelServiceImpl implements WxUserChannelService { @Override public WxUserChannel getById(Long id) { - return wxUserChannelMapper.selectByPrimaryKey(id); + return wxUserChannelMapper.selectById(id); } @Override @@ -36,15 +36,15 @@ public class WxUserChannelServiceImpl implements WxUserChannelService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxUserChannelMapper.insertSelective(record); + wxUserChannelMapper.insert(record); } else { - wxUserChannelMapper.updateByPrimaryKeySelective(record); + wxUserChannelMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxUserChannelMapper.deleteByPrimaryKey(id); + wxUserChannelMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java index 3aca66254..758f871b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserDataRuleServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxUserDataRule; import com.iformall.enums.EnumUserDataRuleType; @@ -30,13 +31,13 @@ public class WxUserDataRuleServiceImpl implements WxUserDataRuleService { record.setId(idWorker.nextId()); record.setCreateTime(date); record.setUpdateTime(date); - wxUserDataRuleMapper.insertSelective(record); + wxUserDataRuleMapper.insert(record); } else { if (EnumUserDataRuleType.ALL.getCode().equals(record.getType())) { - wxUserDataRuleMapper.deleteByPrimaryKey(record.getId()); + wxUserDataRuleMapper.deleteById(record.getId()); } else { record.setUpdateTime(date); - wxUserDataRuleMapper.updateByPrimaryKeySelective(record); + wxUserDataRuleMapper.updateById(record); } } @@ -46,6 +47,6 @@ public class WxUserDataRuleServiceImpl implements WxUserDataRuleService { public WxUserDataRule findByUserId(Long userId) { WxUserDataRule wxUserDataRule = new WxUserDataRule(); wxUserDataRule.setUserId(userId); - return wxUserDataRuleMapper.selectOne(wxUserDataRule); + return wxUserDataRuleMapper.selectOne(new QueryWrapper(wxUserDataRule)); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java index 5075f5413..e1b9abbfb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java @@ -34,7 +34,7 @@ public class WxUserVisitServiceImpl implements WxUserVisitService { @Override public WxUserVisit getById(Long id) { - return wxUserVisitMapper.selectByPrimaryKey(id); + return wxUserVisitMapper.selectById(id); } @Override @@ -43,15 +43,15 @@ public class WxUserVisitServiceImpl implements WxUserVisitService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxUserVisitMapper.insertSelective(record); + wxUserVisitMapper.insert(record); } else { - wxUserVisitMapper.updateByPrimaryKeySelective(record); + wxUserVisitMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxUserVisitMapper.deleteByPrimaryKey(id); + wxUserVisitMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java index cc12b9e4f..c338e28f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java @@ -2,8 +2,6 @@ package com.iformall.service.kw; import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.KwBox; import com.iformall.domain.po.KwMeter; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java index d7b75f7c9..32655deab 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java @@ -30,7 +30,7 @@ public class KwBoxCmdHistoryServiceImpl implements KwBoxCmdHistoryService { @Override public KwBoxCmdHistory getById(Long id) { - return kwBoxCmdHistoryMapper.selectByPrimaryKey(id); + return kwBoxCmdHistoryMapper.selectById(id); } @@ -39,16 +39,16 @@ public class KwBoxCmdHistoryServiceImpl implements KwBoxCmdHistoryService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - kwBoxCmdHistoryMapper.insertSelective(record); + kwBoxCmdHistoryMapper.insert(record); } else { - kwBoxCmdHistoryMapper.updateByPrimaryKeySelective(record); + kwBoxCmdHistoryMapper.updateById(record); } } @Override public void deleteById(Long id) { - kwBoxCmdHistoryMapper.deleteByPrimaryKey(id); + kwBoxCmdHistoryMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index 0c0b4066c..d123d1772 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -49,7 +49,7 @@ public class KwBoxServiceImpl implements KwBoxService { @Override public KwBox getById(Long id) { - return kwBoxMapper.selectByPrimaryKey(id); + return kwBoxMapper.selectById(id); } @@ -60,17 +60,17 @@ public class KwBoxServiceImpl implements KwBoxService { record.setId(idWorker.nextId()); record.setCreateTime(new Date()); record.setUpdateTime(new Date()); - kwBoxMapper.insertSelective(record); + kwBoxMapper.insert(record); } else { record.setUpdateTime(new Date()); - kwBoxMapper.updateByPrimaryKeySelective(record); + kwBoxMapper.updateById(record); } } @Override public void deleteById(Long id) { - kwBoxMapper.deleteByPrimaryKey(id); + kwBoxMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java index 04b1b0f22..c1f4dfde1 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.kw.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -49,10 +50,10 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { record.setId(idWorker.nextId()); record.setCreateTime(new Date()); record.setUpdateTime(new Date()); - kwMerchantMeterMapper.insertSelective(record); + kwMerchantMeterMapper.insert(record); } else { record.setUpdateTime(new Date()); - kwMerchantMeterMapper.updateByPrimaryKeySelective(record); + kwMerchantMeterMapper.updateById(record); } } @@ -68,7 +69,7 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { @Override public int selectCount(KwMerchantMeter record) { - return kwMerchantMeterMapper.selectCount(record); + return kwMerchantMeterMapper.selectCount(new QueryWrapper(record)); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java index 88aff92e9..3032dca99 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java @@ -2,10 +2,6 @@ package com.iformall.service.kw.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.iformall.common.ErrorCode; -import com.iformall.common.IdWorker; -import com.iformall.common.Result; -import com.iformall.common.ResultData; import com.iformall.domain.dto.KwMeterDataDto; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.KwMeterData; @@ -13,13 +9,10 @@ import com.iformall.domain.vo.KwMeterDataVo; import com.iformall.enums.EnumMeterStatus; import com.iformall.mapper.KwMeterDataMapper; import com.iformall.service.kw.KwMeterDataService; -import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; import java.util.Date; import java.util.List; @@ -60,7 +53,8 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { @Override public int save(List recordList) { - return kwMeterDataMapper.insertList(recordList); + //return kwMeterDataMapper.insertList(recordList); + return 0; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java index 890d8a038..1a8bd63d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -1,11 +1,10 @@ package com.iformall.service.kw.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; -import com.iformall.common.ResultData; import com.iformall.domain.po.KwMeter; -import com.iformall.domain.po.KwMeterData; import com.iformall.mapper.KwMeterMapper; import com.iformall.service.kw.KwMeterService; import org.slf4j.Logger; @@ -31,7 +30,7 @@ public class KwMeterServiceImpl implements KwMeterService { @Override public KwMeter getById(Long id) { - return kwMeterMapper.selectByPrimaryKey(id); + return kwMeterMapper.selectById(id); } @@ -42,10 +41,10 @@ public class KwMeterServiceImpl implements KwMeterService { record.setId(idWorker.nextId()); record.setCreateTime(new Date()); record.setUpdateTime(new Date()); - kwMeterMapper.insertSelective(record); + kwMeterMapper.insert(record); } else { record.setUpdateTime(new Date()); - kwMeterMapper.updateByPrimaryKeySelective(record); + kwMeterMapper.updateById(record); } } @@ -61,7 +60,7 @@ public class KwMeterServiceImpl implements KwMeterService { @Override public void deleteById(Long id) { - kwMeterMapper.deleteByPrimaryKey(id); + kwMeterMapper.deleteById(id); } @Override @@ -76,7 +75,7 @@ public class KwMeterServiceImpl implements KwMeterService { @Override public int selectCount(KwMeter record) { - return kwMeterMapper.selectCount(record); + return kwMeterMapper.selectCount(new QueryWrapper(record)); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index 14d7dd9f5..093e95df1 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -82,7 +82,7 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { String signature = record.getSignature(); String msg = record.getMsg(); String notifyUrl = wxMsgConfig.getNotifyurl(); - WxMsgModel wxMsgModel = wxMsgModelMapper.selectByPrimaryKey(record.getModelId()); + WxMsgModel wxMsgModel = wxMsgModelMapper.selectById(record.getModelId()); Integer modelId = null; if (wxMsgModel != null) { modelId = wxMsgModel.getModelId(); @@ -126,17 +126,17 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { if (couponInject != null) { record.setCouponInjectId(couponInject.getId()); } - wxMsgMapper.insertSelective(record); + wxMsgMapper.insert(record); } if (ret.equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode().toString())) { wxMsgService.addMsgCallback(record, batchNo); //wx_msg改为已发送 record.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); - wxMsgMapper.updateByPrimaryKeySelective(record); + wxMsgMapper.updateById(record); } else { logger.error("发送:{},运营商返回失败:{}",phone,result); - wxMsgMapper.updateByPrimaryKeySelective(record); + wxMsgMapper.updateById(record); throw new MallinkException(1001,"运营商返回失败:"+result); } } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java index f90780729..7bc7249ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java @@ -1,19 +1,16 @@ package com.iformall.service.msg.impl; -import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.iformall.common.ErrorCode; -import com.iformall.domain.po.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.MpAppMsg; -import com.iformall.exception.MallinkException; import com.iformall.mapper.WxTemplateMsgMapper; import com.iformall.service.msg.MsgSendService; import com.iformall.service.wechat.FmOpenService; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.bean.template.WxMpTemplate; import me.chanjar.weixin.mp.bean.template.WxMpTemplateData; import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage; import org.slf4j.Logger; @@ -50,7 +47,7 @@ public class SendMpMsgServiceImpl implements MsgSendService { msgQ.setTenantId(mpAppMsg.getTenantId()); msgQ.setType(mpAppMsg.getTemplateType()); try { - msg = wxTemplateMsgMapper.selectOne(msgQ); + msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ)); } catch (Exception e) { logger.error("公众号消息模板错误: " + e.getMessage()); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index ab5da27aa..ec3ce094f 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -6,14 +6,14 @@ import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.iformall.common.ErrorCode; -import com.iformall.domain.po.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.SmartAppMsg; -import com.iformall.exception.MallinkException; import com.iformall.mapper.WxTemplateMsgMapper; -import com.iformall.service.msg.MsgSendService; import com.iformall.service.WxAppinfoService; +import com.iformall.service.msg.MsgSendService; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.MaUtil; import org.slf4j.Logger; @@ -60,7 +60,7 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { WxTemplateMsg msgQ = new WxTemplateMsg(); msgQ.setTenantId(smartAppMsg.getTenantId()); msgQ.setType(smartAppMsg.getTemplateType()); - List list = wxTemplateMsgMapper.select(msgQ); + List list = wxTemplateMsgMapper.selectList(new QueryWrapper(msgQ)); if (list.size() > 0) { msg = list.get(0); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index d91116eaa..b84c4f5cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -105,7 +105,7 @@ public class SendSmsServiceImpl implements MsgSendService { Date expiredate = new Date(currentTime); wxMsgValidationcode.setExpiretime(expiredate); } - wxMsgValidationcodeMapper.insertSelective(wxMsgValidationcode); + wxMsgValidationcodeMapper.insert(wxMsgValidationcode); wxMsgValidationcodeService.addMsgCallback(wxMsgValidationcode,batchNo); //扣减剩余条数 wxMsgConfig.setRemains(1l); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java index db5341fe9..ab5f92e10 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java @@ -6,17 +6,13 @@ import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.iformall.common.ErrorCode; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.BaseMsg; -import com.iformall.domain.po.msg.MpAppMsg; -import com.iformall.domain.po.WxTemplateMsg; -import com.iformall.exception.MallinkException; import com.iformall.mapper.WxTemplateMsgMapper; import com.iformall.service.msg.MsgSendService; import com.iformall.service.wechat.FmOpenService; -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +47,7 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService { msgQ.setTenantId(appUniformMsg.getTenantId()); msgQ.setType(appUniformMsg.getTemplateType()); try { - msg = wxTemplateMsgMapper.selectOne(msgQ); + msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ)); } catch (Exception e) { logger.error("公众号消息模板错误: " + e.getMessage()); } diff --git a/mallinkService/src/main/java/com/iformall/service/sys/impl/MallSaleTypeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/sys/impl/MallSaleTypeServiceImpl.java index 16a5cd878..8614cc815 100644 --- a/mallinkService/src/main/java/com/iformall/service/sys/impl/MallSaleTypeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/sys/impl/MallSaleTypeServiceImpl.java @@ -32,7 +32,7 @@ public class MallSaleTypeServiceImpl implements MallSaleTypeService { @Override public MallSaleType getById(Long id) { - return mallSaleTypeMapper.selectByPrimaryKey(id); + return mallSaleTypeMapper.selectById(id); } @Override @@ -40,15 +40,15 @@ public class MallSaleTypeServiceImpl implements MallSaleTypeService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallSaleTypeMapper.insertSelective(record); + mallSaleTypeMapper.insert(record); } else { - mallSaleTypeMapper.updateByPrimaryKeySelective(record); + mallSaleTypeMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallSaleTypeMapper.deleteByPrimaryKey(id); + mallSaleTypeMapper.deleteById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 114f02929..e3810038f 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -1099,8 +1099,6 @@ public class DateUtils { * @return <0:已过n天;=0:当天 ;>0 n天前 */ public static int birthdaysBetween(Date date) { - Date today = new Date() ; - date.setYear(today.getYear()); Calendar todayCal = Calendar.getInstance(); Calendar birthdayCal = Calendar.getInstance(); birthdayCal.setTime(date); diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 30d73891f..7410bc1ec 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -115,7 +115,7 @@ - select from mall_user_info diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 2822a3e8a..ac313da7d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -170,7 +170,7 @@ delete from wx_bill_property where property_contract_id = #{id} - + update wx_bill_property set updatetime = now() ,receive_pay = #{receivePay},owe=#{receivePay} ,comments = #{comments} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index dfdaec754..110b7598c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -177,7 +177,7 @@ delete from wx_bill_rent where rent_contract_id = #{id} - + update wx_bill_rent set updatetime = now() ,receive_pay = #{receivePay} ,comments = #{comments} diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml index 6a1f89daa..d5521c13f 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -31,11 +31,6 @@ - - -