From 3e25c6b68769f936336198adbfbcc6d06e089312 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 26 Oct 2020 17:50:19 +0800 Subject: [PATCH] fix bug --- .../controller/WxCouponOrderController.java | 2 -- .../impl/WxCouponOrderServiceImpl.java | 8 +++--- .../shard/plugin/ShardingSpherePlugin.java | 26 +++++++++++-------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 7137fa9c7..6814bde71 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -337,6 +337,4 @@ public class WxCouponOrderController extends BaseController { 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 8679c6883..d6e47bf61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -618,10 +618,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void subsidyAfterVerify(WxCouponOrder couponOrder, Long merchantId) { // 检查补贴是否入库 - List wmsList = wxMerchantSubsidyMapper.selectList( - new LambdaQueryWrapper().eq(WxMerchantSubsidy::getOrderId, couponOrder.getOrderId()) - .eq(WxMerchantSubsidy::getType, EnumMerchantSubsidyType.MANUAL) - ); + WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); + subsidy.setOrderId(couponOrder.getOrderId()); + subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); + List wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); if (wmsList.size() > 0) { logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); return; diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java index 93d3772ff..9d06cc174 100644 --- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java +++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java @@ -223,17 +223,21 @@ public class ShardingSpherePlugin implements MyBatisPlus { throw new RuntimeException("table sharinding error column is null"); } try { - System.out.println("column>>>>>>>>>>>>>"+column); - String[] field = column.split("_"); - String fieldName = ""; - if (null != field && field.length > 0) { - for (String f : field) { - fieldName = fieldName + f.substring(0,1).toUpperCase()+f.substring(1); - } - }else { - fieldName = column.substring(0,1).toUpperCase()+column.substring(1); - } - return fieldName; + if (column.contains("_") && (!column.endsWith("_")) && (!column.startsWith("_"))) { + String[] field = column.split("_"); + String fieldName = ""; + if (null != field && field.length > 0) { + for (String f : field) { + fieldName = fieldName + f.substring(0,1).toUpperCase()+f.substring(1); + } + }else { + fieldName = column.substring(0,1).toUpperCase()+column.substring(1); + } + return fieldName; + }else { + return column.substring(0,1).toUpperCase()+column.substring(1); + } + }catch(Exception e) { throw new RuntimeException(e); }