| @@ -337,6 +337,4 @@ public class WxCouponOrderController extends BaseController { | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -618,10 +618,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| public void subsidyAfterVerify(WxCouponOrder couponOrder, Long merchantId) { | public void subsidyAfterVerify(WxCouponOrder couponOrder, Long merchantId) { | ||||
| // 检查补贴是否入库 | // 检查补贴是否入库 | ||||
| List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList( | |||||
| new LambdaQueryWrapper<WxMerchantSubsidy>().eq(WxMerchantSubsidy::getOrderId, couponOrder.getOrderId()) | |||||
| .eq(WxMerchantSubsidy::getType, EnumMerchantSubsidyType.MANUAL) | |||||
| ); | |||||
| WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); | |||||
| subsidy.setOrderId(couponOrder.getOrderId()); | |||||
| subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); | |||||
| List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); | |||||
| if (wmsList.size() > 0) { | if (wmsList.size() > 0) { | ||||
| logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); | logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); | ||||
| return; | return; | ||||
| @@ -223,17 +223,21 @@ public class ShardingSpherePlugin implements MyBatisPlus { | |||||
| throw new RuntimeException("table sharinding error column is null"); | throw new RuntimeException("table sharinding error column is null"); | ||||
| } | } | ||||
| try { | 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) { | }catch(Exception e) { | ||||
| throw new RuntimeException(e); | throw new RuntimeException(e); | ||||
| } | } | ||||