From adc0cf4d40a2c4bd443ef93c4b5033a0fde7d81d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 29 Jul 2019 11:05:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[IdWorker][=E4=BF=AE=E6=94=B9]:IdWorker?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/common/IdWorker.java | 22 ++++++++++++------- .../main/java/com/iformall/utils/IPUtil.java | 3 ++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/IdWorker.java b/mallinkService/src/main/java/com/iformall/common/IdWorker.java index f2c0fa34a..cafe85b1a 100644 --- a/mallinkService/src/main/java/com/iformall/common/IdWorker.java +++ b/mallinkService/src/main/java/com/iformall/common/IdWorker.java @@ -1,6 +1,8 @@ package com.iformall.common; import com.iformall.utils.IPUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.lang.management.ManagementFactory; import java.net.UnknownHostException; @@ -16,6 +18,7 @@ import java.util.List; */ public class IdWorker { + private final Logger logger = LoggerFactory.getLogger(IdWorker.class); // ==============================Fields=========================================== /** 开始时间截 (2015-01-01) */ private final long twepoch = 1489111610226L; @@ -60,16 +63,19 @@ public class IdWorker { private long lastTimestamp = -1L; ///////////////////////////////////////////////////////////////////////////////// - - private static class IdGenHolder { - private static final IdWorker instance = new IdWorker(); - } - - public static IdWorker get(){ - return IdGenHolder.instance; + private static IdWorker instance = null; + public static IdWorker get() { + if(instance == null) { + synchronized (IdWorker.class){ + if(instance==null){ + instance = new IdWorker(); + } + } + } + return instance; } - public IdWorker() { + private IdWorker() { String ipAddr = ""; try { ipAddr = IPUtil.getLocalHostLANAddress().getHostAddress(); diff --git a/mallinkService/src/main/java/com/iformall/utils/IPUtil.java b/mallinkService/src/main/java/com/iformall/utils/IPUtil.java index bff1934f0..f3b138b42 100644 --- a/mallinkService/src/main/java/com/iformall/utils/IPUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/IPUtil.java @@ -4,6 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; +import java.net.Inet4Address; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.UnknownHostException; @@ -62,7 +63,7 @@ public class IPUtil { // 在所有的接口下再遍历IP for (Enumeration inetAddrs = iface.getInetAddresses(); inetAddrs.hasMoreElements();) { InetAddress inetAddr = (InetAddress) inetAddrs.nextElement(); - if (!inetAddr.isLoopbackAddress()) {// 排除loopback类型地址 + if (!inetAddr.isLoopbackAddress() && (inetAddr instanceof Inet4Address)) {// 排除loopback类型地址, ipv4 if (inetAddr.isSiteLocalAddress()) { // 如果是site-local地址,就是它了 return inetAddr; From a64bda4b0032af00b705bc2b809726493e63ac4b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 29 Jul 2019 11:06:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[C=E7=AB=AF=E9=A6=96=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=8D=A2=E4=B8=80=E6=8D=A2=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E5=92=8C=E7=A0=8D=E4=BB=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponChannelController.java | 15 +++++++++++++++ .../iformall/service/WxCouponChannelService.java | 3 ++- .../service/impl/WxCouponChannelServiceImpl.java | 7 +++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index fcb49e1c3..b05be1ad1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -95,4 +95,19 @@ public class WxCouponChannelController extends BaseController { }); } } + + + @ApiOperation("分页列表接口") + @GetMapping("change") + public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) { + if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); + wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); + WxCouponChannelVo vo = wxCouponChannelService.change(wxCouponChannel); + return new ResultData(vo); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 28d030b91..70974113c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -3,7 +3,6 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -71,4 +70,6 @@ public interface WxCouponChannelService { void updateStatusByCouponId(Long couponId,String tenantId,int status); + WxCouponChannelVo change(WxCouponChannel wxCouponChannel); + } 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 111e98205..8e0be7bcb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -7,7 +7,6 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelAddVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -17,7 +16,6 @@ import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponMerchantMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.*; -import org.checkerframework.checker.units.qual.A; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -138,6 +136,11 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponChannelMapper.updateStatusByCouponId(wxCouponChannel); } + @Override + public WxCouponChannelVo change(WxCouponChannel record) { + return wxCouponChannelMapper.findVoList(record).parallelStream().findAny().orElseGet(null); + } + private boolean isCouponMerchantValid(Long couponId) { Map paramMap = new HashMap<>(); paramMap.put("productId",couponId); From 81012fd620814bc20845d7c5f6b77df8d0400389 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 29 Jul 2019 11:09:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=B8=9A=E6=80=81][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E4=B8=9A=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201907291107__G_ALTER_BUSINESS.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201907291107__G_ALTER_BUSINESS.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907291107__G_ALTER_BUSINESS.sql b/mallinkAdmin/src/main/resources/db/migration/V201907291107__G_ALTER_BUSINESS.sql new file mode 100644 index 000000000..e4430165e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907291107__G_ALTER_BUSINESS.sql @@ -0,0 +1,9 @@ +#父级业态 +insert into `wx_business` ( `id`, `title`, `type`, `create_date`, `update_date`) values ( '11', '数码家电', '1', now(), now()); +#子级业态 +insert into `wx_sub_business` ( `id`, `title`, `business_id`, `business_title`, `create_date`, `update_date`) values +( '59', '家用电器', '11', '数码家电', now(), now()), +( '60', '数码产品', '11', '数码家电', now(), now()), +( '61', '手机通信', '11', '数码家电', now(), now()), +( '62', '电脑办公', '11', '数码家电', now(), now()), +( '63', '影音娱乐', '11', '数码家电', now(), now()); \ No newline at end of file