Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike int...

jiangping

2023-10-08 35b0b9d26bac17adbc22c419c5d95357611d359d

Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev

 server/services/db/business.base_param.permissions.sql

@@ -1,6 +1,6 @@
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:create', '新建系统基础配置表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:delete', '删除系统基础配置表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:update', '修改系统基础配置表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:query', '查询系统基础配置表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:exportExcel', '导出系统基础配置表(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:create', '新建系统基础配置表', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:delete', '删除系统基础配置表', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:update', '修改系统基础配置表', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:query', '查询系统基础配置表', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:exportExcel', '导出系统基础配置表(Excel)', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -99,6 +99,7 @@
  public static final Integer ZERO = 0 ;
  public static final Integer ONE = 1 ;
    public static final Integer TWO = 2 ;
    public static final Integer THREE = 3 ;

  public static int formatIntegerNum(Integer num){
   if(num == null){

 server/services/src/main/java/com/doumee/dao/business/join/MemberRidesJoinMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.MemberRides;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;

/**
 * @author T14
 */
@Repository
public interface MemberRidesJoinMapper extends MPJJoinMapper<MemberRides> {
}

 server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -46,6 +47,7 @@

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    @TableLogic
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
@@ -87,7 +89,7 @@

    @ApiModelProperty(value = "支付方式 0微信 1支付宝")
    @ExcelColumn(name="支付方式 0微信 1支付宝")
    private String payWay;
    private Integer payWay;

    @ApiModelProperty(value = "支付时间")
    @ExcelColumn(name="支付时间")

 server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java

@@ -1,11 +1,9 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.*;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -45,6 +43,7 @@

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    @TableLogic
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
@@ -54,6 +53,12 @@
    @ApiModelProperty(value = "用户编码")
    @ExcelColumn(name="用户编码")
    private String memberId;

    @ApiModelProperty(value = "用户OpenId")
    @ExcelColumn(name="用户OpenId")
    @TableField(exist = false)
    private String memberOpenid;


    @ApiModelProperty(value = "车辆编码")
    @ExcelColumn(name="车辆编码")
@@ -67,6 +72,11 @@
    @ExcelColumn(name="车辆类型编码")
    private String paramId;

    @ApiModelProperty(value = "车辆类型名称")
    @ExcelColumn(name="车辆类型名称")
    @TableField(exist = false)
    private String paramName;

    @ApiModelProperty(value = "租车站点编码")
    @ExcelColumn(name="租车站点编码")
    private String rentSiteId;

 server/services/src/main/java/com/doumee/dao/business/model/Refund.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableLogic;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -45,6 +46,7 @@

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    @TableLogic
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")

 server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.doumee.dao.business.web.response;

import com.doumee.dao.business.model.MemberRides;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author T14
 */
@Data
@ApiModel("订单详情")
public class GoodsorderDetailDTO {

    @ApiModelProperty(value = "支付明细")
    private List<PayOrderDTO> payOrderDTOList;

    @ApiModelProperty(value = "骑行记录")
    private List<MemberRides> memberRidesList;

}

 server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.doumee.dao.business.web.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @author T14
 */
@Data
@ApiModel("交易明细")
public class PayOrderDTO {

    private String orderCode;

    private Integer payType;

    private Integer refundType;

    private BigDecimal money;

    private Date payDate;

}

 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -5,6 +5,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;

import java.util.List;

@@ -98,4 +99,20 @@
     * @return long
     */
    long count(Goodsorder goodsorder);


    /**
     * æŸ¥è¯¢è®¢å•è¯¦æƒ…
     * @param id
     * @return
     */
    GoodsorderDetailDTO getGoodsorderDetailDTO(String id);


    /**
     * å¼ºåˆ¶ç»“算订单
     * @param id
     * @return
     */
    Goodsorder closerGoodsorder(String id);
}

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.Constants;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
@@ -11,12 +12,18 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.GoodsorderMapper;
import com.doumee.dao.business.MemberRidesMapper;
import com.doumee.dao.business.MemberRidesMapper;
import com.doumee.dao.business.RefundMapper;
import com.doumee.dao.business.join.GoodsorderJoinMapper;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.dao.business.web.response.PayOrderDTO;
import com.doumee.service.business.GoodsorderService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
@@ -26,6 +33,8 @@
import org.springframework.util.CollectionUtils;

import java.math.BigDecimal;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

@@ -45,6 +54,15 @@

    @Autowired
    private MemberRidesMapper memberRidesMapper;




    @Autowired
    private RefundMapper refundMapper;

    @Autowired
    private MemberRidesJoinMapper memberRidesJoinMapper;

    @Override
    public String create(Goodsorder goodsorder) {
@@ -109,7 +127,6 @@
        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());


        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.like(Goodsorder::getCode, pageWrap.getModel().getCode());
        }
@@ -117,7 +134,6 @@
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.eq(Goodsorder::getStatus, pageWrap.getModel().getStatus());
        }


        if (pageWrap.getModel().getOnlineOrderid() != null) {
            queryWrapper.eq(Goodsorder::getOnlineOrderid, pageWrap.getModel().getOnlineOrderid());
@@ -133,7 +149,6 @@
                    .selectAs(Member::getName,Goodsorder::getMemberName)
                    .leftJoin(Member.class,Member::getId,Goodsorder::getMemberId)
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName,pageWrap.getModel().getMemberName());

        return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
    }

@@ -176,4 +191,50 @@




    @Override
    public GoodsorderDetailDTO getGoodsorderDetailDTO(String id) {

        List<PayOrderDTO> payOrderDTOList = new ArrayList<>();
        Goodsorder goodsorder = goodsorderMapper.selectById(id);
        QueryWrapper<Refund> refundQuery = new QueryWrapper<>();
        refundQuery.lambda()
                    .eq(Refund::getObjId,id);
        List<Refund> refunds = refundMapper.selectList(refundQuery);

        PayOrderDTO payOrderDTO = new PayOrderDTO();
        payOrderDTO.setOrderCode(goodsorder.getCode());
        payOrderDTO.setPayType(goodsorder.getPayWay());
        payOrderDTO.setMoney(goodsorder.getMoney());
        payOrderDTO.setPayDate(goodsorder.getPayDate());
        payOrderDTOList.add(0,payOrderDTO);
        if (!CollectionUtils.isEmpty(refunds)){
            refunds.forEach(s->{
                PayOrderDTO refundOrderDTO = new PayOrderDTO();
                refundOrderDTO.setOrderCode(s.getCode());
                refundOrderDTO.setPayType(s.getPayWay());
                refundOrderDTO.setMoney(s.getMoney());
                refundOrderDTO.setPayDate(s.getDoneDate());
                payOrderDTOList.add(refundOrderDTO);
            });
        }
        MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
        wrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .eq(BaseParam::getType, Constants.THREE);
        List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class, wrapper);
        GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO();
        goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);
        goodsorderDetailDTO.setMemberRidesList(memberRides);
        return goodsorderDetailDTO;
    }

    @Override
    public Goodsorder closerGoodsorder(String id) {

        Goodsorder goodsorder = goodsorderMapper.selectById(id);



        return null;
    }
}