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

wx_pay_order添加分表

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
5eb6cfb8da
7 измененных файлов: 37 добавлений и 28 удалений
  1. +10
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  3. +9
    -9
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java
  6. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  7. +4
    -0
      mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml

+ 10
- 10
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\"}")


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


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




+ 5
- 0
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, Long> {

WxPayOrder selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
List<WxPayOrder> findList(WxPayOrder wxPayOrder);

//List<WxPayOrderVo> findListOfPaidOrderByDate(Map dateMap);


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



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





+ 4
- 0
mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml Просмотреть файл

@@ -142,6 +142,10 @@
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="selectById" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select <include refid="allColumns"/> from wx_pay_order where id = #{id} and tenant_id = #{tenantId}
</select>

<select id="findList" parameterType="com.iformall.domain.po.WxPayOrder" resultMap="BaseResultMap">
select
<include refid="allColumns"/>


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