yxt_group
/
mallplus
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/mallplus

master
liupopo 2 years ago
parent
aac33d4a3f 4da712ff3d
commit
5c9813c1a6
6 changed files with 70 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
  2. 10
      mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java
  3. 22
      mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java
  4. 3
      mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMember.java
  5. 2
      mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
  6. 32
      mallplusui-web-admin/src/views/oms/order/index1.vue

17
mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
View File

@ -10,12 +10,14 @@ import com.zscat.mallplus.oms.entity.OmsOrder;
import com.zscat.mallplus.oms.entity.OmsOrderItem;
import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
import com.zscat.mallplus.oms.mapper.OmsOrderOperateHistoryMapper;
import com.zscat.mallplus.oms.query.OmsOrderQuery;
import com.zscat.mallplus.oms.service.IOmsOrderItemService;
import com.zscat.mallplus.oms.service.IOmsOrderService;
import com.zscat.mallplus.oms.vo.OmsMoneyInfoParam;
import com.zscat.mallplus.oms.vo.OmsOrderDeliveryParam;
import com.zscat.mallplus.oms.vo.OmsReceiverInfoParam;
import com.zscat.mallplus.oms.vo.OrderCountDto;
import com.zscat.mallplus.util.StringUtils;
import com.zscat.mallplus.utils.CommonResult;
import com.zscat.mallplus.utils.ValidatorUtils;
import io.swagger.annotations.Api;
@ -55,12 +57,23 @@ public class OmsOrderController {
@ApiOperation("根据条件查询所有订单表列表")
@GetMapping(value = "/list")
@PreAuthorize("hasAuthority('oms:OmsOrder:read')")
public Object getOmsOrderByPage(OmsOrder entity,
public Object getOmsOrderByPage(OmsOrderQuery omsOrderQuery,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
) {
try {
return new CommonResult().success(IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time").select(ConstansValue.sampleOrderList)));
QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(omsOrderQuery.getOrderSn())){
qw.like("order_sn",omsOrderQuery.getOrderSn());
}
if(StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())){
qw.like("receiver_phone",omsOrderQuery.getReceiverPhone());
}
qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')"
);
return new CommonResult().success(IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList)));
} catch (Exception e) {
log.error("根据条件查询所有订单表列表：%s", e.getMessage(), e);
}

10
mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java
View File

@ -12,6 +12,7 @@ import com.zscat.mallplus.ums.mapper.UmsIntegrationChangeHistoryMapper;
import com.zscat.mallplus.ums.service.IUmsMemberBlanceLogService;
import com.zscat.mallplus.ums.service.IUmsMemberLevelService;
import com.zscat.mallplus.ums.service.IUmsMemberService;
import com.zscat.mallplus.util.StringUtils;
import com.zscat.mallplus.util.UserUtils;
import com.zscat.mallplus.utils.CommonResult;
import com.zscat.mallplus.utils.ValidatorUtils;
@ -60,10 +61,15 @@ public class UmsMemberController {
@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize
) {
try {
if (ValidatorUtils.empty(entity.getBuyCountss())) {
/*if (ValidatorUtils.empty(entity.getBuyCountss())) {
return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time")));
}*/
if(StringUtils.isNotBlank(entity.getKeyword())){
return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).like("nickname", entity.getKeyword()).orderByDesc("create_time")));
}else{
return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time")));
}
return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).ge("buy_count", entity.getBuyCountss()).orderByDesc("create_time")));
// return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).ge("buy_count", entity.getBuyCountss()).orderByDesc("create_time")));
} catch (Exception e) {
log.error("根据条件查询所有会员表列表：%s", e.getMessage(), e);

22
mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java
View File

@ -0,0 +1,22 @@
package com.zscat.mallplus.oms.query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/14 16:49
* @Description
*/
@Data
public class OmsOrderQuery {
@ApiModelProperty(value = "订单编号",required = false)
private String orderSn;
@ApiModelProperty(value = "收货人手机号",required = false)
private String receiverPhone;
@ApiModelProperty(value = "提交开始时间",required = false)
private String createTimeStart;
@ApiModelProperty(value = "提交结束时间",required = false)
private String createTimeEnd;
}

3
mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMember.java
View File

@ -163,4 +163,7 @@ public class UmsMember implements Serializable {
private Integer buyCountss;
@TableField("isAlphaUser")
private Integer isAlphaUser;//是否内测
@TableField(exist = false)
private String keyword;
}

2
mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
View File

@ -576,7 +576,7 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
addIntegration(umsMember.getId(), regJifen, 1, "注册添加积分", AllEnum.ChangeSource.register.code(), umsMember.getUsername());
umsMember.setPassword(null);
return new CommonResult().success("注册成功", null);
return new CommonResult().success("注册成功", umsMember);
}
@Override

32
mallplusui-web-admin/src/views/oms/order/index1.vue
View File

@ -70,7 +70,7 @@
<div style="margin-top: 15px">
<el-form :inline="true" :model="listQuery" size="small" label-width="140px">
<el-form-item label="订单编号：">
<el-input v-model="listQuery.id" class="input-width" placeholder="编号"></el-input>
<el-input v-model="listQuery.orderSn" class="input-width" placeholder="编号"></el-input>
</el-form-item>
<!-- <el-form-item label="订单分类：">
<el-select v-model="listQuery.orderType" class="input-width" placeholder="全部" clearable>
@ -79,10 +79,13 @@
</el-select>
</el-form-item> -->
<el-form-item label="提交时间：">
<el-date-picker class="input-width" v-model="listQuery.createTime" value-format="yyyy-MM-dd"
type="date" placeholder="请选择时间"></el-date-picker>
<el-form-item label="提交日期：">
<el-date-picker class="input-width" v-model="listQuery.createTimeStart" value-format="yyyy-MM-dd"
type="date" placeholder="请选择日期"></el-date-picker> -
<el-date-picker class="input-width" v-model="listQuery.createTimeEnd" value-format="yyyy-MM-dd"
type="date" placeholder="请选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="收货信息 ：">
<el-input v-model="listQuery.receiverPhone" class="input-width" placeholder="收货人电话">
</el-input>
@ -236,12 +239,11 @@
const defaultListQuery = {
pageNum: 1,
pageSize: 10,
status: 0,
orderSn: null,
receiverKeyword: null,
status: null,
orderType: null,
sourceType: null,
createTime: null
receiverPhone: null,
createTimeStart: null,
createTimeEnd: null
};
export default {
@ -602,6 +604,14 @@
this.listLoading = true;
if (this.listQuery.status == 0)
this.listQuery.status = null
if (this.listQuery.orderSn == "")
this.listQuery.orderSn = null
if (this.listQuery.receiverPhone == "")
this.listQuery.receiverPhone = null
console.log("listQuery", this.listQuery)
fetchList(this.listQuery).then(response => {
this.listLoading = false;
@ -637,9 +647,9 @@
});
},
covertOrder(order) {
let address = order.receiverRegion + order
let address = order.receiverRegion + order
.receiverDetailAddress;
let listItem = {
orderId: order.id,
orderSn: order.orderSn,

Write Preview
Loading…
Cancel
Save