From bbe6333de7fa20d061a0b4bde7ee6c6a40700d2c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 1 Mar 2019 13:52:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:updateByPrimaryKey?= =?UTF-8?q?=E6=94=B9=E4=B8=BAupdateByPrimaryKeySelective?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxAppinfoController.java | 8 ++--- .../schedule/OrderExpiringSchedule.java | 19 +++++++---- .../schedule/WeChatAccessTokenSchedule.java | 9 +++--- .../iformall/service/WxAppinfoService.java | 2 +- .../service/impl/MallUserInfoServiceImpl.java | 6 +++- .../service/impl/WxAppinfoServiceImpl.java | 12 ++++--- .../service/impl/WxBrandServiceImpl.java | 2 +- .../service/impl/WxCardSpendServiceImpl.java | 2 +- .../impl/WxRefundOrderServiceImpl.java | 32 +++++++++---------- 9 files changed, 53 insertions(+), 39 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java index d05366de0..d935fdbdb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java @@ -75,12 +75,12 @@ public class WxAppinfoController extends BaseController { } - @ApiOperation("更新AccessToken, 无限制二维码生成需要更新token") + @ApiOperation("C端更新AccessToken, 无限制二维码生成需要更新token") @GetMapping("/accessTokenUpdate") - public ResultData tokenUpdate() { - logger.debug("[" + getIpAddr() + "] WxAppinfoController::tokenUpdate"); + public ResultData ctokenUpdate() { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::ctokenUpdate"); try { - wxAppinfoService.tokenUpdate(getTenantId()); + wxAppinfoService.ctokenUpdate(getTenantId()); } catch (Exception e) { logger.error(e.getMessage()); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index b92595743..8d569777e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -58,12 +58,14 @@ public class OrderExpiringSchedule { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void orderExpired(WxOrder order) { - order.setUpdateDate(new Date()); - order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); - wxOrderMapper.updateByPrimaryKeySelective(order); + WxOrder updateOrder = new WxOrder(); + updateOrder.setId(order.getId()); + updateOrder.setUpdateDate(new Date()); + updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); + wxOrderMapper.updateByPrimaryKeySelective(updateOrder); // 微信 关单 - wxOrderService.orderClose(order); + wxOrderService.orderClose(updateOrder); logger.info("\nFound " + order.getId() + "\n" + " create at " + order.getCreateDate() +"\n" @@ -73,9 +75,12 @@ public class OrderExpiringSchedule { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void orderPressExpired(WxOrder order) { Date curDate = new Date(); - order.setUpdateDate(curDate); - order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()); - wxOrderMapper.updateByPrimaryKeySelective(order); + WxOrder updateOrder = new WxOrder(); + updateOrder.setId(order.getId()); + updateOrder.setTenantId(order.getTenantId()); + updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()); + updateOrder.setUpdateDate(curDate); + wxOrderMapper.updateByPrimaryKeySelective(updateOrder); logger.info("\n砍价订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java index 28e216268..1692671e1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java @@ -42,10 +42,11 @@ public class WeChatAccessTokenSchedule { WxMaService wxMaService = MaUtil.getWeappService(appinfo); try { String accessToken = wxMaService.getAccessToken(true); - appinfo.setAccessToken(accessToken); - appinfo.setLastTokenTime(new Date()); - appinfo.setExpiresIn(7200); - wxAppinfoMapper.updateByPrimaryKey(appinfo); + WxAppinfo updateAppInfo = new WxAppinfo(); + updateAppInfo.setAccessToken(accessToken); + updateAppInfo.setLastTokenTime(new Date()); + updateAppInfo.setExpiresIn(7200); + wxAppinfoMapper.updateByPrimaryKeySelective(updateAppInfo); } catch (WxErrorException e) { logger.error(e.getMessage()); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java index 1149123ec..e65a3cb45 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java @@ -59,7 +59,7 @@ public interface WxAppinfoService { * 更新accessToken * @param appId */ - void tokenUpdate(String appId); + void ctokenUpdate(String appId); /** * 位置码/导购码生成 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 804457c6a..a01305800 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -179,7 +179,11 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { public ResultData updatepwd(MallUserInfo user, String code) { if(checkCodeValid(user, code)) { try { - mallUserInfoMapper.updateByPrimaryKey(user); + MallUserInfo updateUser = new MallUserInfo(); + updateUser.setId(user.getId()); + updateUser.setTenantId(user.getTenantId()); + updateUser.setPassword(user.getPassword()); + mallUserInfoMapper.updateByPrimaryKeySelective(updateUser); } catch (Exception e) { logger.error("db failed: 用户-" + user.getUsername() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index 0138a8c07..4f542a1d5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -82,10 +82,14 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { public void deleteById(Long id) { wxAppinfoMapper.deleteByPrimaryKey(id); } - - + + + /** + * 租户c端小程序更新token + * @param tenantId + */ @Override - public void tokenUpdate(String tenantId) { + public void ctokenUpdate(String tenantId) { WxAppinfo appQ = new WxAppinfo(); appQ.setTenantId(tenantId); appQ.setType(EnumAppType.C.getCode()); @@ -115,7 +119,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { // update db appinfo.setAccessToken(access_token); appinfo.setLastTokenTime(date); - wxAppinfoMapper.updateByPrimaryKey(appinfo); + wxAppinfoMapper.updateByPrimaryKeySelective(appinfo); } private void downFile(String filePath, String filename, HttpServletResponse response, HttpServletRequest req) throws IOException { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index 657c92551..fe457ad52 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -74,7 +74,7 @@ public class WxBrandServiceImpl implements WxBrandService { } try { wxBrand.setUpdatetime(new Date()); - wxBrandMapper.updateByPrimaryKey(wxBrand); + wxBrandMapper.updateByPrimaryKeySelective(wxBrand); return new ResultData(Result.SUCCESS, "操作成功"); } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index bcae9c205..01e8ebdf4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -168,7 +168,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { cardInfo.setRemainingShareFeeAmount(remain_real_pament); cardInfo.setUpdateDate(curDate); try { - wxCardInfoMapper.updateByPrimaryKey(cardInfo); + wxCardInfoMapper.updateByPrimaryKeySelective(cardInfo); } catch (Exception e) { logger.error("card info update error"); return new ResultData(ErrorCode.DB_FAIL.getCode(), "card info 更新出错!"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 0f453ee53..2138ee46c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -484,7 +484,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -502,7 +502,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { @@ -563,7 +563,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -581,7 +581,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg); } } @@ -622,7 +622,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -819,7 +819,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -837,7 +837,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { @@ -898,7 +898,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -916,7 +916,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg); } } @@ -957,7 +957,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -987,7 +987,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { String refund_id = returnMap.get("refund_id"); return new ResultData(Result.SUCCESS, "退款", returnMap); } else { - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); String errMsg = ""; JSONObject errObj = errorRefundReqMap.getJSONObject(result_no); if (errObj != null) { @@ -1019,7 +1019,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { errMsg = returnMap.get("return_msg"); record.setFailReason(errMsg); } - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } @@ -1475,7 +1475,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -1493,7 +1493,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { @@ -1547,7 +1547,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.info("微信退款订单申请成功: " + returnMap.toString()); try { record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); return new ResultData(Result.SUCCESS, "退款订单申请成功", returnMap); } catch (Exception e) { logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); @@ -1565,7 +1565,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); + wxRefundOrderMapper.updateByPrimaryKeySelective(record); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg); } }