Commit ba58daa6 by wuwenlong

Merge branch 'dev' into test

parents 4f0a11b4 eb426ecd
......@@ -13,18 +13,15 @@ import share.common.core.domain.AjaxResult;
import share.common.core.domain.R;
import share.common.core.redis.RedisUtil;
import share.common.utils.JsonConvertUtil;
import share.system.domain.CancelPay;
import share.system.domain.SConsumer;
import share.system.domain.SOrder;
import share.system.domain.vo.FrontTokenComponent;
import share.system.domain.vo.SOrderVo;
import share.system.domain.vo.MqttxVo;
import share.system.request.CreateOrderRequest;
import share.system.request.OrderComputedPriceRequest;
import share.system.request.OrderRefundRequest;
import share.system.response.ComputedOrderPriceResponse;
import share.system.response.OrderPayResultResponse;
import share.system.service.DeviceLogService;
import share.system.service.ISOrderService;
import share.common.core.page.TableDataInfo;
......@@ -122,8 +119,8 @@ public class SOrderController extends BaseController
*/
@ApiOperation(value = "取消支付")
@RequestMapping(value = "/cancelPay", method = RequestMethod.POST)
public R<Boolean> cancelPay(@RequestBody @Validated(CancelPay.class) SOrder sOrder) {
return R.ok(sOrderService.cancelPay(sOrder.getOrderNo()));
public R<Boolean> cancelPay(@RequestParam("orderNo") String orderNo) {
return R.ok(sOrderService.cancelPay(orderNo));
}
......
package share.system.domain;
//取消支付
public interface CancelPay {
}
......@@ -10,8 +10,6 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.validation.annotation.Validated;
import share.common.annotation.Excel;
import share.common.core.domain.BaseEntity;
......@@ -36,7 +34,6 @@ public class SOrder extends BaseEntity
/** 订单流水号 */
@Excel(name = "订单编号")
@NotBlank(message = "订单编号不能为空", groups = {CancelPay.class})
private String orderNo;
@Excel(name = "商户订单号")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment