Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

Merge remote-tracking branch 'origin/dev' into dev

 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



 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

 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>

 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>

 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());