From 7ced4fdb47299ca630042075bf58156853912fd9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 17:51:21 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 15 ++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 12
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 24 +--
src/main/resources/mapper/modules/MallMemberMapper.xml | 1
src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html | 90 ++++++++++++
src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java | 2
src/main/resources/templates/febs/views/modules/mallMember/agentList.html | 26 +-
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 56 ++++----
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 13 +
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 5
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 62 ++++----
src/main/resources/templates/febs/views/modules/order/orderList.html | 79 ++++++-----
src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java | 3
13 files changed, 259 insertions(+), 129 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index d7b3886..5cf3160 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -429,4 +429,17 @@
return adminMallOrderService.showStateSwitchOff(id);
}
+ /**
+ * 订单列表-资金流水
+ */
+ @GetMapping("/moneyFlow")
+ public FebsResponse moneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo, Integer parentId) {
+ if (parentId == null) {
+ ViewMallOrderController.seeOrderFlowByOrderId = 0;
+ }
+ mallOrderInfo.setId(ViewMallMemberController.idFromMoneyFlow);
+ Map<String, Object> dataTable = getDataTable(adminMallOrderService.moneyFlow(request, mallOrderInfo));
+ return new FebsResponse().success().data(dataTable);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index 903ce69..ec60cc2 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -28,6 +28,8 @@
public static long idFromRefund;
+ public static long seeOrderFlowByOrderId;
+
/**
* 订单列表
* @return
@@ -205,4 +207,17 @@
return FebsUtil.view("modules/order/refundPayInfo");
}
+ /**
+ * 订单-流水详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("seeOrderFlow/{id}")
+ @RequiresPermissions("seeOrderFlow:view")
+ public String seeOrderFlow(@PathVariable long id, Model model) {
+ seeOrderFlowByOrderId = id;
+ return FebsUtil.view("modules/order/orderMoneyFlow");
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
index 37d7687..f9bf87d 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
+import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo;
import cc.mrbird.febs.mall.vo.AdminMoneyChargeListVo;
import cc.mrbird.febs.mall.vo.AdminMoneyFlowListVo;
@@ -43,4 +44,6 @@
@Param("type")Integer type,
@Param("status")Integer status,
@Param("isReturn")Integer isReturn);
+
+ IPage<AdminMallMoneyFlowVo> selectOrderMoneyFlowInPage(Page<AdminMallMoneyFlowVo> page, @Param("record")MallOrderInfo mallOrderInfo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
index c2faf8c..b18893a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
@@ -70,4 +70,6 @@
FebsResponse delOrder(Long id);
FebsResponse takeGoods(Long id);
+
+ IPage<AdminMallMoneyFlowVo> moneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
index 8d73534..824441e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -122,9 +122,9 @@
BigDecimal subsidyPercent = new BigDecimal(subsidyPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
BigDecimal subsidyAmount = subsidyPercent.multiply(new BigDecimal(originalPrice)).setScale(2, BigDecimal.ROUND_DOWN);
mallGoods.setSubsidyAmount(subsidyAmount);
- if (mallGoods.getHasCarriage() == 2) {
- mallGoods.setCarriage(BigDecimal.ZERO);
- }
+// if (mallGoods.getHasCarriage() == 2) {
+// mallGoods.setCarriage(BigDecimal.ZERO);
+// }
mallGoodsMapper.insert(mallGoods);
String thumbs = addMallGoodsDto.getThumbs();
@@ -353,9 +353,9 @@
}
BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
- if (mallGoods.getHasCarriage() == 2) {
- mallGoods.setCarriage(BigDecimal.ZERO);
- }
+// if (mallGoods.getHasCarriage() == 2) {
+// mallGoods.setCarriage(BigDecimal.ZERO);
+// }
//根据商品原价获取商品星级
String originalPrice = mallGoods.getOriginalPrice();
String starRating = StarRatingEnum.NORMAL.belongStarRating(originalPrice);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 7d0f04d..04d6ccc 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -119,22 +119,6 @@
@Override
public AdminOrderDetailVo getMallOrderDetailById(long id) {
AdminOrderDetailVo adminOrderDetailVo = mallOrderInfoMapper.getMallOrderDetailById(id);
- MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
- if(ObjectUtil.isNotEmpty(mallExpressInfo)){
- adminOrderDetailVo.setExpressNo(mallExpressInfo.getExpressNo());
- adminOrderDetailVo.setExpressCom(mallExpressInfo.getExpressCom());
- }
- List<MallOrderItem> mallOrderItems = mallOrderInfoMapper.getMallOrderItemByOrderId(id);
- if(CollUtil.isNotEmpty(mallOrderItems)){
- StringBuffer orderItems = new StringBuffer();
- for (MallOrderItem item : mallOrderItems){
- StringBuffer orderItem = new StringBuffer();
- orderItems.append(item.getGoodsName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
- orderItems.append(orderItem);
- }
- adminOrderDetailVo.setOrderItems(orderItems.toString());
- }
-
return adminOrderDetailVo;
}
@@ -463,6 +447,14 @@
}
@Override
+ public IPage<AdminMallMoneyFlowVo> moneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo) {
+ Page<AdminMallMoneyFlowVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ MallOrderInfo orderInfo = this.baseMapper.selectById(mallOrderInfo.getId());
+ IPage<AdminMallMoneyFlowVo> adminMallMoneyFlowVos = mallMoneyFlowMapper.selectOrderMoneyFlowInPage(page, orderInfo);
+ return adminMallMoneyFlowVos;
+ }
+
+ @Override
public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
if (mallOrderInfo == null) {
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 8784cea..be651c6 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -153,6 +153,7 @@
FROM mall_member m
left join data_dictionary_custom a on a.description = m.level
<where>
+ and m.level != '代理'
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
and m.name like concat('%', #{record.name},'%')
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index de38deb..50f65bc 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -142,4 +142,9 @@
and a.status = #{status}
and a.is_return = #{isReturn}
</select>
+
+ <select id="selectOrderMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
+ select * from mall_money_flow a where a.order_no = #{record.orderNo}
+ order by a.CREATED_TIME desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index ae9cf03..e171377 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -85,26 +85,26 @@
<div class="layui-input-block">
<select name="isNormal" class="goods-type" lay-filter="goods-type-select">
<option value="1">普通商品区</option>
- <option value="2">套餐区</option>
+<!-- <option value="2">套餐区</option>-->
</select>
</div>
</div>
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态倍数</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态倍数</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
@@ -193,20 +193,20 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">设置运费：</label>
- <div class="layui-input-block">
- <input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />
- <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">设置运费：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />-->
+<!-- <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item carriage-input febs-hide">
- <label class="layui-form-label">运费：</label>
- <div class="layui-input-block">
- <input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item carriage-input febs-hide">-->
+<!-- <label class="layui-form-label">运费：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
<blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
<div class="layui-col-lg6">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index d91bcd3..3dc6801 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -92,29 +92,29 @@
<select name="isNormal" class="goods-type"
lay-filter="goods-type-select">
<option value="1">普通商品区</option>
- <option value="2">套餐区</option>
+<!-- <option value="2">套餐区</option>-->
</select>
</div>
</div>
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态倍数</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入静态倍数"
- autoComplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态倍数</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入静态倍数"-->
+<!-- autoComplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比"
- autoComplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比"-->
+<!-- autoComplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
@@ -216,20 +216,20 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">设置运费：</label>
- <div class="layui-input-block">
- <input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />
- <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">设置运费：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />-->
+<!-- <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item carriage-input febs-hide">
- <label class="layui-form-label">运费：</label>
- <div class="layui-input-block">
- <input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item carriage-input febs-hide">-->
+<!-- <label class="layui-form-label">运费：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
<blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
<div class="layui-col-lg6">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
index d91fb68..d9accbc 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -17,19 +17,19 @@
<input type="text" placeholder="手机号" name="account" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">代理层级</label>
- <div class="layui-input-inline">
- <select name="level">
- <option value="">请选择</option>
- <option value="FIRST_LEVEL">普通会员</option>
- <option value="SECOND_LEVEL">一星</option>
- <option value="THIRD_LEVEL">二星</option>
- <option value="FOUR_LEVEL">三星</option>
- <option value="FIFTH_LEVEL">四星</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">代理层级</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="level">-->
+<!-- <option value="">请选择</option>-->
+<!-- <option value="FIRST_LEVEL">普通会员</option>-->
+<!-- <option value="SECOND_LEVEL">一星</option>-->
+<!-- <option value="THIRD_LEVEL">二星</option>-->
+<!-- <option value="FOUR_LEVEL">三星</option>-->
+<!-- <option value="FIFTH_LEVEL">四星</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index ac7a50a..c1b3697 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -100,11 +100,11 @@
</script>
<script type="text/html" id="tableToolBar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliver">导出未发货订单</button>
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverDone">导出已发货订单</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliver">导出未发货订单</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverDone">导出已发货订单</button>-->
<!-- <button type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" onclick="print('tool(orderTable)')">layui自定义打印表格</button>-->
- <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>
+<!-- <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="getCheckData">获取选中行数据</button>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="getCheckLength">获取选中数目</button>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="isAll">验证是否全选</button>-->
@@ -180,6 +180,11 @@
}
if (layEvent === 'seeOrder') {
febs.modal.open( '订单详情', 'modules/order/orderDetail/' + data.id, {
+ maxmin: true,
+ });
+ }
+ if (layEvent === 'seeOrderFlow') {
+ febs.modal.open( '流水详情', 'modules/order/seeOrderFlow/' + data.id, {
maxmin: true,
});
}
@@ -262,24 +267,24 @@
toolbar: '#tableToolBar',
totalRow: true ,// 开启合计行
cols: [[
- {type: 'checkbox',fixed: 'left'},
+ // {type: 'checkbox',fixed: 'left'},
{field: 'orderNo', title: '订单编号', minWidth: 120,align:'left', totalRowText: '合计：'},
{field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
{field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
- {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
+ // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
- {field: 'remark', title: '备注', minWidth: 200,align:'left'},
+ // {field: 'remark', title: '备注', minWidth: 200,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
- {field: 'deliverType', title: '配送方式',
- templet: function (d) {
- if (d.deliverType === 1) {
- return '<span style="color:green;">快递寄送</span>'
- } else if (d.deliverType === 2) {
- return '<span style="color:blue;">到店自提</span>'
- }else{
- return '<span style="color:green;">快递寄送</span>'
- }
- }, minWidth: 120,align:'center'},
+ // {field: 'deliverType', title: '配送方式',
+ // templet: function (d) {
+ // if (d.deliverType === 1) {
+ // return '<span style="color:green;">快递寄送</span>'
+ // } else if (d.deliverType === 2) {
+ // return '<span style="color:blue;">到店自提</span>'
+ // }else{
+ // return '<span style="color:green;">快递寄送</span>'
+ // }
+ // }, minWidth: 120,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -300,28 +305,32 @@
return ''
}
}, minWidth: 80,align:'center'},
- {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
+ // {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
- {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
+ // {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
{field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
- {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
+ // {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
+ // {title: '操作',
+ // templet: function (d) {
+ // if (d.status === 2) {
+ // if(d.deliverType ===2){
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="takeGoods" shiro:hasPermission="user:update">自提</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ // }else{
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ // }
+ // }else if(d.status === 7){
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ // +'<button class="layui-btn layui-btn-xs layui-btn-normal layui-btn-danger" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
+ // }else{
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs " lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ // }
+ // // }
+ // },minWidth: 200,align:'center', fixed:'right'}
{title: '操作',
templet: function (d) {
- if (d.status === 2) {
- if(d.deliverType ===2){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="takeGoods" shiro:hasPermission="user:update">自提</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
- }else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
- }
- }else if(d.status === 7){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
- +'<button class="layui-btn layui-btn-xs layui-btn-normal layui-btn-danger" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
- }else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs " lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
- }
- // }
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrderFlow" shiro:hasPermission="user:update">查看流水</button>'
},minWidth: 200,align:'center', fixed:'right'}
]]
});
diff --git a/src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html b/src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html
new file mode 100644
index 0000000..61c6c41
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html
@@ -0,0 +1,90 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-orderMoneyFlow-child" lay-title="订单资金流水">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <table lay-filter="orderMoneyFlowChild" lay-data="{id: 'orderMoneyFlowChild'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script data-th-inline="none" type="text/javascript">
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect' ,'eleTree'], function () {
+ var $ = layui.jquery,
+ laydate = layui.laydate,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ treeSelect = layui.treeSelect,
+ dropdown = layui.dropdown,
+ $view = $('#febs-orderMoneyFlow-child'),
+ $query = $view.find('#queryChild'),
+ $searchForm = $view.find('formChild'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns,
+ createTimeFrom,
+ createTimeTo;
+
+ form.render();
+
+ initTable();
+
+ laydate.render({
+ elem: '#user-createTime',
+ range: true,
+ trigger: 'click'
+ });
+
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'orderMoneyFlowChild',
+ url: ctx + 'admin/order/moneyFlow?parentId=1',
+ cols: [[
+ {field: 'amount', title: '金额', minWidth: 80,align:'center'},
+ {field: 'type', title: '流水类型',
+ templet: function (d) {
+ if (d.type === 1) {
+ return '<span>市场补贴</span>'
+ } else if (d.type === 2) {
+ return '<span>直推奖励</span>'
+ } else if (d.type === 3) {
+ return '<span>第一代分享奖励</span>'
+ } else if (d.type === 4) {
+ return '<span>第二代分享奖励</span>'
+ }else if (d.type === 5) {
+ return '<span>支付</span>'
+ }else if (d.type === 6) {
+ return '<span>团队管理补贴</span>'
+ }else if (d.type === 7) {
+ return '<span>购买星级</span>'
+ }else if (d.type === 8) {
+ return '<span>星级保证金返还</span>'
+ }else if (d.type === 9) {
+ return '<span>提现</span>'
+ }else if (d.type === 10) {
+ return '<span>充值</span>'
+ }else if (d.type === 100) {
+ return '<span>系统拨付</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 80,align:'center'},
+ {field: 'flowType', title: '资金类型',
+ templet: function (d) {
+ if (d.flowType === 1) {
+ return '余额';
+ } else {
+ return '-';
+ }
+ }, minWidth: 80,align:'center'},
+ {field: 'orderNo', title: '编号', minWidth: 150,align:'center'},
+ {field: 'createdTime', title: '时间', minWidth: 150,align:'left'}
+ ]]
+ });
+ }
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1