From 92c64f7a0b5dbbb5e495b020aa1fbc49f8640398 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 19 Mar 2019 18:32:50 +0800 Subject: [PATCH 01/26] =?UTF-8?q?[B=E7=AB=AF=E8=B4=A6=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 728920e66..094b1129d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -186,7 +186,7 @@ need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_other union - select id,merchant_id,shop_id,tenant_id,name,8 bill_type_value,'其他押金' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,'其他押金' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type from wx_bill_other_deposit ) bill From f9a2cb60f563ce5f8d1999851e2a4f6c7ce44e22 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 19 Mar 2019 18:47:59 +0800 Subject: [PATCH 02/26] =?UTF-8?q?[=E6=8A=BC=E9=87=91=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E8=B0=83=E6=95=B4=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=B0=83=E6=95=B4=E6=AC=A0=E7=BC=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillDepositServiceImpl.java | 1 + .../com/iformall/service/impl/WxBillOtherDepositServiceImpl.java | 1 + .../iformall/service/impl/WxBillPropertyDepositServiceImpl.java | 1 + 3 files changed, 3 insertions(+) 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 99a641334..8ff2827ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -189,6 +189,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } wxBillDeposit.setReceivePay(record.getReceivePay()); + wxBillDeposit.setOwe(record.getReceivePay() - record.getPay()); wxBillDeposit.setUpdatetime(new Date()); try { wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); 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 4246f7492..957da7b1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -207,6 +207,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); } wxBillDeposit.setReceivePay(record.getReceivePay()); + wxBillDeposit.setOwe(record.getReceivePay() - record.getPay()); wxBillDeposit.setUpdatetime(new Date()); try { wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); 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 b724252d2..cbe960738 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -190,6 +190,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); } wxBillDeposit.setReceivePay(record.getReceivePay()); + wxBillDeposit.setOwe(record.getReceivePay() - record.getPay()); wxBillDeposit.setUpdatetime(new Date()); try { wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); From e0515e0008aaac4c66053bbe669be7613447a05c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 19 Mar 2019 21:00:30 +0800 Subject: [PATCH 03/26] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=A0=A1=E9=AA=8C=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxMsgCallbackServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fa73fa083..d18a4ae9e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.domain.po.WxMsgConfig; import com.iformall.domain.po.WxMsgModel; import com.iformall.domain.po.WxMsgValidationcodeModel; import com.iformall.enums.EnumMsgSendStatus; -import com.iformall.enums.EnumMsgStatus; import com.iformall.mapper.*; import com.iformall.service.WxMsgCallbackService; import com.iformall.utils.HMACSHA256; @@ -163,8 +162,9 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { sb.append(entry.getKey()).append("=").append(entry.getValue()); } sb.append("&secret=").append(wxMsgConfig.getSecret()); + logger.info("message:" + sb.toString() + ",secret:" + wxMsgConfig.getSecret()); String sign_check = HMACSHA256.sha256_HMAC(sb.toString(), wxMsgConfig.getSecret()); - + logger.info("sign_check:" + sign_check); return sign_check.equalsIgnoreCase(param.get("sign")); } From 1ad64c0b40df75f6ac44ef5c893a6b770cd642dc Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:11:32 +0800 Subject: [PATCH 04/26] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=94=AF=E4=BB=98=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B41=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/OrderExpiringSchedule.java | 37 ++++++++++++------- .../com/iformall/mapper/WxOrderMapper.java | 2 + .../main/resources/mapper/WxOrderMapper.xml | 16 ++++++++ 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 5f09e04a7..7f29757d4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -2,10 +2,7 @@ package com.iformall.schedule; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxOrder; -import com.iformall.enums.EnumAppType; -import com.iformall.enums.EnumOrderStatus; -import com.iformall.enums.EnumOrderType; -import com.iformall.enums.EnumRefundStatus; +import com.iformall.enums.*; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxOrderGroupMapper; import com.iformall.mapper.WxOrderMapper; @@ -29,7 +26,8 @@ import java.util.Map; public class OrderExpiringSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final int TIME_OUT_VALUE = 15 * 60 * 1000; //15分钟 + private final int NORMAL_TIME_OUT = 15 * 60 * 1000; //普通券 必须15分钟内支付 + private final int PRESS_TIME_OUT = 15 * 60 * 1000; //砍价券 必须60分钟内支付 @Autowired WxOrderMapper wxOrderMapper; @@ -55,7 +53,7 @@ public class OrderExpiringSchedule { Map dateMap = new HashMap(); Date curDate = new Date(); - Date expireDate = new Date(curDate.getTime() - TIME_OUT_VALUE ); + Date expireDate = new Date(curDate.getTime() - NORMAL_TIME_OUT ); // 券相关订单, 15分钟未支付, 订单过期 dateMap.put("type", EnumOrderType.COUPON.getCode()); @@ -65,19 +63,32 @@ public class OrderExpiringSchedule { try { orderExpired(o); } catch (Exception e) { - logger.error(e.getMessage()); + logger.error("券过期失败" + e.getMessage()); } }); - // 砍价相关订单, 已超过砍价结束时间, 订单过期 + // 砍价相关订单, + // 1. 如果已经砍价完成,必须60分钟内支付, 未支付,订单过期 + Date pressExpireDate = new Date(curDate.getTime() - PRESS_TIME_OUT ); + dateMap.put("type", EnumOrderType.COUPON.getCode()); + dateMap.put("endDate", pressExpireDate); + List orderPresss = wxOrderMapper.findListOfUnCompletePressOrderByDate(dateMap); + orderPresss.stream().forEach( o -> { + try { + orderPressExpired(o); + } catch (Exception e) { + logger.error("砍价券支付过期失败" + e.getMessage()); + } + }); + // 2. 当前已超过砍价结束时间, 订单过期 dateMap.put("type", EnumOrderType.COUPON.getCode()); dateMap.put("endDate", curDate); - List orderPresss = wxOrderMapper.findListOfUnpaidPressOrderByDate(dateMap); + orderPresss = wxOrderMapper.findListOfUnpaidPressOrderByDate(dateMap); orderPresss.stream().forEach( o -> { try { orderPressExpired(o); } catch (Exception e) { - logger.error(e.getMessage()); + logger.error("砍价券过期失败" +e.getMessage()); } }); @@ -131,9 +142,7 @@ public class OrderExpiringSchedule { // 微信 关单 wxOrderService.orderClose(updateOrder); - logger.info("\nFound " + order.getId() + "\n" - + " create at " + order.getCreateDate() +"\n" - + " expired at " + new Date()); + logger.info("券订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + new Date()); } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @@ -148,7 +157,7 @@ public class OrderExpiringSchedule { // 库存退回 wxOrderService.stockBack(order); - logger.info("\n砍价订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); + logger.info("砍价订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index f2e339f37..bc8f3475c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -15,7 +15,9 @@ public interface WxOrderMapper extends CommonMapper { Integer countList(WxOrder wxOrder); List findListOfUnpaidOrderByDate(Map dateMap); + List findListOfUnpaidPressOrderByDate(Map dateMap); + List findListOfUnCompletePressOrderByDate(Map dateMap); List findListOfCUser(WxOrder wxOrder); WxOrderCouponVo selectDetailOfCUser(WxOrder wxOrder); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f300c71d3..a3978b90b 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -164,6 +164,22 @@ + + o.id,o.order_number,o.tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, From b109bfc3010d704b47de4e6f80033f8f6552cf61 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:19:14 +0800 Subject: [PATCH 05/26] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=94=AF=E4=BB=98=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B41=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/schedule/OrderExpiringSchedule.java | 2 +- .../src/main/java/com/iformall/mapper/WxOrderMapper.java | 2 +- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 7f29757d4..1419d360d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -72,7 +72,7 @@ public class OrderExpiringSchedule { Date pressExpireDate = new Date(curDate.getTime() - PRESS_TIME_OUT ); dateMap.put("type", EnumOrderType.COUPON.getCode()); dateMap.put("endDate", pressExpireDate); - List orderPresss = wxOrderMapper.findListOfUnCompletePressOrderByDate(dateMap); + List orderPresss = wxOrderMapper.findListOfCompleteUnPaidPressOrderByDate(dateMap); orderPresss.stream().forEach( o -> { try { orderPressExpired(o); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index bc8f3475c..9a39930a5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -17,7 +17,7 @@ public interface WxOrderMapper extends CommonMapper { List findListOfUnpaidOrderByDate(Map dateMap); List findListOfUnpaidPressOrderByDate(Map dateMap); - List findListOfUnCompletePressOrderByDate(Map dateMap); + List findListOfCompleteUnPaidPressOrderByDate(Map dateMap); List findListOfCUser(WxOrder wxOrder); WxOrderCouponVo selectDetailOfCUser(WxOrder wxOrder); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index a3978b90b..1f591b917 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -164,11 +164,11 @@ - select from wx_order - where press_end_date is not null and order_status = 6 + where press_end_date is not null and order_status = 7 AND type = #{type,jdbcType=TINYINT} @@ -176,7 +176,7 @@ AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP}) - AND unix_timestamp(`press_end_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) + AND unix_timestamp(`update_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) From 9a8fe3da3ec2e2dd43034e40183a3e7f37da0d33 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:31:58 +0800 Subject: [PATCH 06/26] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=9AtenantId=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WechatLoginController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index b52ed0097..215f94316 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -207,14 +207,15 @@ public class WechatLoginController extends BaseController { } } else { // 跳转登录选择页面 - String key = WECHAT_PREV + TOTP.generateWechatOpen(accessToken.getOpenId()); + String openId = accessToken.getOpenId(); + String key = WECHAT_PREV + TOTP.generateWechatOpen(openId); Boolean isAbsent = openRedisTemplate.execute(new RedisCallback() { @Override public Boolean doInRedis(RedisConnection connection) throws DataAccessException { RedisSerializer valueSerializer = openRedisTemplate.getValueSerializer(); RedisSerializer keySerializer = openRedisTemplate.getKeySerializer(); Object obj = connection.execute("set", keySerializer.serialize(key), - valueSerializer.serialize(key), + valueSerializer.serialize(openId), SafeEncoder.encode("NX"), SafeEncoder.encode("EX"), Protocol.toByteArray(60)); // 60s 过期时间 @@ -273,10 +274,11 @@ public class WechatLoginController extends BaseController { String openKey = WECHAT_PREV + key; // 限时时间内查找到此用户openId - if (openRedisTemplate.hasKey(WECHAT_PREV + key)){ + if (openRedisTemplate.hasKey(openKey)){ + log.info(openKey + " - 找不到"); String openId = openRedisTemplate.opsForValue().get(openKey); - // 删除缓存 openRedisTemplate.delete(openKey); + log.info("KEY: " + openKey + " deleted"); MallUserInfo userInfo = mallUserInfoService.getByUsername(userName); if(userInfo.getWebOpenId().equals(openId)) { @@ -315,10 +317,11 @@ public class WechatLoginController extends BaseController { } } else { // 登录失败 - log.error("微信登录失败,未找到对应的openId"); - return new ResultData(ErrorCode.WECHAT_LOGIN_KEY_OVERTIME); + log.error("微信登录失败,用户微信未绑定"); + return new ResultData(ErrorCode.WECHAT_LOGIN_NOT_BIND); } } + log.error("微信登录失败,KEY已过期"); return new ResultData(ErrorCode.WECHAT_LOGIN_KEY_OVERTIME); } From 1cf9be056d8d201700dd9d238e1cad056a38e112 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:47:01 +0800 Subject: [PATCH 07/26] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=9AtenantId=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WechatLoginController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index 215f94316..30cc44628 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -208,13 +208,14 @@ public class WechatLoginController extends BaseController { } else { // 跳转登录选择页面 String openId = accessToken.getOpenId(); - String key = WECHAT_PREV + TOTP.generateWechatOpen(openId); + String key = TOTP.generateWechatOpen(openId); + String openKey = WECHAT_PREV + key; Boolean isAbsent = openRedisTemplate.execute(new RedisCallback() { @Override public Boolean doInRedis(RedisConnection connection) throws DataAccessException { RedisSerializer valueSerializer = openRedisTemplate.getValueSerializer(); RedisSerializer keySerializer = openRedisTemplate.getKeySerializer(); - Object obj = connection.execute("set", keySerializer.serialize(key), + Object obj = connection.execute("set", keySerializer.serialize(openKey), valueSerializer.serialize(openId), SafeEncoder.encode("NX"), SafeEncoder.encode("EX"), @@ -317,11 +318,11 @@ public class WechatLoginController extends BaseController { } } else { // 登录失败 - log.error("微信登录失败,用户微信未绑定"); + log.error("微信登录失败,用户微信未绑定:" + openId); return new ResultData(ErrorCode.WECHAT_LOGIN_NOT_BIND); } } - log.error("微信登录失败,KEY已过期"); + log.error("微信登录失败,KEY已过期: "+ key); return new ResultData(ErrorCode.WECHAT_LOGIN_KEY_OVERTIME); } From 14d2169360368035be386d5547247acdda499fa8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:48:27 +0800 Subject: [PATCH 08/26] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=9AtenantId=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WechatLoginController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index 30cc44628..6b8c50b2a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -56,7 +56,7 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/wechat") @Slf4j public class WechatLoginController extends BaseController { - private String WECHAT_PREV = "OPEN-"; + private String WECHAT_PREV = "LOGIN:OPEN:"; @Autowired private WxMpService wxMpService; From 56040c3f47491774f79e9ccf34d1a88de049a9ca Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:54:59 +0800 Subject: [PATCH 09/26] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=B8=85=E9=99=A4=E6=97=A0=E7=94=A8code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WechatLoginController.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index 6b8c50b2a..9a9174a58 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -84,7 +84,6 @@ public class WechatLoginController extends BaseController { log.debug("[" + getIpAddr() + "] MallUserInfoController::login"); String host = request.getHeader("host"); log.debug("Host: " + host); - // host = getHost(host); String wechatUrl = wxMpService.buildQrConnectUrl("https://"+host+"/api/wechat/callback", "snsapi_login", "111"); try { response.sendRedirect(wechatUrl); @@ -93,22 +92,6 @@ public class WechatLoginController extends BaseController { } } - private String getHost(String host) { - if(host.contains("iformall.com")) { - if(host.contains("admintest")) { - host = "admin.malls.iformall.com"; - } else { - host = "admintest.malls.iformall.com"; - } - - } else if(host.contains("youlane.cn")) { - host = "mall.youlane.cn"; - } else { - host = "admin.malls.iformall.com"; - } - return host; - } - @ApiOperation(value = "微信网页登录回调", notes = "请配置此callback到网页redirect_uri") @GetMapping("callback") public void getAccessToken(String code, String state, HttpServletRequest request, HttpServletResponse response) { @@ -116,7 +99,6 @@ public class WechatLoginController extends BaseController { String host = request.getHeader("host"); log.debug("host: " + host); log.debug("code: " + code); - // host = getHost(host); try { WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code); log.info("accessToken: " + accessToken.getAccessToken() + ", openId: " + accessToken.getOpenId() + ", unionId: " + accessToken.getUnionId()); From 9dd7365c1abc6d307a4cf74c382f0a4a2229fd28 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:56:19 +0800 Subject: [PATCH 10/26] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=B8=85=E9=99=A4=E6=97=A0=E7=94=A8code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WechatLoginController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index 9a9174a58..f849536d5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -235,7 +235,6 @@ public class WechatLoginController extends BaseController { log.error(e.getMessage()); } } - //return r; } catch (WxErrorException e) { log.error(e.getMessage()); } From 15498035dac4700fd994b5d76ca7c8d3efa55f75 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 11:07:53 +0800 Subject: [PATCH 11/26] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:redis=20key=E6=A0=BC=E5=BC=8F=E9=87=8D?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/PushLimitServiceImpl.java | 2 +- .../java/com/iformall/service/impl/WxCUserServiceImpl.java | 6 ++++-- .../com/iformall/service/impl/WxScoreRulesServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) 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 0e9cc3b6d..7718be070 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Map; public class PushLimitServiceImpl implements PushLimitService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private String keyPrev = "pushlimit_"; + private String keyPrev = "setting:pushlimit:"; @Autowired PushLimitMapper pushLimitMapper; 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 106a46651..b9c962173 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -27,6 +27,8 @@ import java.util.concurrent.TimeUnit; public class WxCUserServiceImpl implements WxCUserService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private String tokenPrev = "weapp:token:"; + @Autowired WxCUserMapper wxCUserMapper; @@ -66,7 +68,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public WxCUser getByToken(String token) { logger.info("获取用户信息start ..."); - String key = "token_" + token; + String key = tokenPrev + token; ValueOperations operations = cUserTokenRedisTemplate.opsForValue(); // 缓存 @@ -99,7 +101,7 @@ public class WxCUserServiceImpl implements WxCUserService { user.setUpdateDate(curr); ret = wxCUserMapper.updateByPrimaryKeySelective(user); } - String key = "token_" + user.getToken(); + String key = tokenPrev + user.getToken(); // 缓存已存在,删除 boolean hasKey = cUserTokenRedisTemplate.hasKey(key); if(hasKey) { 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 d45ae2d04..9f1e0524e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -26,7 +26,7 @@ import java.util.List; public class WxScoreRulesServiceImpl implements WxScoreRulesService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private String keyPrev = "scorerules_"; + private String keyPrev = "setting:scorerules:"; @Autowired WxScoreRulesMapper wxScoreRulesMapper; From 2222e019724b1086246f8edf3ccec21032a49366 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 15:21:46 +0800 Subject: [PATCH 12/26] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 0dd05115d..4ceee409c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -73,7 +73,7 @@ public class WxChartServiceImpl implements WxChartDataService { if (StringUtils.isEmpty(startdate)) { startdate = DateUtils.getSystemTime("yyyy-MM-dd") + " 00:00:00" ; } - if(StringUtils.isBlank(enddate)){ + if (StringUtils.isEmpty(enddate)) { enddate = DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"; } @@ -1470,19 +1470,22 @@ public class WxChartServiceImpl implements WxChartDataService { WxCoupon wxCoupon = new WxCoupon(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); wxCoupon.setStartdate(c.getTime()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { + wxCoupon.setEnddate(new Date()); }else{ - Date endTime = DateUtils.stringToDate(enddate); + Date endTime = DateUtils.stringToDate(enddate, "yyyy-MM-dd HH:mm:ss"); wxCoupon.setEnddate(endTime); } @@ -1512,19 +1515,22 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); wxCoupon.setStartdate(c.getTime()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { + wxCoupon.setEnddate(new Date()); }else{ - Date endTime = DateUtils.stringToDate(enddate); + Date endTime = DateUtils.stringToDate(enddate, "yyyy-MM-dd HH:mm:ss"); wxCoupon.setEnddate(endTime); } List orderCountList = wxCouponService.findCouponOrderCount(wxCoupon); @@ -1566,19 +1572,22 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); wxCoupon.setStartdate(c.getTime()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { + wxCoupon.setEnddate(new Date()); }else{ - Date endTime = DateUtils.stringToDate(enddate); + Date endTime = DateUtils.stringToDate(enddate, "yyyy-MM-dd HH:mm:ss"); wxCoupon.setEnddate(endTime); } List pressSendHistory = wxCouponService.pressSendHistory(wxCoupon); @@ -1615,21 +1624,23 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashMap<>(); Date startTime = new Date(); Date endTime = startTime; - if (paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))) { + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH, 1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); startTime = c.getTime(); params.put("startdate", startTime); } else { startTime = DateUtils.stringToDate(startdate + " 00:00:00"); params.put("startdate", startTime); } - if (paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))) { + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { params.put("enddate", endTime); } else { - endTime = DateUtils.stringToDate(enddate + " 23:59:59"); - params.put("enddate", endTime); + params.put("enddate", paramsMap.get("enddate") + " 23:59:59"); } List> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); From 71d0f624f81a16b39c813425251908d805eab1c0 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 15:42:59 +0800 Subject: [PATCH 13/26] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 9c166d84e..686ffa9f5 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -180,7 +180,7 @@ + select count(br.id) from wx_bill_property br,wx_property_contract c + where c.id = br.property_contract_id and br.status = 1 and c.id = #{contractId} + diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index c81d0ca4a..e7a026ab6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -127,7 +127,7 @@ update wx_bill_rent set status = 6 where rent_contract_id = #{rentContractId} - and status in(4,2) + and status != 3 @@ -144,4 +144,10 @@ update wx_bill_rent set is_preview = #{isPreview},merchant_id = #{merchantId} where rent_contract_id = #{rentContractId} + + + diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index 200f74f24..53762e162 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -72,10 +72,20 @@ + - From f6c58c8065fa93a1b07db7b2781533603853345f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 16:01:06 +0800 Subject: [PATCH 16/26] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=9C=A8C=E7=AB=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 bc71606f7..2cd2c16fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -532,6 +532,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } + wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); wxLevelConfigService.batchSaveByMerchantId(wxMerchant.getTenantId(), wxMerchant.getId(), wxMerchant.getLevelConfigList()); } catch (Exception e) { logger.error("db failed: 账号操作失败, e:" + e.getMessage()); From a3791dcc8434e41d62a977bb96f963040c0233dc Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 20 Mar 2019 16:02:47 +0800 Subject: [PATCH 17/26] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxBillAllController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java index 0536fc52f..592da648b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java @@ -29,7 +29,7 @@ public class WxBillAllController extends BaseController private Logger logger = LoggerFactory.getLogger(WxBillAllController.class); - @GetMapping("hasOweBill") + @GetMapping("oweBillCount") @ApiImplicitParams({ @ApiImplicitParam(name="contractId",value="合同id",dataType="long", paramType = "query",required=true), @ApiImplicitParam(name="type",value="类型1租赁合同2物业合同",dataType="int", paramType = "query",required=true)}) From 8e0da0458d557cabd290e702b618a5d0b5a82be2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 20 Mar 2019 16:04:14 +0800 Subject: [PATCH 18/26] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxBillAllController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java index 592da648b..8df24f09a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java @@ -33,7 +33,7 @@ public class WxBillAllController extends BaseController @ApiImplicitParams({ @ApiImplicitParam(name="contractId",value="合同id",dataType="long", paramType = "query",required=true), @ApiImplicitParam(name="type",value="类型1租赁合同2物业合同",dataType="int", paramType = "query",required=true)}) - public ResultData hasOweBill(Long contractId,Integer type) { + public ResultData oweBillCount(Long contractId,Integer type) { Long count = wxBillAllService.hasOweBill(contractId,type); return new ResultData(count); } From 95598b0e5a01e0f3faa7f0b6a54e039e22d247b1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 16:33:32 +0800 Subject: [PATCH 19/26] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=9C=A8C=E7=AB=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantController.java | 2 ++ .../com/iformall/domain/po/WxMerchant.java | 16 ++++----- .../com/iformall/domain/vo/WxMerchantVo.java | 10 +++--- .../iformall/enums/EnumMerchantPublic.java | 35 +++++++++++++++++++ .../resources/mapper/WxMerchantMapper.xml | 17 +++++---- 5 files changed, 61 insertions(+), 19 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumMerchantPublic.java diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index a6dc15c12..b98c7247f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxMerchantVo; +import com.iformall.enums.EnumMerchantPublic; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxMerchantService; import com.iformall.utils.HashUtil; @@ -39,6 +40,7 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchantVo(); wxMerchant.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); return new ResultData(wxMerchantService.listAsPageCVo(wxMerchant, pageNum, pageSize)); } 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 62bd5f563..247d16b01 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -140,8 +140,8 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") - private Integer show; + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "isPublic") + private Integer isPublic; public List getLevelConfigList() { return levelConfigList; @@ -380,13 +380,13 @@ public class WxMerchant implements Serializable { this.type = type; } - public Integer getShow() { - return show; - } + public Integer getIsPublic() { + return isPublic; + } - public void setShow(Integer show) { - this.show = show; - } + public void setIsPublic(Integer isPublic) { + this.isPublic = isPublic; + } public static enum Field { 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 8d0b46554..d0f0ca2af 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -51,14 +51,14 @@ public class WxMerchantVo { private String floorName; @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") - private String show; + private Integer isPublic; - public String getShow() { - return show; + public Integer getIsPublic() { + return isPublic; } - public void setShow(String show) { - this.show = show; + public void setIsPublic(Integer isPublic) { + this.isPublic = isPublic; } public String getBuildingName() {return buildingName; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantPublic.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantPublic.java new file mode 100644 index 000000000..9acd6ba31 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantPublic.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMerchantPublic { + + PUBLIC(1, "公开"), + PRIVATE(0, "私有"),; + + public static EnumMerchantPublic getEnum(Integer code) { + for (EnumMerchantPublic value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMerchantPublic(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0faac31b4..6d4423835 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -17,13 +17,13 @@ - + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`shop_type`,`brand`,`type`,`show` + `business_id`,`shop_type`,`brand`,`type`,`public` @@ -77,8 +77,8 @@ and `type` = #{type} - - and `show` = #{show} + + and `public` = #{public} and id in @@ -100,7 +100,7 @@ m.id, m.img_url,m.name,m.link_phone,m.status,m.business_id, s.addr,s.shop_number,s.baidu_poi, - mb.building_name,mf.floor_name,m.show + mb.building_name,mf.floor_name,m.is_public @@ -115,7 +115,7 @@ - + @@ -177,6 +177,11 @@ and mf.`floor_name` like concat('%', #{floorName},'%') + + + and m.`is_public` = #{isPublic} + + From e3cc0254c4f441bc07a9bbe148920dc1ef70db85 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 16:46:50 +0800 Subject: [PATCH 20/26] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=9C=A8C=E7=AB=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 6d4423835..57c6141d4 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -17,7 +17,7 @@ - + From 8b4c788a08783a4d03d33e2456122cca3320dee9 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 20 Mar 2019 16:52:20 +0800 Subject: [PATCH 21/26] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponMapper.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index cba7d3ab6..8c9ae624f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -713,11 +713,10 @@ From 70d802921b24b17eae2fe0dcb4f4397454292cec Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 16:51:32 +0800 Subject: [PATCH 22/26] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=9C=A8C=E7=AB=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxMerchantMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 57c6141d4..a7e9c6949 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -23,7 +23,7 @@ `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`shop_type`,`brand`,`type`,`public` + `business_id`,`shop_type`,`brand`,`type`,`is_public` @@ -77,8 +77,8 @@ and `type` = #{type} - - and `public` = #{public} + + and `is_public` = #{isPublic} and id in @@ -177,8 +177,8 @@ and mf.`floor_name` like concat('%', #{floorName},'%') - - + + and m.`is_public` = #{isPublic} From 109e2542b564771d36911182dcf51d03ba431072 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 17:01:38 +0800 Subject: [PATCH 23/26] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E6=B5=8B=E8=AF=95=EF=BC=9Aversion:.782.1095=20?= =?UTF-8?q?=EF=BC=9A=E6=8B=BC=E5=9B=A2=E8=90=A5=E9=94=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 686ffa9f5..33e6d51c0 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -121,7 +121,7 @@ from wx_coupon c where type=9 ) c - + and c.coupon_id=#{couponId} From c3b6d5efb076ea7c355252db8ae9887d07384145 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 17:12:15 +0800 Subject: [PATCH 24/26] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E6=B5=8B=E8=AF=95=EF=BC=9Aversion:.782.1095=20?= =?UTF-8?q?=EF=BC=9A=E6=8B=BC=E5=9B=A2=E8=90=A5=E9=94=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxOrderGroupMapper.xml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 33e6d51c0..12ead6dde 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -99,25 +99,16 @@