提交修改
This commit is contained in:
quyixiao
parent
9d3a884103
commit
ced7ad96ef
@ -0,0 +1,55 @@
|
||||
package com.heyu.api.data.dao.vv;
|
||||
/**
|
||||
* <p>
|
||||
* 结算 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author quyixiao
|
||||
* @since 2025-11-10
|
||||
*/
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.heyu.api.data.entity.vv.VvMySettlementEntity;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.lz.mybatis.plugin.annotations.*;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface VvMySettlementDao extends BaseMapper<VvMySettlementEntity> {
|
||||
|
||||
|
||||
VvMySettlementEntity selectVvMySettlementById(@Param("id")Long id);
|
||||
|
||||
|
||||
Long insertVvMySettlement(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
Long insertOrUpdateVvMySettlement(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
int updateVvMySettlementById(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
int updateCoverVvMySettlementById(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
int deleteVvMySettlementById(@Param("id")Long id);
|
||||
|
||||
|
||||
List<VvMySettlementEntity> selectByCondition(IPage page,
|
||||
@IF String status,
|
||||
@IF @Column(VvMySettlementEntity.amount_) @GE BigDecimal minAmount,
|
||||
@IF @Column(VvMySettlementEntity.amount_) @LE BigDecimal maxAmount,
|
||||
@IF String userName,
|
||||
@IF @Column(VvMySettlementEntity.create_timestamp) @GE Long minCreateTimestamp,
|
||||
@IF @Column(VvMySettlementEntity.create_timestamp) @LE Long maxCreateTimestamp
|
||||
);
|
||||
|
||||
|
||||
@OrderBy(VvMySettlementEntity.id_)
|
||||
@LIMIT
|
||||
VvMySettlementEntity selectVvMySettlementOrderByIdDescLimit1();
|
||||
}
|
||||
@ -0,0 +1,258 @@
|
||||
package com.heyu.api.data.entity.vv;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.lz.mybatis.plugin.annotations.AS;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;import java.util.Date;
|
||||
/**
|
||||
*结算
|
||||
* @author quyixiao
|
||||
* @since 2025-11-10
|
||||
*/
|
||||
|
||||
@Data
|
||||
@TableName("vv_my_settlement")
|
||||
public class VvMySettlementEntity implements java.io.Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvMySettlementEntity:";
|
||||
|
||||
public final static String all = CLASS_NAME + "*";
|
||||
public final static String id_ = CLASS_NAME + "id"; //
|
||||
public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除
|
||||
public final static String create_time = CLASS_NAME + "create_time"; // 创建时间
|
||||
public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间
|
||||
public final static String user_name = CLASS_NAME + "user_name"; // 谁结算的
|
||||
public final static String operate_ = CLASS_NAME + "operate"; // 操作 + ,-
|
||||
public final static String amount_ = CLASS_NAME + "amount"; // 金额
|
||||
public final static String features_ = CLASS_NAME + "features"; // 特点
|
||||
public final static String status_ = CLASS_NAME + "status"; // apply_for_approval:同意审批，agree_approval: 同意审批 ,reject_approval：拒绝审批
|
||||
public final static String remain_amount = CLASS_NAME + "remain_amount"; // 剩下金额
|
||||
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间
|
||||
public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 修改时间
|
||||
//
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
//是否删除：0 否 1 删除
|
||||
private Integer isDelete;
|
||||
//创建时间
|
||||
private Date createTime;
|
||||
//修改时间
|
||||
private Date modifyTime;
|
||||
//谁结算的
|
||||
private String userName;
|
||||
//操作 + ,-
|
||||
private String operate;
|
||||
//金额
|
||||
private BigDecimal amount;
|
||||
//特点
|
||||
private String features;
|
||||
//apply_for_approval:同意审批，agree_approval: 同意审批 ,reject_approval：拒绝审批
|
||||
private String status;
|
||||
//剩下金额
|
||||
private BigDecimal remainAmount;
|
||||
//创建时间
|
||||
private Long createTimestamp;
|
||||
//修改时间
|
||||
private Long modifyTimestamp;
|
||||
/**
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
/**
|
||||
*
|
||||
* @param id
|
||||
*/
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否删除：0 否 1 删除
|
||||
* @return
|
||||
*/
|
||||
public Integer getIsDelete() {
|
||||
return isDelete;
|
||||
}
|
||||
/**
|
||||
* 是否删除：0 否 1 删除
|
||||
* @param isDelete
|
||||
*/
|
||||
public void setIsDelete(Integer isDelete) {
|
||||
this.isDelete = isDelete;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
* @return
|
||||
*/
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
/**
|
||||
* 创建时间
|
||||
* @param createTime
|
||||
*/
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
* @return
|
||||
*/
|
||||
public Date getModifyTime() {
|
||||
return modifyTime;
|
||||
}
|
||||
/**
|
||||
* 修改时间
|
||||
* @param modifyTime
|
||||
*/
|
||||
public void setModifyTime(Date modifyTime) {
|
||||
this.modifyTime = modifyTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* 谁结算的
|
||||
* @return
|
||||
*/
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
/**
|
||||
* 谁结算的
|
||||
* @param userName
|
||||
*/
|
||||
public void setUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
/**
|
||||
* 操作 + ,-
|
||||
* @return
|
||||
*/
|
||||
public String getOperate() {
|
||||
return operate;
|
||||
}
|
||||
/**
|
||||
* 操作 + ,-
|
||||
* @param operate
|
||||
*/
|
||||
public void setOperate(String operate) {
|
||||
this.operate = operate;
|
||||
}
|
||||
|
||||
/**
|
||||
* 金额
|
||||
* @return
|
||||
*/
|
||||
public BigDecimal getAmount() {
|
||||
return amount;
|
||||
}
|
||||
/**
|
||||
* 金额
|
||||
* @param amount
|
||||
*/
|
||||
public void setAmount(BigDecimal amount) {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
/**
|
||||
* 特点
|
||||
* @return
|
||||
*/
|
||||
public String getFeatures() {
|
||||
return features;
|
||||
}
|
||||
/**
|
||||
* 特点
|
||||
* @param features
|
||||
*/
|
||||
public void setFeatures(String features) {
|
||||
this.features = features;
|
||||
}
|
||||
|
||||
/**
|
||||
* apply_for_approval:同意审批，agree_approval: 同意审批 ,reject_approval：拒绝审批
|
||||
* @return
|
||||
*/
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
/**
|
||||
* apply_for_approval:同意审批，agree_approval: 同意审批 ,reject_approval：拒绝审批
|
||||
* @param status
|
||||
*/
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
/**
|
||||
* 剩下金额
|
||||
* @return
|
||||
*/
|
||||
public BigDecimal getRemainAmount() {
|
||||
return remainAmount;
|
||||
}
|
||||
/**
|
||||
* 剩下金额
|
||||
* @param remainAmount
|
||||
*/
|
||||
public void setRemainAmount(BigDecimal remainAmount) {
|
||||
this.remainAmount = remainAmount;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
* @return
|
||||
*/
|
||||
public Long getCreateTimestamp() {
|
||||
return createTimestamp;
|
||||
}
|
||||
/**
|
||||
* 创建时间
|
||||
* @param createTimestamp
|
||||
*/
|
||||
public void setCreateTimestamp(Long createTimestamp) {
|
||||
this.createTimestamp = createTimestamp;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
* @return
|
||||
*/
|
||||
public Long getModifyTimestamp() {
|
||||
return modifyTimestamp;
|
||||
}
|
||||
/**
|
||||
* 修改时间
|
||||
* @param modifyTimestamp
|
||||
*/
|
||||
public void setModifyTimestamp(Long modifyTimestamp) {
|
||||
this.modifyTimestamp = modifyTimestamp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "VvMySettlementEntity{" +
|
||||
",id=" + id +
|
||||
",isDelete=" + isDelete +
|
||||
",createTime=" + createTime +
|
||||
",modifyTime=" + modifyTime +
|
||||
",userName=" + userName +
|
||||
",operate=" + operate +
|
||||
",amount=" + amount +
|
||||
",features=" + features +
|
||||
",status=" + status +
|
||||
",remainAmount=" + remainAmount +
|
||||
",createTimestamp=" + createTimestamp +
|
||||
",modifyTimestamp=" + modifyTimestamp +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package com.heyu.api.data.service.impl.vv;
|
||||
/**
|
||||
* <p>
|
||||
* 结算 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author quyixiao
|
||||
* @since 2025-11-10
|
||||
*/
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.heyu.api.data.dao.vv.VvMySettlementDao;
|
||||
import com.heyu.api.data.entity.vv.VvMySettlementEntity;
|
||||
import com.heyu.api.data.service.vv.VvMySettlementService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class VvMySettlementServiceImpl extends ServiceImpl<VvMySettlementDao, VvMySettlementEntity> implements VvMySettlementService {
|
||||
|
||||
|
||||
@Autowired
|
||||
private VvMySettlementDao vvMySettlementDao;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public VvMySettlementEntity selectVvMySettlementById(Long id){
|
||||
return vvMySettlementDao.selectVvMySettlementById(id);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public Long insertVvMySettlement(VvMySettlementEntity vvMySettlement){
|
||||
return vvMySettlementDao.insertVvMySettlement(vvMySettlement);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public Long insertOrUpdateVvMySettlement(VvMySettlementEntity vvMySettlement){
|
||||
return vvMySettlementDao.insertOrUpdateVvMySettlement(vvMySettlement);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public int updateVvMySettlementById(VvMySettlementEntity vvMySettlement){
|
||||
return vvMySettlementDao.updateVvMySettlementById(vvMySettlement);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public int updateCoverVvMySettlementById(VvMySettlementEntity vvMySettlement){
|
||||
return vvMySettlementDao.updateCoverVvMySettlementById(vvMySettlement);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public int deleteVvMySettlementById(Long id){
|
||||
return vvMySettlementDao.deleteVvMySettlementById(id);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.heyu.api.data.service.vv;
|
||||
/**
|
||||
* <p>
|
||||
* 结算 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author quyixiao
|
||||
* @since 2025-11-10
|
||||
*/
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.heyu.api.data.entity.vv.VvMySettlementEntity;
|
||||
public interface VvMySettlementService extends IService<VvMySettlementEntity> {
|
||||
|
||||
|
||||
|
||||
VvMySettlementEntity selectVvMySettlementById(Long id);
|
||||
|
||||
|
||||
Long insertVvMySettlement(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
Long insertOrUpdateVvMySettlement(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
int updateVvMySettlementById(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
int updateCoverVvMySettlementById(VvMySettlementEntity vvMySettlement);
|
||||
|
||||
|
||||
int deleteVvMySettlementById(Long id);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.heyu.api.data.dao.vv.VvMySettlementDao">
|
||||
|
||||
</mapper>
|
||||
|
||||
@ -94,7 +94,7 @@ public class MysqlMain_insert {
|
||||
|
||||
List<TablesBean> list = new ArrayList<TablesBean>();
|
||||
|
||||
list.add(new TablesBean("vv_scroll_config"));
|
||||
list.add(new TablesBean("vv_my_settlement"));
|
||||
|
||||
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ public class MysqlMain_update {
|
||||
}
|
||||
List<TablesBean> list = new ArrayList<TablesBean>();
|
||||
|
||||
list.add(new TablesBean("vv_reverse_order"));
|
||||
list.add(new TablesBean("vv_my_settlement"));
|
||||
|
||||
//list.add(new TablesBean("vv_trade_order"));
|
||||
|
||||
|
||||
@ -13,4 +13,9 @@ public class AdminBaseDTO {
|
||||
*
|
||||
*/
|
||||
private Long adminId;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
package com.heyu.api.alibaba.request.mm.order;
|
||||
|
||||
|
||||
import com.heyu.api.alibaba.request.mm.AdminBaseDTO;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class VVMySettlementRequest extends AdminBaseDTO {
|
||||
|
||||
//总价
|
||||
private BigDecimal minAmount;
|
||||
|
||||
//总价
|
||||
private BigDecimal maxAmount;
|
||||
|
||||
// 结算状态
|
||||
// 'apply_for_approval:同意审批，agree_approval: 同意审批 ,reject_approval：拒绝审批 '
|
||||
private String status;
|
||||
|
||||
//创建时间撮，最大
|
||||
private Long minCreateTimestamp;
|
||||
|
||||
//创建时间撮 最小
|
||||
private Long maxCreateTimestamp;
|
||||
/***
|
||||
* 用户名
|
||||
*/
|
||||
private String userName;
|
||||
|
||||
/***
|
||||
* page num
|
||||
*/
|
||||
private Integer pageNum = 1;
|
||||
|
||||
/***
|
||||
* page size
|
||||
*/
|
||||
private Integer pageSize = 10;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
package com.heyu.api.controller.mm;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.heyu.api.alibaba.request.mm.order.VVMySettlementRequest;
|
||||
import com.heyu.api.data.dao.vv.VvMySettlementDao;
|
||||
import com.heyu.api.data.entity.vv.VvMySettlementEntity;
|
||||
import com.heyu.api.data.utils.BigDecimalUtil;
|
||||
import com.heyu.api.data.utils.R;
|
||||
import com.heyu.api.utils.ISelect;
|
||||
import com.heyu.api.utils.PPageUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/mm/my/")
|
||||
public class AdminMySettlementController {
|
||||
|
||||
@Autowired
|
||||
private VvMySettlementDao vvMySettlementDao;
|
||||
|
||||
/***
|
||||
* 列表
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
public R list(@RequestBody VVMySettlementRequest vvMySettlementRequest) {
|
||||
PPageUtils pageUtils = PPageUtils.startPage(vvMySettlementRequest.getPageNum(), vvMySettlementRequest.getPageSize())
|
||||
.doSelect(new ISelect() {
|
||||
@Override
|
||||
public List doSelect(IPage page) {
|
||||
return vvMySettlementDao.selectByCondition(page,
|
||||
vvMySettlementRequest.getStatus(),
|
||||
vvMySettlementRequest.getMinAmount(),
|
||||
vvMySettlementRequest.getMaxAmount(),
|
||||
vvMySettlementRequest.getUserName(),
|
||||
vvMySettlementRequest.getMinCreateTimestamp(),
|
||||
vvMySettlementRequest.getMaxCreateTimestamp()
|
||||
);
|
||||
}
|
||||
});
|
||||
return R.ok().setData(pageUtils);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/***
|
||||
* 插入数据
|
||||
*/
|
||||
@RequestMapping("/insertOrUpdate")
|
||||
public R insertOrUpdate(@RequestBody VvMySettlementEntity vvMySettlementEntity) {
|
||||
VvMySettlementEntity vvMySettlement = vvMySettlementDao.selectVvMySettlementOrderByIdDescLimit1();
|
||||
|
||||
BigDecimal remainAmount = vvMySettlement.getRemainAmount();
|
||||
BigDecimal lastRemainAmount = BigDecimalUtil.subtract(remainAmount, vvMySettlement.getRemainAmount());
|
||||
|
||||
vvMySettlementEntity.setRemainAmount(lastRemainAmount);
|
||||
vvMySettlementDao.insertOrUpdateVvMySettlement(vvMySettlement);
|
||||
return R.ok().setData(vvMySettlementEntity);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user