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

Skip to content

L
liquidnet-bus-v1
Commit 97a20e2c authored by anjiabin's avatar anjiabin
Browse files
Options

修改会员订单明细

parent bbd0ffda
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 100 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/admin/MemberOrderDetailAdminVo.java 0 → 100644
View file @ 97a20e2c
package com.liquidnet.service.adam.dto.vo.admin;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.adam.entity.AdamUser;
import lombok.Data;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: MemberOrderDetailAdminVo
* @Package com.liquidnet.service.adam.dto.vo.admin
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/20 14:37
*/
@Data
public class MemberOrderDetailAdminVo {
private AdamMemberOrderVo adamMemberOrderVo;
private AdamUser adamUser;
private AdamUserInfoVo adamUserInfoVo;
private AdamUserMemberVo adamUserMemberVo;
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberOrderAdminService.java
View file @ 97a20e2c
package com.liquidnet.service.adam.service.admin; package com.liquidnet.service.adam.service.admin;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
/** /**
...@@ -13,5 +14,5 @@ import com.liquidnet.service.adam.entity.AdamMemberOrder; ...@@ -13,5 +14,5 @@ import com.liquidnet.service.adam.entity.AdamMemberOrder;
* @date 2021/6/6 16:23 * @date 2021/6/6 16:23
*/ */
public interface IAdamMemberOrderAdminService extends IService<AdamMemberOrder> { public interface IAdamMemberOrderAdminService extends IService<AdamMemberOrder> {
MemberOrderDetailAdminVo getMemberOrderDetail(String orderNo);
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderController.java
View file @ 97a20e2c
package com.liquidnet.client.admin.web.controller.zhengzai.adam; package com.liquidnet.client.admin.web.controller.zhengzai.adam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.liquidnet.client.admin.common.core.controller.BaseController; 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.adam.dto.vo.admin.MemberOrderDetailAdminVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
...@@ -57,9 +57,7 @@ public class AdamMemberOrderController extends BaseController ...@@ -57,9 +57,7 @@ public class AdamMemberOrderController extends BaseController
@RequiresPermissions("adam:order:orderlist:detail") @RequiresPermissions("adam:order:orderlist:detail")
@GetMapping("/orderList/detail/{orderId}") @GetMapping("/orderList/detail/{orderId}")
public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) { public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) {
LambdaQueryWrapper<AdamMemberOrder> queryWrapper = new LambdaQueryWrapper(); MemberOrderDetailAdminVo orderDetailsVo = adamMemberOrderAdminService.getMemberOrderDetail(orderId);
queryWrapper.eq(AdamMemberOrder::getOrderNo,orderId);
AdamMemberOrder orderDetailsVo = adamMemberOrderAdminService.getOne(queryWrapper);
mmap.put("orderDetailsVo", orderDetailsVo); mmap.put("orderDetailsVo", orderDetailsVo);
return prefix + "/orderList/detail"; return prefix + "/orderList/detail";
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html
View file @ 97a20e2c
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改【请填写功能名称】')" /> <th:block th:include="include :: header('会员订单详情')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-order-edit" th:object="${adamMemberOrder}"> <form class="form-horizontal m" id="form-order-edit" th:object="${orderDetailsVo}">
<input name="mid" th:field="*{mid}" type="hidden">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label> <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"> <div class="col-sm-8">
<input name="mode" th:field="*{mode}" class="form-control" type="text"> <input name="state" th:field="*{adamMemberOrderVo.state}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">原价：</label> <label class="col-sm-3 control-label">价格：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="price" th:field="*{price}" class="form-control" type="text"> <input name="pricePaid" th:field="*{adamMemberOrderVo.pricePaid}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">实际支付：</label> <label class="col-sm-3 control-label">可用时间(天)：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="pricePaid" th:field="*{pricePaid}" class="form-control" type="text"> <input name="days" th:field="*{adamMemberOrderVo.days}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">实际支付：</label> <label class="col-sm-3 control-label">订单号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="memberName" th:field="*{memberName}" class="form-control" type="text"> <input name="orderNo" th:field="*{adamMemberOrderVo.orderNo}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">会员id：</label> <label class="col-sm-3 control-label">生成时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="memberId" th:field="*{memberId}" class="form-control" type="text"> <input name="createdAt" th:field="*{adamMemberOrderVo.createdAt}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">会员价格id：</label> <label class="col-sm-3 control-label">购买人手机号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="memberPriceId" th:field="*{memberPriceId}" class="form-control" type="text"> <input name="memberName" th:field="*{adamMemberOrderVo.memberName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">购买天数：</label> <label class="col-sm-3 control-label">版本：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="days" th:field="*{days}" class="form-control" type="text"> <input name="version" th:field="*{adamMemberOrderVo.version}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">订单状态：</label> <label class="col-sm-3 control-label">客户端：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="state" th:field="*{state}" class="form-control" type="text"> <input name="source" th:field="*{adamMemberOrderVo.source}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- &lt;!&ndash; 会员卡信息&ndash;&gt;-->
<label class="col-sm-3 control-label">会员号：</label> <div class="form-group">
<label class="col-sm-3 control-label">会员卡ID：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="memberNo" th:field="*{memberNo}" class="form-control" type="text"> <input name="memberNo" th:field="*{adamMemberOrderVo.memberId}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">支付渠道：</label> <div class="form-group">
<label class="col-sm-3 control-label">会员卡名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="payChannel" th:field="*{payChannel}" class="form-control" type="text"> <input name="state" th:field="*{adamMemberOrderVo.memberName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">支付订单：</label> <!-- <label class="col-sm-3 control-label">会员勋章：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="memberNo" th:field="*{adamMemberOrderVo.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"> <div class="col-sm-8">
<input name="payNo" th:field="*{payNo}" class="form-control" type="text"> <img class="img-circle img-lg" th:src="(*{#strings.isEmpty(adamUserInfoVo.avatar)}) ? @{/img/profile.jpg} : @{*{adamUserInfoVo.avatar}}" th:onerror="'this.src=\'' + @{'/img/profile.jpg'} + '\''">
</div> </div>
</div> </div>
<div class="form-group"> <!-- &lt;!&ndash; 套餐信息&ndash;&gt;-->
<div class="form-group">
<label class="col-sm-3 control-label">用户生日：</label> <label class="col-sm-3 control-label">用户生日：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <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"> <input name="birthday" th:value="*{adamMemberOrderVo.birthday}" 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>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">支付时间：</label> <!-- <label class="col-sm-3 control-label">喜欢的音乐人：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="clientIp" th:field="*{clientIp}" class="form-control" type="text"> <!-- <input name="version" th:field="*{version}" class="form-control" type="text">-->
</div> <!-- </div>-->
</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> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 97a20e2c
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
detailUrl: prefix + "/detail/{id}",
modalName: "【请填写功能名称】", modalName: "【请填写功能名称】",
columns: [{ columns: [{
checkbox: true checkbox: true
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
View file @ 97a20e2c
package com.liquidnet.client.admin.zhengzai.adam.service.impl; package com.liquidnet.client.admin.zhengzai.adam.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.entity.AdamUser;
import com.liquidnet.service.adam.entity.AdamUserInfo;
import com.liquidnet.service.adam.entity.AdamUserMember;
import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper; import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
import com.liquidnet.service.adam.mapper.AdamUserMapper;
import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -17,4 +30,47 @@ import org.springframework.stereotype.Service; ...@@ -17,4 +30,47 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderAdminService { public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderAdminService {
@Autowired
private AdamMemberOrderMapper adamMemberOrderMapper;
@Autowired
private AdamUserMemberMapper adamUserMemberMapper;
@Autowired
private AdamUserInfoMapper adamUserInfoMapper;
@Autowired
private AdamUserMapper adamUserMapper;
@Override
public MemberOrderDetailAdminVo getMemberOrderDetail(String orderNo) {
MemberOrderDetailAdminVo detailAdminVo = new MemberOrderDetailAdminVo();
AdamMemberOrderVo adamMemberOrderVo = new AdamMemberOrderVo();
AdamUser adamUser = new AdamUser();
AdamUserInfoVo adamUserInfoVo = new AdamUserInfoVo();
AdamUserMemberVo adamUserMemberVo = new AdamUserMemberVo();
LambdaQueryWrapper<AdamMemberOrder> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(AdamMemberOrder::getOrderNo,orderNo);
AdamMemberOrder adamMemberOrder = adamMemberOrderMapper.selectOne(queryWrapper);
BeanUtil.copy(adamMemberOrder,adamMemberOrderVo);
//获取用户会员信息
LambdaQueryWrapper<AdamUserMember> adamUserMemberWrapper = new LambdaQueryWrapper();
adamUserMemberWrapper.eq(AdamUserMember::getUid,adamMemberOrderVo.getUid());
AdamUserMember adamUserMember = adamUserMemberMapper.selectOne(adamUserMemberWrapper);
BeanUtil.copy(adamUserMember,adamUserMemberVo);
//获取用户信息表
LambdaQueryWrapper<AdamUserInfo> adamUserInfoWrapper = new LambdaQueryWrapper();
adamUserInfoWrapper.eq(AdamUserInfo::getUid,adamMemberOrderVo.getUid());
AdamUserInfo adamUserInfo = adamUserInfoMapper.selectOne(adamUserInfoWrapper);
BeanUtil.copy(adamUserInfo,adamUserInfoVo);
//获取用户表信息
LambdaQueryWrapper<AdamUser> adamUserWrapper = new LambdaQueryWrapper();
adamUserWrapper.eq(AdamUser::getUid,adamMemberOrderVo.getUid());
adamUser = adamUserMapper.selectOne(adamUserWrapper);
detailAdminVo.setAdamMemberOrderVo(adamMemberOrderVo);
detailAdminVo.setAdamUserMemberVo(adamUserMemberVo);
detailAdminVo.setAdamUserInfoVo(adamUserInfoVo);
detailAdminVo.setAdamUser(adamUser);
return detailAdminVo;
}
} }
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