From 7003315a9a8c9bf5041a436286f8f0d3a7b53a55 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Sep 2020 17:40:55 +0800 Subject: [PATCH 1/3] fix bug --- .../java/com/iformall/controller/WxMerchantController.java | 4 ++-- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 6 ++++++ .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 6 ++++++ .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index abf35b910..20751ad81 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -55,7 +55,7 @@ public class WxMerchantController extends BaseController { public ResultData addAccount(@RequestBody WxMerchant wxMerchant) { log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount"); if (!hasPermission()) { - return new ResultData(ErrorCode.USER_NO_PERMISSION); + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),"当前微信绑定的手机号不是商户的联系方式手机号,不能操作"); } if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); @@ -82,7 +82,7 @@ public class WxMerchantController extends BaseController { public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) { log.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId"); if (!hasPermission()) { - return new ResultData(ErrorCode.USER_NO_PERMISSION); + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),"当前微信绑定的手机号不是商户的联系方式手机号,不能操作"); } if (receiver.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index a9a337137..ea59e5abd 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -110,6 +110,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_msg_validationcode_model".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } // wx_profit_sharing_receiver // wx_profit_sharing_result return false; @@ -177,6 +180,9 @@ public class TenantInfoImpl implements TenantInfo { if ("mem_coupon_from_dsp".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } return false; } diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 5de282bfa..c89baef3b 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -110,6 +110,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_msg_validationcode_model".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } // wx_profit_sharing_receiver // wx_profit_sharing_result return false; @@ -183,6 +186,9 @@ public class TenantInfoImpl implements TenantInfo { if ("mem_coupon_from_dsp".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } return false; } 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 14dceb4ef..934a4b6c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -693,7 +693,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { try { return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.COUPON_VERIFY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY); } catch (Exception e) { - logger.error("核销发券: " + e.getMessage()); + logger.error("核销发券: " + e.getMessage(),e); } } return false; From 0e887e467465433e19e2e272deab1d1161eb0349 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Sep 2020 17:52:05 +0800 Subject: [PATCH 2/3] fix bug --- .../main/java/com/iformall/controller/WxInfoController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index cd2e867d7..e7c67844a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -140,9 +140,9 @@ public class WxInfoController extends BaseController { session_key = session.getSessionKey(); openId = session.getOpenid(); unionId = session.getUnionid(); - if (StringUtils.isNotBlank(unionId)) { - boolHaveUnionId = true; - } + //if (StringUtils.isNotBlank(unionId)) { + // boolHaveUnionId = true; + //} resultMap.put("openId", openId); resultMap.put("session_key", session_key); } catch (WxErrorException e) { From 3c3747b2882426687e44b34a5a7525d86f0c4ecd Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Sep 2020 18:02:22 +0800 Subject: [PATCH 3/3] fix bug --- .../iformall/controller/WxLiveController.java | 2 +- .../service/park/impl/etcp/EtcpHelper.java | 51 ++++++++++--------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java index c6ddc2c8a..b49666498 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java @@ -36,7 +36,7 @@ public class WxLiveController extends BaseController { resultData.data = wxMaService.getLiveService().getLiveInfo(start,limit); } catch (WxErrorException e) { logger.error("getLiveinfos error", e); - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"["+appId+"]getLiveinfos error"); } return resultData; } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java index b52536b5d..634c25188 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java @@ -1,5 +1,6 @@ package com.iformall.service.park.impl.etcp; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -136,29 +137,33 @@ public class EtcpHelper { WxCUserCar queryUserCar = new WxCUserCar(); queryUserCar.setCUserId(cUserId); List uclist = wxCUserCarService.getList(queryUserCar); - // 删除ETCP不存在 - for (WxCUserCar userCar : uclist) { - boolean bExist = isExistInArray(arr, userCar.getCarNumber()); - if (!bExist) { - wxCUserCarService.deleteById(userCar.getId()); - uclist.remove(userCar); - } - } - // 添加ETCP的 - for (int i = 0; i < arr.size(); i++) { - String _carNum = arr.getString(i); - boolean bExist = isExistInList(uclist, _carNum); - if (!bExist) { - Date curr = new Date(); - WxCUserCar userCar = new WxCUserCar(); - userCar.setCUserId(cUserId); - userCar.updateTenantInfo(tenantEntity); - userCar.setCarNumber(_carNum); - userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); - userCar.setCreateDate(curr); - userCar.setUpdateDate(curr); - wxCUserCarService.saveOrUpdate(userCar); - } + if(null != uclist ) { + List ucclist = new ArrayList(); + ucclist.addAll(uclist); + // 删除ETCP不存在 + for (WxCUserCar userCar : uclist) { + boolean bExist = isExistInArray(arr, userCar.getCarNumber()); + if (!bExist) { + wxCUserCarService.deleteById(userCar.getId()); + ucclist.remove(userCar); + } + } + // 添加ETCP的 + for (int i = 0; i < arr.size(); i++) { + String _carNum = arr.getString(i); + boolean bExist = isExistInList(ucclist, _carNum); + if (!bExist) { + Date curr = new Date(); + WxCUserCar userCar = new WxCUserCar(); + userCar.setCUserId(cUserId); + userCar.updateTenantInfo(tenantEntity); + userCar.setCarNumber(_carNum); + userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); + userCar.setCreateDate(curr); + userCar.setUpdateDate(curr); + wxCUserCarService.saveOrUpdate(userCar); + } + } } return dataObj1; }