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

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

admin 增加 初始化 transferStatus = 5 的转赠状态

更改为可转赠状态
parent 05cd0fb5
...@@ -23,4 +23,7 @@ public interface IKylinOrderTicketsAdminService { ...@@ -23,4 +23,7 @@ public interface IKylinOrderTicketsAdminService {
//订单详情 //订单详情
OrderDetailsAdminVo orderDetails(String orderId); OrderDetailsAdminVo orderDetails(String orderId);
//初始化订单转赠 [只支持退回订单 transferStatus = 5]
String initTransfer(String orderId);
} }
...@@ -27,8 +27,7 @@ import java.util.List; ...@@ -27,8 +27,7 @@ import java.util.List;
*/ */
@Controller @Controller
@RequestMapping("/kylin/order") @RequestMapping("/kylin/order")
public class KylinOrderTicketsController extends BaseController public class KylinOrderTicketsController extends BaseController {
{
private String prefix = "zhengzai/kylin/order"; private String prefix = "zhengzai/kylin/order";
@Autowired @Autowired
...@@ -39,8 +38,7 @@ public class KylinOrderTicketsController extends BaseController ...@@ -39,8 +38,7 @@ public class KylinOrderTicketsController extends BaseController
@RequiresPermissions("kylin:order:orderlist:view") @RequiresPermissions("kylin:order:orderlist:view")
@GetMapping("/orderList") @GetMapping("/orderList")
public String tickets() public String tickets() {
{
return prefix + "/orderList/orderList"; return prefix + "/orderList/orderList";
} }
...@@ -51,8 +49,7 @@ public class KylinOrderTicketsController extends BaseController ...@@ -51,8 +49,7 @@ public class KylinOrderTicketsController extends BaseController
@RequiresPermissions("kylin:order:orderlist:list") @RequiresPermissions("kylin:order:orderlist:list")
@PostMapping("/orderList/list") @PostMapping("/orderList/list")
@ResponseBody @ResponseBody
public TableDataInfo list(OrderListReq orderListReq) public TableDataInfo list(OrderListReq orderListReq) {
{
startPage(); startPage();
List<OrderTicketsListDao> list = iKylinOrderTicketsAdminService.orderList(orderListReq); List<OrderTicketsListDao> list = iKylinOrderTicketsAdminService.orderList(orderListReq);
return getDataTable(list); return getDataTable(list);
...@@ -84,4 +81,15 @@ public class KylinOrderTicketsController extends BaseController ...@@ -84,4 +81,15 @@ public class KylinOrderTicketsController extends BaseController
ajax.put("value", performanceSponsorList); ajax.put("value", performanceSponsorList);
return ajax; return ajax;
} }
/**
* 获取第三方列表
*/
@Log(title = "演出订单-初始化转赠 [只支持 transferStatus = 5]]", businessType = BusinessType.LIST)
@GetMapping("/orderList/initTransfer")
@ResponseBody
public AjaxResult initTransfer(@RequestParam("orderId") String orderId) {
String result = iKylinOrderTicketsAdminService.initTransfer(orderId);
return this.success(result);
}
} }
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
<th:block th:include="include :: bootstrap-typeahead-js" /> <th:block th:include="include :: bootstrap-typeahead-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]]; var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
var transferFlag = [[${@permission.hasPermi('kylin:order:orderlist:transferInit')}]];
var prefix = ctx + "kylin/order/orderList"; var prefix = ctx + "kylin/order/orderList";
var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]]; var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]];
var getTicketTypeDic = [[${@dict.getType('zhengzai_get_ticket_type')}]]; var getTicketTypeDic = [[${@dict.getType('zhengzai_get_ticket_type')}]];
...@@ -201,6 +202,7 @@ ...@@ -201,6 +202,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>'); actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>');
actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
return actions.join(''); return actions.join('');
} }
}] }]
...@@ -219,6 +221,12 @@ ...@@ -219,6 +221,12 @@
}).on('onUnsetSelectValue', function (e) { }).on('onUnsetSelectValue', function (e) {
console.log("onUnsetSelectValue"); console.log("onUnsetSelectValue");
}); });
function f(id) {
$.post(prefix + "/kylin/initTransfer",{orderId:id},function (res) {
alert(res.msg)
});
}
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</div> </div>
</div> </div>
</div> </div>
<table class="col-sm-12 select-table table-bordered"> <table class="col-sm-12 select-table table-bordered table table-stripped small m-t-md">
<thead> <thead>
<tr> <tr>
<th> <th>
......
package com.liquidnet.client.admin.zhengzai.kylin.service.impl; package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.StringUtils; import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.StringUtil; import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
...@@ -18,8 +21,13 @@ import com.liquidnet.service.kylin.entity.*; ...@@ -18,8 +21,13 @@ import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.IKylinOrderTicketStatusService; import com.liquidnet.service.kylin.service.IKylinOrderTicketStatusService;
import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService; import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.beans.IntrospectionException; import java.beans.IntrospectionException;
...@@ -60,11 +68,18 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -60,11 +68,18 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
@Autowired @Autowired
private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper; private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
@Autowired
private MongoTemplate mongoTemplate;
@Autowired
private MongoConverter mongoConverter;
@Autowired
private DataUtils dataUtils;
@Override @Override
public List<OrderTicketsListDao> orderList(OrderListReq orderListReq) { public List<OrderTicketsListDao> orderList(OrderListReq orderListReq) {
Map<String, Object> reqParamMap = new HashMap<>(); Map<String, Object> reqParamMap = new HashMap<>();
try { try {
reqParamMap = BeanUtil.convertBeanToMap(orderListReq,false); reqParamMap = BeanUtil.convertBeanToMap(orderListReq, false);
} catch (IntrospectionException e) { } catch (IntrospectionException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
...@@ -83,26 +98,26 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -83,26 +98,26 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
//查询条件 //查询条件
LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotNull(orderId)) { if (StringUtils.isNotNull(orderId)) {
wrapper.eq(KylinOrderTickets::getOrderTicketsId,orderId); wrapper.eq(KylinOrderTickets::getOrderTicketsId, orderId);
} }
KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo(); KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(wrapper); KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(wrapper);
//获取订单关联关系 //获取订单关联关系
LambdaQueryWrapper<KylinOrderTicketRelations> relWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<KylinOrderTicketRelations> relWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotNull(orderId)) { if (StringUtils.isNotNull(orderId)) {
relWrapper.eq(KylinOrderTicketRelations::getOrderId,orderId); relWrapper.eq(KylinOrderTicketRelations::getOrderId, orderId);
} }
KylinOrderTicketRelations kylinOrderTicketRelations = kylinOrderTicketRelationsMapper.selectOne(relWrapper); KylinOrderTicketRelations kylinOrderTicketRelations = kylinOrderTicketRelationsMapper.selectOne(relWrapper);
BeanUtil.copy(kylinOrderTickets,orderTicketVo); BeanUtil.copy(kylinOrderTickets, orderTicketVo);
orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId()); orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId());
orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId()); orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId());
//获取订单状态 //获取订单状态
LambdaQueryWrapper<KylinOrderTicketStatus> orderStatusWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<KylinOrderTicketStatus> orderStatusWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotNull(orderId)) { if (StringUtils.isNotNull(orderId)) {
orderStatusWrapper.eq(KylinOrderTicketStatus::getOrderId,orderId); orderStatusWrapper.eq(KylinOrderTicketStatus::getOrderId, orderId);
} }
KylinOrderTicketStatus kylinOrderTicketStatus = kylinOrderTicketStatusMapper.selectOne(orderStatusWrapper); KylinOrderTicketStatus kylinOrderTicketStatus = kylinOrderTicketStatusMapper.selectOne(orderStatusWrapper);
BeanUtil.copy(kylinOrderTickets,orderTicketVo); BeanUtil.copy(kylinOrderTickets, orderTicketVo);
orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId()); orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId());
orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId()); orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId());
orderTicketVo.setStatus(kylinOrderTicketStatus.getStatus()); orderTicketVo.setStatus(kylinOrderTicketStatus.getStatus());
...@@ -111,10 +126,10 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -111,10 +126,10 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
orderTicketVo.setCreatedAt(""); orderTicketVo.setCreatedAt("");
orderTicketVo.setTimePay(""); orderTicketVo.setTimePay("");
orderTicketVo.setUseStart(""); orderTicketVo.setUseStart("");
if(StringUtils.isNotNull(kylinOrderTickets.getCreatedAt())){ if (StringUtils.isNotNull(kylinOrderTickets.getCreatedAt())) {
orderTicketVo.setCreatedAt(DateUtil.format(kylinOrderTickets.getCreatedAt(),DateUtil.Formatter.yyyyMMddHHmmss)); orderTicketVo.setCreatedAt(DateUtil.format(kylinOrderTickets.getCreatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
} }
if(StringUtils.isNotNull(kylinOrderTickets.getTimePay())){ if (StringUtils.isNotNull(kylinOrderTickets.getTimePay())) {
orderTicketVo.setTimePay(kylinOrderTickets.getTimePay()); orderTicketVo.setTimePay(kylinOrderTickets.getTimePay());
} }
...@@ -123,33 +138,33 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -123,33 +138,33 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
//获取演出信息 //获取演出信息
LambdaQueryWrapper<KylinPerformances> perWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<KylinPerformances> perWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotNull(orderTicketVo.getPerformanceId())) { if (StringUtils.isNotNull(orderTicketVo.getPerformanceId())) {
perWrapper.eq(KylinPerformances::getPerformancesId,orderTicketVo.getPerformanceId()); perWrapper.eq(KylinPerformances::getPerformancesId, orderTicketVo.getPerformanceId());
} }
KylinPerformances kylinPerformances = kylinPerformancesMapper.selectOne(perWrapper); KylinPerformances kylinPerformances = kylinPerformancesMapper.selectOne(perWrapper);
KylinPerformanceVo performanceVo = new KylinPerformanceVo(); KylinPerformanceVo performanceVo = new KylinPerformanceVo();
BeanUtil.copy(kylinPerformances,performanceVo); BeanUtil.copy(kylinPerformances, performanceVo);
//获取票种信息 //获取票种信息
LambdaQueryWrapper<KylinTickets> ticketsWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<KylinTickets> ticketsWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotNull(orderTicketVo.getTicketId())) { if (StringUtils.isNotNull(orderTicketVo.getTicketId())) {
ticketsWrapper.eq(KylinTickets::getTicketsId,orderTicketVo.getTicketId()); ticketsWrapper.eq(KylinTickets::getTicketsId, orderTicketVo.getTicketId());
} }
KylinTickets kylinTickets = kylinTicketsMapper.selectOne(ticketsWrapper); KylinTickets kylinTickets = kylinTicketsMapper.selectOne(ticketsWrapper);
KylinTicketVo ticketVo = new KylinTicketVo(); KylinTicketVo ticketVo = new KylinTicketVo();
BeanUtil.copy(kylinTickets,ticketVo); BeanUtil.copy(kylinTickets, ticketVo);
if(StringUtils.isNotNull(kylinTickets.getUseStart())){ if (StringUtils.isNotNull(kylinTickets.getUseStart())) {
orderTicketVo.setUseStart(DateUtil.format(kylinTickets.getUseStart(),DateUtil.Formatter.yyyyMMddHHmmss)); orderTicketVo.setUseStart(DateUtil.format(kylinTickets.getUseStart(), DateUtil.Formatter.yyyyMMddHHmmss));
} }
//获取订单持票实体信息 //获取订单持票实体信息
LambdaQueryWrapper<KylinOrderTicketEntities> ticketsEntitiesWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<KylinOrderTicketEntities> ticketsEntitiesWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotNull(orderTicketVo.getOrderTicketsId())) { if (StringUtils.isNotNull(orderTicketVo.getOrderTicketsId())) {
ticketsEntitiesWrapper.eq(KylinOrderTicketEntities::getOrderId,orderTicketVo.getOrderTicketsId()); ticketsEntitiesWrapper.eq(KylinOrderTicketEntities::getOrderId, orderTicketVo.getOrderTicketsId());
} }
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = new ArrayList<>(); List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = new ArrayList<>();
List<KylinOrderTicketEntities> ticketEntitiesList = kylinOrderTicketEntitiesMapper.selectList(ticketsEntitiesWrapper); List<KylinOrderTicketEntities> ticketEntitiesList = kylinOrderTicketEntitiesMapper.selectList(ticketsEntitiesWrapper);
for (KylinOrderTicketEntities kylinOrderTicketEntities : ticketEntitiesList) { for (KylinOrderTicketEntities kylinOrderTicketEntities : ticketEntitiesList) {
KylinOrderTicketEntitiesVo ticketEntitiesVo = new KylinOrderTicketEntitiesVo(); KylinOrderTicketEntitiesVo ticketEntitiesVo = new KylinOrderTicketEntitiesVo();
BeanUtil.copy(kylinOrderTicketEntities,ticketEntitiesVo); BeanUtil.copy(kylinOrderTicketEntities, ticketEntitiesVo);
kylinOrderTicketEntitiesVoList.add(ticketEntitiesVo); kylinOrderTicketEntitiesVoList.add(ticketEntitiesVo);
} }
...@@ -186,4 +201,30 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -186,4 +201,30 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
return vo; return vo;
} }
} }
@Override
public String initTransfer(String orderId) {
Integer canChangeStatus = 5;
Integer targetStatus = 0;
//查询 数据库
KylinOrderTicketStatus findStatus = kylinOrderTicketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinOrderTicketStatus.class).eq(KylinOrderTicketStatus::getOrderId, orderId));
if (!findStatus.getTransferStatus().equals(canChangeStatus)) {
return "该订单不属于被退回状态";
}
//修改 数据库
KylinOrderTicketStatus status = KylinOrderTicketStatus.getNew();
status.setTransferStatus(targetStatus);
kylinOrderTicketStatusMapper.update(status, Wrappers.lambdaUpdate(KylinOrderTicketStatus.class)
.eq(KylinOrderTicketStatus::getOrderId, orderId).eq(KylinOrderTicketStatus::getTransferStatus, canChangeStatus));
//修改 mongo
HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("transferStatus", targetStatus);
BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketsId").is(orderId)).getQueryObject(),
obj);
//删除 redis
dataUtils.delOrderTicketRedis(orderId);
return "订单转赠状态初始化成功";
}
} }
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