Просмотр исходного кода

[微信第三方登录][修改]:updateByPrimaryKey改为updateByPrimaryKeySelective

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
bbe6333de7
9 измененных файлов: 53 добавлений и 39 удалений
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java
  2. +12
    -7
      mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
  3. +5
    -4
      mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java
  5. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
  6. +8
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  9. +16
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java

+ 4
- 4
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());
}


+ 12
- 7
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);
}

+ 5
- 4
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) {


+ 1
- 1
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);

/**
* 位置码/导购码生成


+ 5
- 1
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());


+ 8
- 4
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 {


+ 1
- 1
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());


+ 1
- 1
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 更新出错!");


+ 16
- 16
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);
}
}


Загрузка…
Отмена
Сохранить