diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index 6709a9183..7e1329db8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -69,15 +69,15 @@ public class WxPayOrderController extends BaseController { return new ResultData(); } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "支付订单-删除") - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxPayOrderController::delete"); - wxPayOrderService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } +// @ApiOperation("根据id删除接口") +// @GetMapping("/del") +// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) +// @SystemControllerLog(description = "支付订单-删除") +// public ResultData delete(Long id) { +// logger.debug("[" + getIpAddr() + "] WxPayOrderController::delete"); +// wxPayOrderService.deleteById(id); +// return new ResultData(Result.SUCCESS, "删除成功", null); +// } @ApiOperation("根据id查询接口") @GetMapping("/findById") @@ -85,7 +85,7 @@ public class WxPayOrderController extends BaseController { @SystemControllerLog(description = "支付订单-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxPayOrderController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxPayOrderService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxPayOrderService.getById(id,getTenantInfo().getTenantId())); } @ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"orderId\":\"string\",\"status\":integer,\"reason\":\"string\"}") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 8abaa5e57..4685d49de 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -215,7 +215,7 @@ public class WxMicroPayController extends BaseController { // record.setBUserId(getUser().getId()); // record.setOrderId(orderId); - WxPayOrder po = wxPayOrderService.getById(payOrderId); + WxPayOrder po = wxPayOrderService.getById(payOrderId,getTenantInfo().getTenantId()); if (null == po) { return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index f0676c00d..d0611521a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -179,7 +179,7 @@ public class WxPayOrderController extends BaseController { logger.error("/api/pay/updatePayOrder error : payOrderId不能为空: " + paramMap.toString()); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payOrderId非法"+payOrderId+"[payOrderIdStr:"+payOrderIdStr+"]"); } - payOrder = wxPayOrderService.getById(payOrderId); + payOrder = wxPayOrderService.getById(payOrderId,payOrder.getTenantId()); if (null == payOrder) { return new ResultData(ErrorCode.PAY_ORDER_ERROR, "未查询到payOrder."); } @@ -269,19 +269,19 @@ public class WxPayOrderController extends BaseController { return new ResultData(); } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData delete(Long id) { - wxPayOrderService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } +// @ApiOperation("根据id删除接口") +// @GetMapping("/del") +// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) +// public ResultData delete(Long id) { +// wxPayOrderService.deleteById(id); +// return new ResultData(Result.SUCCESS, "删除成功", null); +// } @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS, "查询成功", wxPayOrderService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxPayOrderService.getById(id,getTenantInfo().getTenantId())); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java index b7620a4eb..aa55ee85d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java @@ -1,12 +1,17 @@ package com.iformall.mapper; import java.util.*; + +import org.apache.ibatis.annotations.Param; + import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxPayOrder; import com.iformall.domain.vo.WxPayOrderVo; public interface WxPayOrderMapper extends CommonMapper { + WxPayOrder selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + List findList(WxPayOrder wxPayOrder); //List findListOfPaidOrderByDate(Map dateMap); diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java index 1595572d8..75c6390ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java @@ -131,7 +131,7 @@ public interface WxPayOrderService { * @param id * @return */ - WxPayOrder getById(Long id); + WxPayOrder getById(Long id,String tenantId); /** * 根据obj获得实体 @@ -148,7 +148,7 @@ public interface WxPayOrderService { * * @param id */ - void deleteById(Long id); + //void deleteById(Long id); public boolean isOrderGroupCoupon(WxPayOrder record, WxCoupon wxCoupon); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index ab6d8e5a5..74ab24c0e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1204,8 +1204,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } @Override - public WxPayOrder getById(Long id) { - return wxPayOrderMapper.selectById(id); + public WxPayOrder getById(Long id,String tenantId) { + return wxPayOrderMapper.selectById(id,tenantId); } @Override @@ -1229,10 +1229,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } - @Override - public void deleteById(Long id) { - wxPayOrderMapper.deleteById(id); - } +// @Override +// public void deleteById(Long id) { +// wxPayOrderMapper.deleteById(id); +// } diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 286c55975..69937b5bd 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -142,6 +142,10 @@ order by ${sortColumns} + +