记得上下班打卡 | git大法好,push需谨慎

Commit d9090790 authored by 胡佳晨's avatar 胡佳晨

提交 拒绝退款

parent 59caa1e4
......@@ -19,7 +19,7 @@ public class GoblinStoreOrderListVo implements Cloneable {
private String orderCode;
@ApiModelProperty(value = "下单时间")
private String createdAt;
@ApiModelProperty(value = "下单方式")
@ApiModelProperty(value = " 支付类型[wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付]")
private String payType;
@ApiModelProperty(value = " 收货人姓名")
private String expressContacts;
......@@ -33,7 +33,7 @@ public class GoblinStoreOrderListVo implements Cloneable {
private BigDecimal priceActual;
@ApiModelProperty(value = " 快递费")
private BigDecimal priceExpress;
@ApiModelProperty(value = " 订单状态")
@ApiModelProperty(value = " 订单状态[0-待付款(用户刚下单)|2-代发货(用户付完款 等待商城发货)3-代收货(商城已经发货 等待用户确认收货)|4-已完成(用户已经确认收货 订单结束)|5-取消订单(用户未付款前取消订单)|6-退款通过(用户已经付款但是商城还未发货,用户发出退款申请,商城同意退款)|7-退货通过(用户已经确认收货后用户发出退货申请,商城同意所有退货申请 ,一个订单可能有多个单品)]")
private Integer status;
@ApiModelProperty(value = " 付款时间")
private String payTime;
......
......@@ -24,5 +24,7 @@ public interface IGoblinStoreBackOrderService {
ResponseDto<Boolean> changeExpressRefund(String backOrderId, BigDecimal refundPrice);
ResponseDto<Boolean> refusedRefund(String backOrderId);
ResponseDto<Boolean> changeSkuRefund(String backOrderId, BigDecimal refundPrice, String orderSkuId);
}
......@@ -74,14 +74,14 @@ public class GoblinStoreBackOrderController {
// return goblinStoreBackOrderService.agreeRefund(backOrderId);
// }
//
// @ApiOperation(value = "拒绝退款")
// @ApiImplicitParams({
// @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"),
// })
// @GetMapping(value = "refused")
// public ResponseDto<Boolean> refusedRefund(@RequestParam(value = "backOrderId", required = true) @Valid String backOrderId) {
// return goblinStoreBackOrderService.refusedRefund(backOrderId);
// }
@ApiOperation(value = "拒绝退款")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"),
})
@GetMapping(value = "refused")
public ResponseDto<Boolean> refusedRefund(@RequestParam(value = "backOrderId", required = true) @Valid String backOrderId) {
return goblinStoreBackOrderService.refusedRefund(backOrderId);
}
@ApiOperation(value = "修改金额")
@ApiImplicitParams({
......
......@@ -127,6 +127,31 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
return ResponseDto.success();
}
@Override
public ResponseDto<Boolean> refusedRefund(String backOrderId) {
String uid = CurrentUtil.getCurrentUid();
LocalDateTime now = LocalDateTime.now();
GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
if (storeInfoVo == null) {
return ResponseDto.failure("无法查看");
}
GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(backOrderId);
backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_3.getValue());
//redis
redisUtils.setBackOrderVo(backOrderId, backOrderVo);
//mongo
mongoUtils.updateGoblinBackOrderVo(backOrderId, backOrderVo);
//mysql
queueUtils.sendMsgByRedis(
MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
SqlMapping.get("goblin_order.store.refused",
backOrderVo.getStatus(), now,
backOrderId, now, now
)
);
return ResponseDto.success();
}
@Override
public ResponseDto<Boolean> changeSkuRefund(String backOrderId, BigDecimal refundPrice, String orderSkuId) {
String uid = CurrentUtil.getCurrentUid();
......
......@@ -67,6 +67,7 @@ goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,
goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price = ? ,back_price_express = ? updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.refused=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
#---- 用户订单操作
......
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