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

Skip to content

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

修改会员订单明细

parent 3904a201
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 11 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/param/admin/MemberOrderListReq.java 0 → 100644
View file @ d70eec2c
package com.liquidnet.service.adam.dto.param.admin;
import lombok.Data;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: MemberOrderListReq
* @Package com.liquidnet.service.adam.dto.param.admin
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/20 18:18
*/
@Data
public class MemberOrderListReq {
/**
* 订单号
*/
private String orderNo;
/**
* 电话
*/
private String mobile;
/**
* 支付方式:alipay,wepay,vipcode,giftcode
*/
private String payType;
/**
* 订单状态:0未支付 1已支付 2已超时 5已退款
*/
private Integer state;
/**
* 购买方式:0-购买会员 1-购买会员码,2-使用会员码
*/
private String mode;
/**
* 购买来源 Android iOS h5
*/
private String source;
/**
* 支付开始时间
*/
private String paymentAtStart;
/**
* 支付结束时间
*/
private String paymentAtEnd;
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberOrderAdminService.java
View file @ d70eec2c
package com.liquidnet.service.adam.service.admin;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.adam.dto.MemberOrderDto;
import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
import java.util.List;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
......@@ -14,5 +18,7 @@ import com.liquidnet.service.adam.entity.AdamMemberOrder;
* @date 2021/6/6 16:23
*/
public interface IAdamMemberOrderAdminService extends IService<AdamMemberOrder> {
List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq);
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 @ d70eec2c
......@@ -2,8 +2,9 @@ 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.dto.MemberOrderDto;
import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
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;
......@@ -44,10 +45,10 @@ public class AdamMemberOrderController extends BaseController
@RequiresPermissions("adam:order:orderlist:list")
@PostMapping("/orderList/list")
@ResponseBody
public TableDataInfo list(AdamMemberOrder adamMemberOrder)
public TableDataInfo list(MemberOrderListReq memberOrderListReq)
{
startPage();
List<AdamMemberOrder> list = adamMemberOrderAdminService.list();
List<MemberOrderDto> list = adamMemberOrderAdminService.getMemberOrderList(memberOrderListReq);
return getDataTable(list);
}
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ d70eec2c
......@@ -27,7 +27,7 @@
</li>
<li>
<label>订单状态：</label>
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_member_order_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
......@@ -83,6 +83,7 @@
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('adam:order:orderList')}]];
var prefix = ctx + "adam/order/orderList";
var orderStatusDic = [[${@dict.getType('zhengzai_member_order_status')}]];
$(function() {
var options = {
......@@ -102,7 +103,10 @@
},
{
field: 'state',
title: '订单状态'
title: '订单状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(orderStatusDic, value);
}
},
{
field: 'payType',
......@@ -115,6 +119,9 @@
{
field: 'paymentAt',
title: '支付时间'
// formatter: function(value, row, index) {
// return [[${#dates.format(value, 'yyyy-MM-dd')}]];
// }
},
{
field: 'createdAt',
......@@ -131,11 +138,11 @@
{
field: 'source',
title: '客户端'
},
{
field: 'state',
title: '快递状态'
},
}
// {
// field: 'state',
// title: '快递状态'
// },
{
title: '操作',
align: 'center',
......
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 @ d70eec2c
......@@ -3,6 +3,8 @@ 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.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.adam.dto.MemberOrderDto;
import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
......@@ -19,6 +21,12 @@ import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.beans.IntrospectionException;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
......@@ -39,6 +47,22 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
@Autowired
private AdamUserMapper adamUserMapper;
@Override
public List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq) {
Map<String, Object> reqParamMap = new HashMap<>();
try {
reqParamMap = BeanUtil.convertBeanToMap(memberOrderListReq,false);
} catch (IntrospectionException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
}
List<MemberOrderDto> list = adamMemberOrderMapper.getMemberOrderList(reqParamMap);
return list;
}
@Override
public MemberOrderDetailAdminVo getMemberOrderDetail(String orderNo) {
MemberOrderDetailAdminVo detailAdminVo = new MemberOrderDetailAdminVo();
......
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/dto/MemberOrderDto.java 0 → 100644
View file @ d70eec2c
package com.liquidnet.service.adam.dto;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: MemberOrderDto
* @Package com.liquidnet.service.adam.dto
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/20 17:59
*/
@Data
public class MemberOrderDto {
private String uid;
private String orderNo;
private String state;
private String payType;
private BigDecimal price;
private BigDecimal pricePaid;
private String paymentAt;
private String createdAt;
private String mobile;
private String source;
}
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.java
View file @ d70eec2c
package com.liquidnet.service.adam.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.adam.dto.MemberOrderDto;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
import java.util.List;
import java.util.Map;
public interface AdamMemberOrderMapper extends BaseMapper<AdamMemberOrder> {
List<MemberOrderDto> getMemberOrderList(Map<String, Object> map);
}
liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberMapper.xml
View file @ d70eec2c
......@@ -22,7 +22,18 @@
<result column="created_at" property="createdAt" />
<result column="updated_at" property="updatedAt" />
</resultMap>
<resultMap id="orderListResult" type="com.liquidnet.service.adam.dto.MemberOrderDto" >
<result column="member_id" property="uid" />
<result column="name" property="orderNo" />
<result column="title" property="state" />
<result column="sub_title" property="payType" />
<result column="start_no" property="price" />
<result column="icon" property="pricePaid" />
<result column="avatar" property="paymentAt" />
<result column="type" property="createdAt" />
<result column="interests_detail" property="mobile" />
<result column="notes" property="source" />
</resultMap>
<!-- sql -->
<select id="getFirstMember" resultMap="MemberResult">
SELECT
......@@ -48,4 +59,23 @@
FROM adam_member
limit 0,1
</select>
<select id="getMemberOrderList" resultMap="orderListResult">
select amo.uid,
amo.order_no,
amo.state,
amo.pay_type,
amo.price,
amo.price_paid,
amo.payment_at,
amo.created_at,
au.mobile,
amo.source
from adam_member_order amo
inner join adam_user_member aum
on amo.uid = aum.uid
inner join adam_user au on aum.uid = au.uid
<where>
<if test="userId != null and userId != ''">and kot.user_id = #{userId}</if>
</where>
</select>
</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