# 导出字段调整 登陆提示

jiaosong

2023-11-06 3726375e0ae995404a76838f18bd5f40081a4412

# 导出字段调整 登陆提示

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

@@ -29,7 +29,7 @@
    private String pid;

    @ApiModelProperty(value = "交易时间")
    @ExcelColumn(name="交易时间",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="支付时间",index = 4,width = 10,align = HorizontalAlignment.CENTER, dateFormat = "yyyy-MM-dd HH:mm:ss")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date billDate;

@@ -46,15 +46,15 @@
    private String deviceInfo;

    @ApiModelProperty(value = "微信交易号")
    @ExcelColumn(name="微信交易号",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="微信交易号",index = 3, width = 10,align = HorizontalAlignment.CENTER)
    private String transactionId;

    @ApiModelProperty(value = "商户订单号")
    @ExcelColumn(name="订单编号",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="订单编号", index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String outTradeNo;

    @ApiModelProperty(value = "用户标识")
    @ExcelColumn(name="用户",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;

    @ApiModelProperty(value = "交易类型")
@@ -70,7 +70,7 @@
    private String feeType;

    @ApiModelProperty(value = "应结订单金额", example = "1")
    @ExcelColumn(name="交易金额",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="支付金额",index = 5, width = 10,align = HorizontalAlignment.CENTER)
    private BigDecimal settlementTotalFee;

    @ApiModelProperty(value = "代金券金额", example = "1")
@@ -83,6 +83,7 @@
    private String outRefundNo;

    @ApiModelProperty(value = "退款金额", example = "1")
    @ExcelColumn(name="退款金额",index = 6, width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private BigDecimal refundFee;

    @ApiModelProperty(value = "充值券退款金额", example = "1")
@@ -95,6 +96,7 @@
    private Date refundApplyDate;

    @ApiModelProperty(value = "退款成功时间")
    @ExcelColumn(name="退款时间",index = 6, width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date refundSuccessDate;

    @ApiModelProperty(value = "退款状态")

 server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java

@@ -23,26 +23,26 @@
public class GoodsorderExportVO {

    @ApiModelProperty(value = "编码")
    @ExcelColumn(name="订单编号",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="订单编号",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String id;
    @ApiModelProperty(value = "订单编码")
//    @ExcelColumn(name="订单编码")
    private String code;
    @ApiModelProperty(value = "用户编码（关联member表）")
    @ExcelColumn(name="用户",width = 10,index = 2,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="用户",width = 10,index = 1,align = HorizontalAlignment.CENTER)
    private String openid;

    @ApiModelProperty(value = "交易金额")
    @ExcelColumn(name="支付金额",width = 10,index = 3,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="支付金额",width = 10,index = 4,align = HorizontalAlignment.CENTER)
    private BigDecimal money;


    @ApiModelProperty(value = "支付时间")
    @ExcelColumn(name="支付时间",width = 10,index = 4,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="支付时间",width = 10,index = 3,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date payDate;

    @ApiModelProperty(value = "结算金额(分）")
    @ExcelColumn(name="结算金额",width = 10,index = 5,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="结算金额",width = 10,index = 7,align = HorizontalAlignment.CENTER)
    private BigDecimal closeMoney;

    @ApiModelProperty(value = "结算时间")
@@ -50,11 +50,11 @@
    private Date closeDate;

    @ApiModelProperty(value = "退款金额(分）")
    @ExcelColumn(name="退款金额",width = 10,index = 7,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="退款金额",width = 10,index = 6,align = HorizontalAlignment.CENTER)
    private BigDecimal refundMoney;

    @ApiModelProperty(value = "退款时间")
    @ExcelColumn(name="退款时间",width = 10,index = 8,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="退款时间",width = 10,index = 5,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date refundDate;

}

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

@@ -2,6 +2,7 @@

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -12,10 +13,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;

@@ -35,8 +38,11 @@

    @Override
    public String create(Ad ad) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        ad.setIsdeleted(Constants.ZERO);
        ad.setStatus(Constants.ZERO);
        ad.setCreateDate(new Date());
        ad.setCreator(loginUserInfo.getId());
        adMapper.insert(ad);
        return ad.getId();
    }
@@ -62,10 +68,12 @@

    @Override
    public void updateById(Ad ad) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        UpdateWrapper<Ad> wrapper = new UpdateWrapper<>();
        wrapper.lambda()
                .eq(Ad::getId,ad.getId())
                .set(Ad::getEditor,ad.getEditor())
                .set(Ad::getEditor,loginUserInfo.getId())
                .set(Ad::getEditDate,ad.getEditDate())
                .set(Objects.nonNull(ad.getName()),Ad::getName,ad.getName())
                .set(Objects.nonNull(ad.getImgurl()),Ad::getImgurl,ad.getImgurl())

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

@@ -120,8 +120,8 @@
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getType,Constants.ONE)
                .eq(Member::getCardNo,member.getCardNo());
        Integer integer = memberMapper.selectCount(wrapper);
        if (integer > 0){
        Member member1 = memberMapper.selectOne(wrapper);
        if (Objects.nonNull(member1) && member1.getId().equals(member.getId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"卡号存在重复");
        }
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

 server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -123,7 +123,7 @@
            if (e.getCause() instanceof BusinessException) {
                throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), e.getCause().getMessage());
            }
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "提示对不起，账号或密码错误！");
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "对不起，账号或密码错误！");
        }
    }