clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: clunt:228e8d3a704022070275a0e572cc0dd353c5c9d9
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund
..
compare: clunt:a329df620dd56f8da9f484e8ae7c477b54a1ca57
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund

No commits in common. "228e8d3a704022070275a0e572cc0dd353c5c9d9" and "a329df620dd56f8da9f484e8ae7c477b54a1ca57" have entirely different histories.
228e8d3a70 ... a329df620d

12 changed files with 6 additions and 64 deletions
Show Stats Expand all files Collapse all files

10
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -267,16 +267,6 @@ public class OrderDetailController extends BaseController {
if (fc != null) {
detail.setChangeMoney(fc.getChangeMoney());
}
// 完单图片
GoodsImgs param = new GoodsImgs();
param.setRemark(String.valueOf(detail.getId()));
param.setImgType(ImgType.FINISH_IMG.getId());
List<GoodsImgs> imgsList = goodsImgsService.qryGoodsImgs(param);
StringBuilder stringBuilder = new StringBuilder();
imgsList.forEach(model->{
stringBuilder.append("<a target='_blank' href='").append(model.getImgUrl()).append("' >查看图片<a/>");
});
detail.setOrderImgs(stringBuilder.toString());
}
return getDataTable(orderDetails);

17
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -1293,23 +1293,6 @@ public class OrderMasterController extends BaseController {
if(master.getExpectTimeStart() != null && master.getExpectTimeEnd() != null){
master.setMixExpectTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",master.getExpectTimeStart()) +"-"+ DateUtils.parseDateToStr("HH:mm",master.getExpectTimeEnd()));
}
if("01".equals(master.getConsultMode())){
master.setOrderMode("05");
} else if (StringUtils.isEmpty(master.getOrderMode())) {
master.setOrderMode("01");
}
List<OrderDetail> details = orderDetailService.selectByOrderMasterId(master.getId());
StringBuilder stringBuilder = new StringBuilder();
details.forEach(model->{
GoodsImgs param = new GoodsImgs();
param.setRemark(String.valueOf(model.getId()));
param.setImgType(ImgType.FINISH_IMG.getId());
List<GoodsImgs> imgsList = goodsImgsService.qryGoodsImgs(param);
imgsList.forEach(imgs->{
stringBuilder.append("<a target='_blank' href='").append(imgs.getImgUrl()).append("' >查看图片<a/>");
});
});
master.setOrderImgs(stringBuilder.toString());
}
return getDataTable(orderMasterList);
}

7
ghy-admin/src/main/resources/templates/order/master.html
View File

@ -698,12 +698,7 @@
field: 'changeMoney',
title: '商家追加金额',
align: 'center'
},
{
field: 'orderImgs',
title: '完单图片'
},
{
},{
field: 'orderType',
title: '订单类型',
align: 'center',

5
ghy-admin/src/main/resources/templates/order/orderManager.html
View File

@ -733,11 +733,6 @@
title: '商家追加金额',
align: 'center'
},
{
field: 'orderImgs',
title: '完单图片',
align: 'center'
},
{
field: 'payMode',
title: '商家付费模式',

6
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

@ -148,7 +148,7 @@
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">订单查询：</label>
<input name="keywords" id="keywords" type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
<input type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
</div>
<div class="m-t">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@ -488,10 +488,6 @@
align: 'center',
visible: false
},
{
field: 'orderImgs',
title: '完单图片'
},
{
field: 'payMode',
title: '商家付费模式',

7
ghy-admin/src/main/resources/templates/order/pcOrderWorker.html
View File

@ -147,12 +147,7 @@
checkbox: true
}, {
field: 'name',
title: '昵称',
align: "left"
},
{
field: 'realName',
title: '真实姓名',
title: '人员名称',
align: "left"
}, {
field: 'phone',

3
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -70,9 +70,6 @@ public class OrderDetail extends BaseEntity {
// 接单师傅
private Worker worker;
private String orderImgs;
// 商品归属师傅
private Worker goodsWorker;
// 接单师傅

2
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -157,8 +157,6 @@ public class OrderMaster extends BaseEntity {
private String orderMode;
private String orderImgs;
private String payMode;
private String isCharge;

2
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -290,7 +290,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
}
logger.info("订单[code={}]发起分账", orderMaster.getCode());
JSONObject response = adapayService.paymentConfirm(orderMaster.getDeptId(), payment.getId(), orderMaster.getCode() + System.currentTimeMillis(),
JSONObject response = adapayService.paymentConfirm(orderMaster.getDeptId(), payment.getId(), payment.getOrderNo(),
AdapayUtils.bigDecimalToString(confirmAmt), divMembers, null, null);
boolean status = AdapayStatusEnum.pending.code.equals(response.getString("status")) ||

2
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -108,8 +108,6 @@
om.code LIKE concat('%', #{keyWords}, '%')
or ca.name LIKE concat('%', #{keyWords}, '%')
or ca.phone LIKE concat('%', #{keyWords}, '%')
or ca.address like concat('%', #{keyWords}, '%')
or g.goods_name like concat('%', #{keyWords}, '%')
)
</if>
<if test="deptId != null and deptId != ''">

5
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -104,8 +104,7 @@
om.is_call,
fm.server_money,
om.goods_brand,
om.goods_specification,
om.consult_mode
om.goods_specification
FROM order_master om
LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
LEFT JOIN goods g ON g.goods_id = om.goods_id
@ -122,8 +121,6 @@
om.code LIKE concat('%', #{keywords}, '%')
or ca.name LIKE concat('%', #{keywords}, '%')
or ca.phone LIKE concat('%', #{keywords}, '%')
or ca.address like concat('%', #{keywords}, '%')
or g.goods_name like concat('%', #{keywords}, '%')
)
</if>
<if test="workerName != null and workerName != ''">

4
ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
View File

@ -62,7 +62,6 @@
SELECT w.worker_id FROM worker w
LEFT JOIN worker_area wa ON wa.worker_id = w.worker_id
LEFT JOIN worker_goods_category wgc ON wgc.worker_id = w.worker_id
LEFT JOIN worker_certification wc on w.worker_id = wc.worker_id
<where>
<if test="deptId != null and deptId != ''">
AND dept_id = #{deptId}
@ -78,8 +77,7 @@
</if>
<if test="keyWords != null and keyWords != ''">
AND (w.name LIKE '%${keyWords}%'
OR w.phone LIKE '%${keyWords}%'
OR concat(wc.surname,'', wc.name) like '%${keyWords}%')
OR w.phone LIKE '%${keyWords}%')
</if>
<if test="name != null and name != ''">
AND w.name LIKE '%${name}%'