From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/components/business/QRcode.vue | 4 +---
admin/src/views/business/sitesBike.vue | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 6 ++++--
admin/.env.production | 2 --
admin/src/components/business/OperaReturnReasonWindow.vue | 7 +++----
5 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/admin/.env.production b/admin/.env.production
index 5599cdf..df32af4 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -9,5 +9,3 @@
# VUE_APP_API_BASE_URL = 'https://skinai.beikepai.com/admin_interface'
# https://dmtest.ahapp.net/meeting_admin_interface/doc.html
-
-
diff --git a/admin/src/components/business/OperaReturnReasonWindow.vue b/admin/src/components/business/OperaReturnReasonWindow.vue
index 8da69bf..04b1a93 100644
--- a/admin/src/components/business/OperaReturnReasonWindow.vue
+++ b/admin/src/components/business/OperaReturnReasonWindow.vue
@@ -7,9 +7,8 @@
width="600px"
>
<el-form :model="form" ref="form" :rules="rules" label-width="120px">
-
- <el-form-item label="鏃堕暱鍑忓厤鍘熷洜" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ椂闀垮噺鍏嶅師鍥�" v-trim/>
+ <el-form-item label="寮哄埗杩樿溅鍘熷洜" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ己鍒惰繕杞﹀師鍥�" v-trim/>
</el-form-item>
<el-form-item label="澶囨敞鏄惁蹇呭～" prop="required">
<el-radio-group v-model="form.required">
@@ -39,7 +38,7 @@
name: '',
sortnum: '',
type: '',
-
+
status: '',
info: '',
required: 0
diff --git a/admin/src/components/business/QRcode.vue b/admin/src/components/business/QRcode.vue
index 88a5e44..2d84331 100644
--- a/admin/src/components/business/QRcode.vue
+++ b/admin/src/components/business/QRcode.vue
@@ -10,9 +10,7 @@
<div class="box_item" v-for="(item, index) in list" :key="index">
<div class="box_item_title">寰俊</div>
<div class="box_item_qr">
-<!-- <img src="../../assets/images/login_img.png" />-->
-<!-- <span>2341111/34</span>-->
- <img :src="item.info" />
+ <img :src="item.imgfullurl" />
<span>{{item.siteId}}/{{item.code}}</span>
</div>
<div class="box_item_footer">鎵爜鍙栬溅</div>
diff --git a/admin/src/views/business/sitesBike.vue b/admin/src/views/business/sitesBike.vue
index e3db7a0..35c8381 100644
--- a/admin/src/views/business/sitesBike.vue
+++ b/admin/src/views/business/sitesBike.vue
@@ -27,7 +27,7 @@
<el-table-column prop="bikeCount" label="鍦ㄦ灦杞︽暟閲�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="rate" label="婊℃灦鐜�" min-width="100px" align="center">
<template slot-scope="{row}">
- <span>{{ row.rate * 100 }}%</span>
+ <span>{{ (row.rate * 100).toFixed(0) }}%</span>
</template>
</el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庨�氳鏃堕棿" min-width="100px" align="center"></el-table-column>
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 22043e0..f31398b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -241,6 +241,7 @@
List<GoodsorderExportVO> goodsorderList = null;
if(Constants.formatIntegerNum(model.getType())==Constants.ZERO){
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
+ queryWrapper.orderByAsc(Goodsorder::getPayDate);
goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
}else{
@@ -264,7 +265,7 @@
queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
}
queryWrapper.eq(Refund::getStatus,Constants.TWO);//閫�娆惧畬鎴�
- queryWrapper.orderByAsc(Refund::getDoneDate);
+ queryWrapper.orderByAsc(Refund::getDoneDate);;
goodsorderList = refundJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
}
if (!CollectionUtils.isEmpty(goodsorderList)){
@@ -300,7 +301,7 @@
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
- queryWrapper.orderByDesc(Goodsorder::getPayDate);
+
return queryWrapper;
}
@@ -309,6 +310,7 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ queryWrapper.orderByDesc(Goodsorder::getPayDate);
queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
--
Gitblit v1.9.3