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

Commit 9345cf1c authored by 胡佳晨's avatar 胡佳晨

Merge branch 'test'

parents de57a5bc e38c122d
package com.liquidnet.service.kylin.service; package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
/** /**
* <p> * <p>
...@@ -12,5 +10,5 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefunds; ...@@ -12,5 +10,5 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
* @since 2021-05-26 * @since 2021-05-26
*/ */
public interface IKylinOrderRefundsService { public interface IKylinOrderRefundsService {
String getOrderRefundCode(String orderRefundCode);
} }
package com.liquidnet.client.admin.web.controller.zhengzai.order;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotNull;
@Api(tags = "ORDER 订单号")
@Slf4j
@Validated
@RestController
@RequestMapping("order/switch")
public class OrderSwitchAdminController {
@Autowired
IKylinOrderRefundsService kylinOrderRefundsService;
@RequiresPermissions("order:switch:search:code")
@ApiOperation(value = "开放/限制校验证码")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderRefundCode", value = "退款编号", example = ""),
})
@PostMapping("search/code")
public ResponseDto<Object> loginSmsSwitch(@RequestParam @NotNull String orderRefundCode) {
String code = kylinOrderRefundsService.getOrderRefundCode(orderRefundCode);
if(code==null){
return ResponseDto.success("未查询到");
}else{
return ResponseDto.success(code);
}
}
}
...@@ -466,4 +466,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -466,4 +466,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
return refundOrderDetailsVo; return refundOrderDetailsVo;
} }
@Override
public String getOrderRefundCode(String orderRefundCode) {
KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code",orderRefundCode));
if(data==null){
return null;
}else{
return data.getOrderRefundCode();
}
}
} }
...@@ -297,6 +297,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -297,6 +297,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
kylinOrderTicketEntitiesPreRefundVos.add(refundVo); kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
} }
orderTicketVo.setFieldName(performanceVo.getFieldName()); orderTicketVo.setFieldName(performanceVo.getFieldName());
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
BeanUtils.copyProperties(orderTicketVo, vo); BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsTrueName(performanceVo.getIsTrueName()); vo.setIsTrueName(performanceVo.getIsTrueName());
...@@ -320,7 +321,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -320,7 +321,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return ResponseDto.failure(ErrorMapping.get("20003")); return ResponseDto.failure(ErrorMapping.get("20003"));
} }
orderTicketVo.setFieldName(performanceVo.getFieldName()); orderTicketVo.setFieldName(performanceVo.getFieldName());
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId); KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length()-10));
kylinOrderRefundsVoBase.setRefundCode(kylinOrderRefundsVoBase.getRefundCode().substring(kylinOrderRefundsVoBase.getRefundCode().length()-10));
vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase); vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
vo.setOrderTicketVo(orderTicketVo); vo.setOrderTicketVo(orderTicketVo);
return ResponseDto.success(vo); return ResponseDto.success(vo);
......
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