From 2c566dc8880cdd1e06f748f55699aaa16a48e5fb Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 30 Mar 2023 14:31:50 +0800 Subject: [PATCH 1/2] fix rent --- .../db/migration/V2023040300001_business.sql | 100 ++++++++++++++++++ .../impl/WxRentContractServiceImpl.java | 1 + 2 files changed, 101 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023040300001_business.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023040300001_business.sql b/mallinkAdmin/src/main/resources/db/migration/V2023040300001_business.sql new file mode 100644 index 000000000..99de096c9 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023040300001_business.sql @@ -0,0 +1,100 @@ +alter table wx_coupon_0 modify column business int(11); +alter table wx_coupon_1 modify column business int(11); +alter table wx_coupon_2 modify column business int(11); +alter table wx_coupon_3 modify column business int(11); +alter table wx_coupon_4 modify column business int(11); +alter table wx_coupon_5 modify column business int(11); +alter table wx_coupon_6 modify column business int(11); +alter table wx_coupon_7 modify column business int(11); +alter table wx_coupon_8 modify column business int(11); +alter table wx_coupon_9 modify column business int(11); +alter table wx_coupon_10 modify column business int(11); +alter table wx_coupon_11 modify column business int(11); +alter table wx_coupon_12 modify column business int(11); +alter table wx_coupon_13 modify column business int(11); +alter table wx_coupon_14 modify column business int(11); +alter table wx_coupon_15 modify column business int(11); +alter table wx_coupon_16 modify column business int(11); +alter table wx_coupon_17 modify column business int(11); +alter table wx_coupon_18 modify column business int(11); +alter table wx_coupon_19 modify column business int(11); +alter table wx_coupon_20 modify column business int(11); +alter table wx_coupon_21 modify column business int(11); +alter table wx_coupon_22 modify column business int(11); +alter table wx_coupon_23 modify column business int(11); +alter table wx_coupon_24 modify column business int(11); +alter table wx_coupon_25 modify column business int(11); +alter table wx_coupon_26 modify column business int(11); +alter table wx_coupon_27 modify column business int(11); +alter table wx_coupon_28 modify column business int(11); +alter table wx_coupon_29 modify column business int(11); +alter table wx_coupon_30 modify column business int(11); +alter table wx_coupon_31 modify column business int(11); +alter table wx_coupon_32 modify column business int(11); +alter table wx_coupon_33 modify column business int(11); +alter table wx_coupon_34 modify column business int(11); +alter table wx_coupon_35 modify column business int(11); +alter table wx_coupon_36 modify column business int(11); +alter table wx_coupon_37 modify column business int(11); +alter table wx_coupon_38 modify column business int(11); +alter table wx_coupon_39 modify column business int(11); +alter table wx_coupon_40 modify column business int(11); +alter table wx_coupon_41 modify column business int(11); +alter table wx_coupon_42 modify column business int(11); +alter table wx_coupon_43 modify column business int(11); +alter table wx_coupon_44 modify column business int(11); +alter table wx_coupon_45 modify column business int(11); +alter table wx_coupon_46 modify column business int(11); +alter table wx_coupon_47 modify column business int(11); +alter table wx_coupon_48 modify column business int(11); +alter table wx_coupon_49 modify column business int(11); +alter table wx_coupon_50 modify column business int(11); +alter table wx_coupon_51 modify column business int(11); +alter table wx_coupon_52 modify column business int(11); +alter table wx_coupon_53 modify column business int(11); +alter table wx_coupon_54 modify column business int(11); +alter table wx_coupon_55 modify column business int(11); +alter table wx_coupon_56 modify column business int(11); +alter table wx_coupon_57 modify column business int(11); +alter table wx_coupon_58 modify column business int(11); +alter table wx_coupon_59 modify column business int(11); +alter table wx_coupon_60 modify column business int(11); +alter table wx_coupon_61 modify column business int(11); +alter table wx_coupon_62 modify column business int(11); +alter table wx_coupon_63 modify column business int(11); +alter table wx_coupon_64 modify column business int(11); +alter table wx_coupon_65 modify column business int(11); +alter table wx_coupon_66 modify column business int(11); +alter table wx_coupon_67 modify column business int(11); +alter table wx_coupon_68 modify column business int(11); +alter table wx_coupon_69 modify column business int(11); +alter table wx_coupon_70 modify column business int(11); +alter table wx_coupon_71 modify column business int(11); +alter table wx_coupon_72 modify column business int(11); +alter table wx_coupon_73 modify column business int(11); +alter table wx_coupon_74 modify column business int(11); +alter table wx_coupon_75 modify column business int(11); +alter table wx_coupon_76 modify column business int(11); +alter table wx_coupon_77 modify column business int(11); +alter table wx_coupon_78 modify column business int(11); +alter table wx_coupon_79 modify column business int(11); +alter table wx_coupon_80 modify column business int(11); +alter table wx_coupon_81 modify column business int(11); +alter table wx_coupon_82 modify column business int(11); +alter table wx_coupon_83 modify column business int(11); +alter table wx_coupon_84 modify column business int(11); +alter table wx_coupon_85 modify column business int(11); +alter table wx_coupon_86 modify column business int(11); +alter table wx_coupon_87 modify column business int(11); +alter table wx_coupon_88 modify column business int(11); +alter table wx_coupon_89 modify column business int(11); +alter table wx_coupon_90 modify column business int(11); +alter table wx_coupon_91 modify column business int(11); +alter table wx_coupon_92 modify column business int(11); +alter table wx_coupon_93 modify column business int(11); +alter table wx_coupon_94 modify column business int(11); +alter table wx_coupon_95 modify column business int(11); +alter table wx_coupon_96 modify column business int(11); +alter table wx_coupon_97 modify column business int(11); +alter table wx_coupon_98 modify column business int(11); +alter table wx_coupon_99 modify column business int(11); \ No newline at end of file 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 bd898a55a..5c55fcbe4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -858,6 +858,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxRentContractMapper.updateById(record); record.setRentalStartDate(tempDate); + wxRentContract.setRentInfo(record.getRentInfo()); } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); From 5ec4f7779798713a673cf4ae5d7e0b7ac0e01b80 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 30 Mar 2023 14:49:33 +0800 Subject: [PATCH 2/2] fix rent --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 5c55fcbe4..d261791bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -858,11 +858,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxRentContractMapper.updateById(record); record.setRentalStartDate(tempDate); - wxRentContract.setRentInfo(record.getRentInfo()); } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } + //重新查一次 + wxRentContract = wxRentContractMapper.selectById(record.getId()); return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", wxRentContract); }