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

Skip to content

L
liquidnet-bus-v1
Commit 025eb45b authored by anjiabin's avatar anjiabin
Browse files
Options

提交订单列表

parent d89bf177
Expand all Show whitespace changes
Inline Side-by-side
Showing with 937 additions and 363 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberOrderAdminService.java 0 → 100644
View file @ 025eb45b
package com.liquidnet.service.adam.service.admin;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: IAdamMemberOrderAdminService
* @Package com.liquidnet.service.adam.service.admin
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/6 16:23
*/
public interface IAdamMemberOrderAdminService extends IService<AdamMemberOrder> {
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/RuoYiApplication.java
View file @ 025eb45b
...@@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; ...@@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author ruoyi * @author ruoyi
*/ */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = {"com.liquidnet"}) @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = {"com.liquidnet"})
@MapperScan(basePackages = {"com.liquidnet.service.kylin.mapper"})// @MapperScan(basePackages = {"com.liquidnet.service.kylin.mapper","com.liquidnet.service.adam.mapper"})//
public class RuoYiApplication public class RuoYiApplication
{ {
public static void main(String[] args) public static void main(String[] args)
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderController.java 0 → 100644
View file @ 025eb45b
package com.liquidnet.client.admin.web.controller.zhengzai.adam;
import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: 会员订单Controller
* @class: Test
* @Package com.liquidnet.client.admin.web.controller.zhengzai.adam
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/6 16:52
*/
@Controller
@RequestMapping("/adam/order")
public class AdamMemberOrderController extends BaseController
{
private String prefix = "zhengzai/adam/order";
@Autowired
private IAdamMemberOrderAdminService adamMemberOrderAdminService;
@RequiresPermissions("adam:order:orderlist:view")
@GetMapping("/orderList")
public String order()
{
return prefix + "/orderList/order";
}
/**
* 查询【请填写功能名称】列表
*/
@RequiresPermissions("adam:order:orderlist:list")
@PostMapping("/orderList/list")
@ResponseBody
public TableDataInfo list(AdamMemberOrder adamMemberOrder)
{
startPage();
List<AdamMemberOrder> list = adamMemberOrderAdminService.list();
return getDataTable(list);
}
// /**
// * 导出【请填写功能名称】列表
// */
// @RequiresPermissions("adam:order:export")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
// @PostMapping("/export")
// @ResponseBody
// public AjaxResult export(AdamMemberOrder adamMemberOrder)
// {
// List<AdamMemberOrder> list = adamMemberOrderService.selectAdamMemberOrderList(adamMemberOrder);
// ExcelUtil<AdamMemberOrder> util = new ExcelUtil<AdamMemberOrder>(AdamMemberOrder.class);
// return util.exportExcel(list, "【请填写功能名称】数据");
// }
// /**
// * 新增【请填写功能名称】
// */
// @GetMapping("/add")
// public String add()
// {
// return prefix + "/add";
// }
// /**
// * 新增保存【请填写功能名称】
// */
// @RequiresPermissions("adam:order:add")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// @ResponseBody
// public AjaxResult addSave(AdamMemberOrder adamMemberOrder)
// {
// return toAjax(adamMemberOrderService.insertAdamMemberOrder(adamMemberOrder));
// }
// /**
// * 修改【请填写功能名称】
// */
// @GetMapping("/edit/{mid}")
// public String edit(@PathVariable("mid") String mid, ModelMap mmap)
// {
// AdamMemberOrder adamMemberOrder = adamMemberOrderService.selectAdamMemberOrderById(mid);
// mmap.put("adamMemberOrder", adamMemberOrder);
// return prefix + "/edit";
// }
//
// /**
// * 修改保存【请填写功能名称】
// */
// @RequiresPermissions("adam:order:edit")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
// @PostMapping("/edit")
// @ResponseBody
// public AjaxResult editSave(AdamMemberOrder adamMemberOrder)
// {
// return toAjax(adamMemberOrderService.updateAdamMemberOrder(adamMemberOrder));
// }
//
// /**
// * 删除【请填写功能名称】
// */
// @RequiresPermissions("adam:order:remove")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
// @PostMapping( "/remove")
// @ResponseBody
// public AjaxResult remove(String ids)
// {
// return toAjax(adamMemberOrderService.deleteAdamMemberOrderByIds(ids));
// }
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserController.java
View file @ 025eb45b
...@@ -6,8 +6,8 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult; ...@@ -6,8 +6,8 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType; import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.poi.ExcelUtil; import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
import com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser;
import com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserService; import com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserService;
import com.liquidnet.service.adam.entity.AdamUser;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -26,7 +26,7 @@ import java.util.List; ...@@ -26,7 +26,7 @@ import java.util.List;
@RequestMapping("/adam/user") @RequestMapping("/adam/user")
public class AdamUserController extends BaseController public class AdamUserController extends BaseController
{ {
private String prefix = "adam/user"; private String prefix = "zhengzai/adam/user";
@Autowired @Autowired
private IAdamUserService adamUserService; private IAdamUserService adamUserService;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java
View file @ 025eb45b
...@@ -4,6 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController; ...@@ -4,6 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.service.kylin.dao.OrderTicketsListDao; import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.dto.param.admin.OrderListReq; import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService; import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -51,9 +52,11 @@ public class KylinOrderTicketsController extends BaseController ...@@ -51,9 +52,11 @@ public class KylinOrderTicketsController extends BaseController
/** /**
* 订单详情 * 订单详情
*/ */
@RequiresPermissions("kylin:order:orderlist:detail")
@GetMapping("/orderList/detail/{orderId}") @GetMapping("/orderList/detail/{orderId}")
public String addPerformance(@PathVariable("orderId") String orderId, ModelMap mmap) { public String addPerformance(@PathVariable("orderId") String orderId, ModelMap mmap) {
mmap.put("roadShowId", orderId); OrderDetailsVo orderDetailsVo = iKylinOrderTicketsAdminService.orderDetails(orderId);
mmap.put("orderDetailsVo", orderDetailsVo);
return prefix + "/orderList/details"; return prefix + "/orderList/details";
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html 0 → 100644
View file @ 025eb45b
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改【请填写功能名称】')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-order-edit" th:object="${adamMemberOrder}">
<input name="mid" th:field="*{mid}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<input name="orderNo" th:field="*{orderNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<input name="uid" th:field="*{uid}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">购买方式:0-购买会员 1-购买会员码,2-使用会员码：</label>
<div class="col-sm-8">
<input name="mode" th:field="*{mode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">原价：</label>
<div class="col-sm-8">
<input name="price" th:field="*{price}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">实际支付：</label>
<div class="col-sm-8">
<input name="pricePaid" th:field="*{pricePaid}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">实际支付：</label>
<div class="col-sm-8">
<input name="memberName" th:field="*{memberName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">会员id：</label>
<div class="col-sm-8">
<input name="memberId" th:field="*{memberId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">会员价格id：</label>
<div class="col-sm-8">
<input name="memberPriceId" th:field="*{memberPriceId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">购买天数：</label>
<div class="col-sm-8">
<input name="days" th:field="*{days}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">订单状态：</label>
<div class="col-sm-8">
<input name="state" th:field="*{state}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">会员号：</label>
<div class="col-sm-8">
<input name="memberNo" th:field="*{memberNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付渠道：</label>
<div class="col-sm-8">
<input name="payChannel" th:field="*{payChannel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付订单：</label>
<div class="col-sm-8">
<input name="payNo" th:field="*{payNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用户生日：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="birthday" th:value="${#dates.format(adamMemberOrder.birthday, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="paymentAt" th:value="${#dates.format(adamMemberOrder.paymentAt, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="createdAt" th:value="${#dates.format(adamMemberOrder.createdAt, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="updatedAt" th:value="${#dates.format(adamMemberOrder.updatedAt, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<input name="clientIp" th:field="*{clientIp}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<input name="source" th:field="*{source}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<input name="version" th:field="*{version}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "kylin/order";
$("#form-order-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-order-edit').serialize());
}
}
$("input[name='birthday']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='paymentAt']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='createdAt']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='updatedAt']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ 025eb45b
...@@ -107,16 +107,13 @@ ...@@ -107,16 +107,13 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('kylin:tickets:edit')}]]; var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
var removeFlag = [[${@permission.hasPermi('kylin:tickets:remove')}]]; var prefix = ctx + "kylin/order/orderList";
var prefix = ctx + "kylin/tickets";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", detailUrl: prefix + "/detail/{id}",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "订单", modalName: "订单",
columns: [{ columns: [{
...@@ -179,8 +176,7 @@ ...@@ -179,8 +176,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.mid + '\')"><i class="fa fa-edit"></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-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml
View file @ 025eb45b
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
<artifactId>liquidnet-service-kylin-api</artifactId> <artifactId>liquidnet-service-kylin-api</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-adam-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>com.liquidnet</groupId>--> <!-- <groupId>com.liquidnet</groupId>-->
<!-- <artifactId>liquidnet-service-adam-api</artifactId>--> <!-- <artifactId>liquidnet-service-adam-api</artifactId>-->
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/domain/AdamUser.java deleted 100644 → 0
View file @ d89bf177
package com.liquidnet.client.admin.zhengzai.adam.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.liquidnet.client.admin.common.annotation.Excel;
import com.liquidnet.client.admin.common.core.domain.BaseEntity;
/**
* 用户对象 adam_user
*
* @author ruoyi
* @date 2021-05-24
*/
public class AdamUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Integer mid;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String uid;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String mobile;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String passwd;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String payCode;
/** 1-NORMAL,2-INVALID */
@Excel(name = "1-NORMAL,2-INVALID")
private Integer state;
/** $column.columnComment */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "1-NORMAL,2-INVALID", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdAt;
/** $column.columnComment */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "1-NORMAL,2-INVALID", width = 30, dateFormat = "yyyy-MM-dd")
private Date updatedAt;
/** $column.columnComment */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "1-NORMAL,2-INVALID", width = 30, dateFormat = "yyyy-MM-dd")
private Date closedAt;
/** $column.columnComment */
@Excel(name = "1-NORMAL,2-INVALID")
private String comment;
public void setMid(Integer mid)
{
this.mid = mid;
}
public Integer getMid()
{
return mid;
}
public void setUid(String uid)
{
this.uid = uid;
}
public String getUid()
{
return uid;
}
public void setMobile(String mobile)
{
this.mobile = mobile;
}
public String getMobile()
{
return mobile;
}
public void setPasswd(String passwd)
{
this.passwd = passwd;
}
public String getPasswd()
{
return passwd;
}
public void setPayCode(String payCode)
{
this.payCode = payCode;
}
public String getPayCode()
{
return payCode;
}
public void setState(Integer state)
{
this.state = state;
}
public Integer getState()
{
return state;
}
public void setCreatedAt(Date createdAt)
{
this.createdAt = createdAt;
}
public Date getCreatedAt()
{
return createdAt;
}
public void setUpdatedAt(Date updatedAt)
{
this.updatedAt = updatedAt;
}
public Date getUpdatedAt()
{
return updatedAt;
}
public void setClosedAt(Date closedAt)
{
this.closedAt = closedAt;
}
public Date getClosedAt()
{
return closedAt;
}
public void setComment(String comment)
{
this.comment = comment;
}
public String getComment()
{
return comment;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("mid", getMid())
.append("uid", getUid())
.append("mobile", getMobile())
.append("passwd", getPasswd())
.append("payCode", getPayCode())
.append("state", getState())
.append("createdAt", getCreatedAt())
.append("updatedAt", getUpdatedAt())
.append("closedAt", getClosedAt())
.append("comment", getComment())
.toString();
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/mapper/AdamUserMapper.java deleted 100644 → 0
View file @ d89bf177
package com.liquidnet.client.admin.zhengzai.adam.mapper;
import java.util.List;
import com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser;
/**
* 用户Mapper接口
*
* @author ruoyi
* @date 2021-05-24
*/
public interface AdamUserMapper
{
/**
* 查询用户
*
* @param mid 用户ID
* @return 用户
*/
public AdamUser selectAdamUserById(Integer mid);
/**
* 查询用户列表
*
* @param adamUser 用户
* @return 用户集合
*/
public List<AdamUser> selectAdamUserList(AdamUser adamUser);
/**
* 新增用户
*
* @param adamUser 用户
* @return 结果
*/
public int insertAdamUser(AdamUser adamUser);
/**
* 修改用户
*
* @param adamUser 用户
* @return 结果
*/
public int updateAdamUser(AdamUser adamUser);
/**
* 删除用户
*
* @param mid 用户ID
* @return 结果
*/
public int deleteAdamUserById(Integer mid);
/**
* 批量删除用户
*
* @param mids 需要删除的数据ID
* @return 结果
*/
public int deleteAdamUserByIds(String[] mids);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamUserService.java
View file @ 025eb45b
package com.liquidnet.client.admin.zhengzai.adam.service; package com.liquidnet.client.admin.zhengzai.adam.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.adam.entity.AdamUser;
import java.util.List; import java.util.List;
import com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser;
/** /**
* 用户Service接口 * 用户Service接口
...@@ -9,7 +11,7 @@ import com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser; ...@@ -9,7 +11,7 @@ import com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser;
* @author ruoyi * @author ruoyi
* @date 2021-05-24 * @date 2021-05-24
*/ */
public interface IAdamUserService public interface IAdamUserService extends IService<AdamUser>
{ {
/** /**
* 查询用户 * 查询用户
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java 0 → 100644
View file @ 025eb45b
package com.liquidnet.client.admin.zhengzai.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
import org.springframework.stereotype.Service;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: AdamMemberOrderAdminServiceImpl
* @Package com.liquidnet.client.admin.zhengzai.adam.service.impl
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/6 16:25
*/
@Service
public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderAdminService {
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamUserServiceImpl.java
View file @ 025eb45b
package com.liquidnet.client.admin.zhengzai.adam.service.impl; package com.liquidnet.client.admin.zhengzai.adam.service.impl;
import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.core.text.Convert;
import com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserService;
import com.liquidnet.service.adam.entity.AdamUser;
import com.liquidnet.service.adam.mapper.AdamUserMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.liquidnet.client.admin.zhengzai.adam.mapper.AdamUserMapper;
import com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser; import java.util.List;
import com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserService;
import com.liquidnet.client.admin.common.core.text.Convert;
/** /**
* 用户Service业务层处理 * 用户Service业务层处理
...@@ -15,7 +17,7 @@ import com.liquidnet.client.admin.common.core.text.Convert; ...@@ -15,7 +17,7 @@ import com.liquidnet.client.admin.common.core.text.Convert;
* @date 2021-05-24 * @date 2021-05-24
*/ */
@Service @Service
public class AdamUserServiceImpl implements IAdamUserService public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> implements IAdamUserService
{ {
@Autowired @Autowired
private AdamUserMapper adamUserMapper; private AdamUserMapper adamUserMapper;
...@@ -29,7 +31,7 @@ public class AdamUserServiceImpl implements IAdamUserService ...@@ -29,7 +31,7 @@ public class AdamUserServiceImpl implements IAdamUserService
@Override @Override
public AdamUser selectAdamUserById(Integer mid) public AdamUser selectAdamUserById(Integer mid)
{ {
return adamUserMapper.selectAdamUserById(mid); return adamUserMapper.selectById(mid);
} }
/** /**
...@@ -41,7 +43,7 @@ public class AdamUserServiceImpl implements IAdamUserService ...@@ -41,7 +43,7 @@ public class AdamUserServiceImpl implements IAdamUserService
@Override @Override
public List<AdamUser> selectAdamUserList(AdamUser adamUser) public List<AdamUser> selectAdamUserList(AdamUser adamUser)
{ {
return adamUserMapper.selectAdamUserList(adamUser); return adamUserMapper.selectList(null);
} }
/** /**
...@@ -53,7 +55,7 @@ public class AdamUserServiceImpl implements IAdamUserService ...@@ -53,7 +55,7 @@ public class AdamUserServiceImpl implements IAdamUserService
@Override @Override
public int insertAdamUser(AdamUser adamUser) public int insertAdamUser(AdamUser adamUser)
{ {
return adamUserMapper.insertAdamUser(adamUser); return adamUserMapper.insert(adamUser);
} }
/** /**
...@@ -65,7 +67,7 @@ public class AdamUserServiceImpl implements IAdamUserService ...@@ -65,7 +67,7 @@ public class AdamUserServiceImpl implements IAdamUserService
@Override @Override
public int updateAdamUser(AdamUser adamUser) public int updateAdamUser(AdamUser adamUser)
{ {
return adamUserMapper.updateAdamUser(adamUser); return adamUserMapper.updateById(adamUser);
} }
/** /**
...@@ -77,7 +79,7 @@ public class AdamUserServiceImpl implements IAdamUserService ...@@ -77,7 +79,7 @@ public class AdamUserServiceImpl implements IAdamUserService
@Override @Override
public int deleteAdamUserByIds(String ids) public int deleteAdamUserByIds(String ids)
{ {
return adamUserMapper.deleteAdamUserByIds(Convert.toStrArray(ids)); return adamUserMapper.deleteById(Convert.toStrArray(ids));
} }
/** /**
...@@ -89,6 +91,6 @@ public class AdamUserServiceImpl implements IAdamUserService ...@@ -89,6 +91,6 @@ public class AdamUserServiceImpl implements IAdamUserService
@Override @Override
public int deleteAdamUserById(Integer mid) public int deleteAdamUserById(Integer mid)
{ {
return adamUserMapper.deleteAdamUserById(mid); return adamUserMapper.deleteById(mid);
} }
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java
View file @ 025eb45b
...@@ -66,14 +66,14 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -66,14 +66,14 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
try { try {
//查询条件 //查询条件
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);
...@@ -84,7 +84,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -84,7 +84,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket")); Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
//获取演出信息 //获取演出信息
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);
...@@ -92,7 +92,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -92,7 +92,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
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);
...@@ -101,7 +101,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -101,7 +101,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
//获取订单持票实体信息 //获取订单持票实体信息
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<>();
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderTicketsListDao.java
View file @ 025eb45b
...@@ -34,4 +34,5 @@ public class OrderTicketsListDao { ...@@ -34,4 +34,5 @@ public class OrderTicketsListDao {
String userId; String userId;
String userName; String userName;
String userMobile; String userMobile;
String orderSource;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 025eb45b
...@@ -2,22 +2,28 @@ ...@@ -2,22 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper"> <mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper">
<resultMap id="orderTicketsListDaoResult" type="com.liquidnet.service.kylin.dao.OrderTicketsListDao"> <resultMap id="orderTicketsListDaoResult" type="com.liquidnet.service.kylin.dao.OrderTicketsListDao">
<result column="performances_id" property="performancesId"/> <result column="order_tickets_id" property="orderTicketsId"/>
<result column="tickets_id" property="ticketsId"/> <result column="sponsor" property="sponsor"/>
<result column="order_code" property="orderCode"/>
<result column="title" property="title"/> <result column="title" property="title"/>
<result column="status" property="status"/>
<result column="get_ticket_type" property="getTicketType"/>
<result column="pay_type" property="payType"/>
<result column="payment_type" property="paymentType"/>
<result column="tied" property="tied"/>
<result column="price" property="price"/> <result column="price" property="price"/>
<result column="type" property="type"/> <result column="number" property="number"/>
<result column="use_start" property="useStart"/> <result column="price_member" property="priceMember"/>
<result column="total_general" property="totalGeneral"/> <result column="price_total" property="priceTotal"/>
<result column="sale_general" property="saleGeneral"/> <result column="price_voucher" property="priceVoucher"/>
<result column="surplus_general" property="surplusGeneral"/> <result column="price_actual" property="priceActual"/>
<result column="total_sale_price" property="totalSalePrice"/> <result column="price_express" property="priceExpress"/>
<result column="total_exchange" property="totalExchange"/> <result column="price_refund" property="priceRefund"/>
<result column="total_refund_general" property="totalRefundGeneral"/> <result column="refund_number" property="refundNumber"/>
<result column="total_refund_price" property="totalRefundPrice"/> <result column="user_id" property="userId"/>
<result column="total_member_number" property="totalMemberNumber"/> <result column="user_name" property="userName"/>
<result column="total_paying_number" property="totalPayingNumber"/> <result column="user_mobile" property="userMobile"/>
<result column="total_buy_users" property="totalBuyUsers"/> <result column="order_source" property="orderSource"/>
</resultMap> </resultMap>
<select id="getPriceNum" resultType="java.util.HashMap"> <select id="getPriceNum" resultType="java.util.HashMap">
SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num
...@@ -84,48 +90,49 @@ ...@@ -84,48 +90,49 @@
kot.refund_number, kot.refund_number,
kot.user_id, kot.user_id,
kot.user_name, kot.user_name,
kot.user_mobile kot.user_mobile,
kot.order_source
FROM kylin_order_tickets kot FROM kylin_order_tickets kot
inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
inner join kylin_performances kp on kotr.performance_id = kp.performances_id inner join kylin_performances kp on kotr.performance_id = kp.performances_id
<where> <where>
<if test="orderTicketsId != null and orderTicketsId != ''"> and order_tickets_id = #{orderTicketsId}</if> <if test="orderTicketsId != null and orderTicketsId != ''"> and kot.order_tickets_id = #{orderTicketsId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if> <if test="userId != null and userId != ''"> and kot.user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if> <if test="userName != null and userName != ''"> and kot.user_name like concat('%', #{userName}, '%')</if>
<if test="userMobile != null and userMobile != ''"> and user_mobile = #{userMobile}</if> <if test="userMobile != null and userMobile != ''"> and kot.user_mobile = #{userMobile}</if>
<if test="performanceTitle != null and performanceTitle != ''"> and performance_title = #{performanceTitle}</if> <if test="performanceTitle != null and performanceTitle != ''"> and kot.performance_title = #{performanceTitle}</if>
<if test="orderCode != null and orderCode != ''"> and order_code = #{orderCode}</if> <if test="orderCode != null and orderCode != ''"> and kot.order_code = #{orderCode}</if>
<if test="payCode != null and payCode != ''"> and pay_code = #{payCode}</if> <if test="payCode != null and payCode != ''"> and kot.pay_code = #{payCode}</if>
<if test="qrCode != null and qrCode != ''"> and qr_code = #{qrCode}</if> <if test="qrCode != null and qrCode != ''"> and kot.qr_code = #{qrCode}</if>
<if test="orderType != null and orderType != ''"> and order_type = #{orderType}</if> <if test="orderType != null and orderType != ''"> and kot.order_type = #{orderType}</if>
<if test="orderVersion != null and orderVersion != ''"> and order_version = #{orderVersion}</if> <if test="orderVersion != null and orderVersion != ''"> and kot.order_version = #{orderVersion}</if>
<if test="number != null "> and number = #{number}</if> <if test="number != null "> and kot.number = #{number}</if>
<if test="price != null "> and price = #{price}</if> <if test="price != null "> and kot.price = #{price}</if>
<if test="priceMember != null "> and price_member = #{priceMember}</if> <if test="priceMember != null "> and kot.price_member = #{priceMember}</if>
<if test="priceTotal != null "> and price_total = #{priceTotal}</if> <if test="priceTotal != null "> and kot.price_total = #{priceTotal}</if>
<if test="priceVoucher != null "> and price_voucher = #{priceVoucher}</if> <if test="priceVoucher != null "> and kot.price_voucher = #{priceVoucher}</if>
<if test="priceActual != null "> and price_actual = #{priceActual}</if> <if test="priceActual != null "> and kot.price_actual = #{priceActual}</if>
<if test="priceExpress != null "> and price_express = #{priceExpress}</if> <if test="priceExpress != null "> and kot.price_express = #{priceExpress}</if>
<if test="priceRefund != null "> and price_refund = #{priceRefund}</if> <if test="priceRefund != null "> and kot.price_refund = #{priceRefund}</if>
<if test="refundNumber != null "> and refund_number = #{refundNumber}</if> <if test="refundNumber != null "> and kot.refund_number = #{refundNumber}</if>
<if test="payType != null and payType != ''"> and pay_type = #{payType}</if> <if test="payType != null and payType != ''"> and kot.pay_type = #{payType}</if>
<if test="paymentType != null and paymentType != ''"> and payment_type = #{paymentType}</if> <if test="paymentType != null and paymentType != ''"> and kot.payment_type = #{paymentType}</if>
<if test="timePay != null and timePay != ''"> and time_pay = #{timePay}</if> <if test="timePay != null and timePay != ''"> and kot.time_pay = #{timePay}</if>
<if test="expressContacts != null and expressContacts != ''"> and express_contacts = #{expressContacts}</if> <if test="expressContacts != null and expressContacts != ''"> and kot.express_contacts = #{expressContacts}</if>
<if test="expressAddress != null and expressAddress != ''"> and express_address = #{expressAddress}</if> <if test="expressAddress != null and expressAddress != ''"> and kot.express_address = #{expressAddress}</if>
<if test="expressPhone != null and expressPhone != ''"> and express_phone = #{expressPhone}</if> <if test="expressPhone != null and expressPhone != ''"> and kot.express_phone = #{expressPhone}</if>
<if test="couponType != null and couponType != ''"> and coupon_type = #{couponType}</if> <if test="couponType != null and couponType != ''"> and kot.coupon_type = #{couponType}</if>
<if test="getTicketType != null and getTicketType != ''"> and get_ticket_type = #{getTicketType}</if> <if test="getTicketType != null and getTicketType != ''"> and kot.get_ticket_type = #{getTicketType}</if>
<if test="getTicketDescribe != null and getTicketDescribe != ''"> and get_ticket_describe = #{getTicketDescribe}</if> <if test="getTicketDescribe != null and getTicketDescribe != ''"> and kot.get_ticket_describe = #{getTicketDescribe}</if>
<if test="payCountdownMinute != null "> and pay_countdown_minute = #{payCountdownMinute}</if> <if test="payCountdownMinute != null "> and kot.pay_countdown_minute = #{payCountdownMinute}</if>
<if test="comment != null and comment != ''"> and comment = #{comment}</if> <if test="comment != null and comment != ''"> and kot.comment = #{comment}</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if> <if test="createdAt != null "> and kot.created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if> <if test="updatedAt != null "> and kot.updated_at = #{updatedAt}</if>
<if test="orderSourece != null and orderSourece != ''"> and order_sourece = #{orderSourece}</if> <if test="orderSource != null and orderSource != ''"> and kot.order_source = #{orderSource}</if>
</where> </where>
<if test="orderItem!=''"> <!-- <if test="orderItem!=''">-->
ORDER BY ${orderItem} ${orderSc} <!-- ORDER BY ${orderItem} ${orderSc}-->
</if> <!-- </if>-->
</select> </select>
</mapper> </mapper>
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