dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/nny_1/oilSystem

Browse Source
This commit is contained in:
wangh 2024-01-25 10:25:02 +08:00
commit 0760093344
112 changed files with 537 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
fuintAdmin/src/views/order/order_Ordinary.vue
View File

@ -92,58 +92,47 @@
</el-form>
</template>
</el-table-column>
<el-table-column
prop="terminal"
label="终端"
width="100">
<el-table-column prop="terminal" label="终端" width="100">
<template slot-scope="scope">
<span>{{getType(terminalList,scope.row.terminal)}}</span>
</template>
</el-table-column>
<el-table-column
prop="orderNo"
label="订单号"
width="220">
</el-table-column>
<el-table-column
prop="amount"
label="订单金额">
</el-table-column>
<el-table-column
prop="payAmount"
label="实付金额">
</el-table-column>
<el-table-column label="订单金额组成">
<el-table-column
prop="oilOrderAmount"
label="油品金额">
<el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
<el-table-column label="订单信息" align="center">
<el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="120">
<template slot-scope="props">
<span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
</template>
</el-table-column>
<el-table-column
prop="goodsOrderAmount"
label="商品金额">
<el-table-column prop="orderAmount" label="订单金额" align="center" width="120"> </el-table-column>
<el-table-column prop="discountAmount" label="优惠金额" align="center" width="120"> </el-table-column>
</el-table-column>
<el-table-column label="付款信息" align="center">
<el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
<el-table-column prop="payUser" label="付款用户" align="center" > </el-table-column>
<el-table-column prop="payType" label="付款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{getType(payList,scope.row.payType)}}</span>
</template>
</el-table-column>
<el-table-column prop="orderStatus" label="付款状态" align="center" width="120">
<template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus === 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus === 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.orderStatus === 'refund'">已退款</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="invoicing" label="开票标识" align="center" > </el-table-column>
<el-table-column
prop="payUser"
label="付款用户">
</el-table-column>
<el-table-column
prop="status"
label="状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column label="交易时间" align="center" width="160" prop="payTime">
<template slot-scope="scope">
<span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button style="width: 60px" size="mini"-->
<!-- @click="getOrdersInfo(scope.row.id)"-->
@ -220,6 +209,9 @@ import {cashierOrder, listCashierOrder,orderStatisticsApi} from "@/api/order/cas
import {getDicts} from "@/api/order/data";
import {queryStaffs} from "@/api/order/staff";
import { exportExcelCashierApi } from "@/api/order/exportExcel";
import {listOilOrder} from "@/api/order/oilorder";
import {getOilNumberGun} from "@/api/oilConfig/oilGuns";
import {getOilNameList} from "@/api/order/oilnumgun";
export default {
name: "order_Cashier",
@ -260,6 +252,9 @@ import { exportExcelCashierApi } from "@/api/order/exportExcel";
theTotalAmountOfOil:'0',
theTotalAmountOfTheItem:'0',
},
oilNameList:[],
oilGunList:[],
payList:[],
}
},
created() {
@ -267,8 +262,58 @@ import { exportExcelCashierApi } from "@/api/order/exportExcel";
this.getOrderStatistics();
this.getTerList();
this.getOilNameGun();
this.getOilGunList();
},
methods: {
// 获取油号名称
getName(oilNameList,id){
let name = ""
let _this = this;
if(oilNameList!=null && oilNameList!=""){
oilNameList.forEach(item => {
if (item.id == id){
name = item.oilName;
_this.oilType = item.oilType;
}
})
}
return name;
},
// 获取油枪名称
getName1(oilNameList,id){
let name = ""
let _this = this;
if(oilNameList!=null && oilNameList!=""){
oilNameList.forEach(item => {
if (item.id == id){
name = item.gunName;
}
})
}
return name;
},
getOilNameGun(){
getOilNameList().then( response => {
this.oilNameList = response.data;
})
getDicts("payment_type").then( response => {
this.payList = response.data;
})
},
// 获取油枪信息
getOilGunList(){
getOilNumberGun().then(res => {
res.data.forEach(item => {
if (item.oilGunList.length>0){
item.oilGunList.forEach(i => {
i.oilName = item.oilName
this.oilGunList.push(i)
})
}
})
})
},
exportExcelApplet() {
exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
@ -341,7 +386,7 @@ import { exportExcelCashierApi } from "@/api/order/exportExcel";
this.queryParams.page = val
}
console.log("123123123",this.queryParams)
listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
listOilOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
this.list = response.data.records;
this.total = response.data.total;
})

1
fuintAdmin/src/views/staff/list.vue
View File

@ -157,6 +157,7 @@
:value="item.dutyId+''"
></el-option>
<el-option
v-if="form.roleId == 12"
label="油站站长"
:value="12+''"
></el-option>

54
fuintAdmin/src/views/staffCommission/staffCommission.vue
View File

@ -13,7 +13,7 @@
clearable
placeholder="全部"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id+''">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
@ -123,10 +123,10 @@
@sort-change="handleSortChange">
<el-table-column label="ID" prop="id" align="center" width="60"/>
<el-table-column label="方案名称" prop="name" align="center"/>
<el-table-column label="员工角色" prop="dutyName" align="center">
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.staff_role" :value="scope.row.staffRoleGroup"/>-->
<!-- </template>-->
<el-table-column label="员工角色" prop="staffRoleGroup" align="center">
<template slot-scope="scope">
<span>{{scope.row.staffRoleGroup ? getStaffDuty(roleList,scope.row.staffRoleGroup) : "--"}}</span>
</template>
</el-table-column>
<el-table-column label="提成来源" prop="commissionSource" align="center" />
<el-table-column label="满足条件" prop="meetCondition" align="center" width="260">
@ -213,13 +213,16 @@
<el-row>
<el-col :span="24">
<el-form-item label="角色组" prop="staffRoleGroup">
<el-select v-model="form.staffRoleGroup" placeholder="请选择所属角色">
<el-select v-model="staffRoleGroup"
placeholder="请选择所属角色"
@change="getCheckbox">
<el-option
v-for="item in roleList"
:key="item.dutyId+''"
v-for="(item,index) in roleList"
:key="index"
:label="item.dutyName"
:value="item.dutyId+''"
:value="item.dutyId"
></el-option>
<!-- :value="item.dutyId"-->
</el-select>
</el-form-item>
</el-col>
@ -301,7 +304,7 @@ import {listDuty} from "@/api/staff/duty";
import {queryStaffs} from "@/api/order/staff";
export default {
dicts: ['source','role','zhzt','comissionType','staff_role'],
dicts: ['source','role','zhzt','comissionType'],
data(){
return {
// 提成总额
@ -347,6 +350,7 @@ export default {
// 显示搜索条件
showSearch: true,
roleList:[],
staffRoleGroup:[],
// 表单校验
rules: {
name: [
@ -378,10 +382,24 @@ export default {
},
created() {
this.getList();
this.getDuty();
this.getStaffList();
this.getDuty();
},
methods:{
getStaffDuty(list,ids){
let id = ids.split(",")
let name = ""
let dutyName = ""
list.forEach(item => {
id.forEach(i => {
if (item.dutyId=i){
name = item.dutyName
}
dutyName += name +","
})
})
return name
},
getStaffList(){
queryStaffs().then( response => {
this.staffList = response.data;
@ -425,7 +443,9 @@ export default {
},
getCheckbox(){
this.form.commissionSource = this.commissionSource.toString()
console.log(this.staffRoleGroup)
// this.form.commissionSource = this.commissionSource.toString()
this.form.staffRoleGroup = this.staffRoleGroup.toString()
},
// 查询列表
getList() {
@ -453,6 +473,7 @@ export default {
// 表单重置
reset() {
this.resetForm("form");
this.staffRoleGroup = []
if (this.activeName == 'oil'){
this.form = {
type:'orderAmount',
@ -484,6 +505,9 @@ export default {
this.form.royaltyRate = this.form.royaltyRate.slice(0,this.form.royaltyRate.length-1)
this.open = true;
this.title = "编辑提成方案";
if (response.data.staffRoleGroup){
this.staffRoleGroup = response.data.staffRoleGroup.split(",");
}
});
},
@ -524,8 +548,9 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.royaltyRate = this.form.royaltyRate + this.select
this.form.staffRoleGroup = this.staffRoleGroup.toString()
if (this.form.id) {
this.form.royaltyRate = this.form.royaltyRate + this.select
updateCommission(this.form).then(response => {
if (response.data==1){
this.$modal.msgSuccess("提成方案更新成功");
@ -536,7 +561,6 @@ export default {
}
});
} else {
this.form.royaltyRate = this.form.royaltyRate + this.select
addCommission(this.form).then(response => {
if (response.data==1) {
this.$modal.msgSuccess("提成方案新增成功");
@ -573,7 +597,7 @@ export default {
<style lang="scss" scoped>
.app-container{
width: 100%;
height: 100vh;
height: 100%;
background: #f6f8f9;
}
.clearfix{

1
fuintAdmin/src/views/userGrade/index.vue
View File

@ -581,7 +581,6 @@ export default {
// 是否开启等级功能
getISEnableLevel(){
getChainStoreConfig().then(response => {
// console.log(response)
this.isEnableLevel = response.data.isEnableLevel;
this.clear = response.data.isMonthClear;
if (response.data.gasGrowthValue){

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtDamage.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.convenienceSore.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
@ -30,6 +31,7 @@ public class MtDamage extends BaseEntity {
/**
* 制单日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date orderDate;
/**
* 审核人

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventory.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.convenienceSore.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
@ -30,6 +31,7 @@ public class MtInventory extends BaseEntity {
/**
* 制单日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date orderDate;
/**
* 审核人

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtPurchase.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.convenienceSore.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
@ -30,6 +31,7 @@ public class MtPurchase extends BaseEntity {
/**
* 制单日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date orderDate;
/**
* 审核人

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtReturns.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.convenienceSore.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
@ -30,6 +31,7 @@ public class MtReturns extends BaseEntity {
/**
* 制单日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date orderDate;
/**
* 审核人

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/SaleStatisticVo.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.convenienceSore.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -46,5 +47,6 @@ public class SaleStatisticVo extends BaseEntity {
private Double profitTotal;
// 销售时间
@ExcelProperty(value = "销售时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
}

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/dto/ActiveConsumptionDTO.java
View File

@ -27,10 +27,10 @@ public class ActiveConsumptionDTO extends Model<ActiveConsumptionDTO> {
//满足金额
private String participationConditionMoney;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String[] adaptOil;
@ -83,12 +83,12 @@ public class ActiveConsumptionDTO extends Model<ActiveConsumptionDTO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public String getParticipationConditionMoney() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java
View File

@ -33,10 +33,10 @@ public class ActiveConsumption extends Model<ActiveConsumption> {
//满足金额
private Double participationConditionMoney;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String adaptOil;
@ -69,12 +69,12 @@ public class ActiveConsumption extends Model<ActiveConsumption> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumptionChild.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.activeConsumption.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@ -71,6 +72,7 @@ public class ActiveConsumptionChild {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
/**
* 更新者
@ -79,6 +81,7 @@ public class ActiveConsumptionChild {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public String getTimeType() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionVO.java
View File

@ -27,10 +27,10 @@ public class ActiveConsumptionVO extends Model<ActiveConsumptionVO> {
//满足金额
private String participationConditionMoney;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String[] adaptOils;
@ -84,12 +84,12 @@ public class ActiveConsumptionVO extends Model<ActiveConsumptionVO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public String getParticipationConditionMoney() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionVOS.java
View File

@ -24,10 +24,10 @@ public class ActiveConsumptionVOS implements Serializable {
//满足金额
private String participationConditionMoney;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String adaptOil;
@ -62,11 +62,11 @@ public class ActiveConsumptionVOS implements Serializable {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/dto/ActiveDiscountDTO.java
View File

@ -20,10 +20,10 @@ public class ActiveDiscountDTO implements Serializable{
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String[] adaptOil;
@ -54,12 +54,12 @@ public class ActiveDiscountDTO implements Serializable{
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public Integer getId() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/entity/ActiveDiscount.java
View File

@ -27,10 +27,10 @@ public class ActiveDiscount extends Model<ActiveDiscount> {
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String adaptOil;
@ -59,12 +59,12 @@ public class ActiveDiscount extends Model<ActiveDiscount> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/entity/ActiveDiscountChild.java
View File

@ -32,12 +32,12 @@ public class ActiveDiscountChild extends Model<com.fuint.business.marketingActiv
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/vo/ActiveDiscountVO.java
View File

@ -20,10 +20,10 @@ public class ActiveDiscountVO implements Serializable{
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String[] adaptOils;
@ -55,12 +55,12 @@ public class ActiveDiscountVO implements Serializable{
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public Integer getId() {

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/entity/ActiveDiscountRecords.java
View File

@ -5,6 +5,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
/**
@ -27,10 +29,12 @@ public class ActiveDiscountRecords extends Model<ActiveDiscountRecords> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/dto/ActiveExchangeRecordDTO.java
View File

@ -56,24 +56,24 @@ public class ActiveExchangeRecordDTO extends Model<ActiveExchangeRecordDTO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
//到期时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date outTime;
//核销时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date cancelTime;
//开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
public String getCardType() {

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/ActiveExchangeRecordVO.java
View File

@ -56,24 +56,24 @@ public class ActiveExchangeRecordVO extends Model<ActiveExchangeRecordVO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
//到期时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date outTime;
//核销时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date cancelTime;
//开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
public String getCardType() {

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/MaxoutVO.java
View File

@ -23,12 +23,12 @@ public class MaxoutVO implements Serializable {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public Integer getId() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/dto/ActiveFullminusDTO.java
View File

@ -20,10 +20,10 @@ public class ActiveFullminusDTO implements Serializable {
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String[] adaptOil;
@ -54,12 +54,12 @@ public class ActiveFullminusDTO implements Serializable {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public Integer getId() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/entity/ActiveFullminus.java
View File

@ -27,10 +27,10 @@ public class ActiveFullminus extends Model<ActiveFullminus> {
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String adaptOil;
@ -59,12 +59,12 @@ public class ActiveFullminus extends Model<ActiveFullminus> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/vo/ActiveFullminusVO.java
View File

@ -20,10 +20,10 @@ public class ActiveFullminusVO implements Serializable {
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String[] adaptOils;
@ -55,12 +55,12 @@ public class ActiveFullminusVO implements Serializable {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public Integer getId() {

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/entity/ActiveFullminusRecords.java
View File

@ -5,6 +5,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
/**
@ -27,10 +29,12 @@ public class ActiveFullminusRecords extends Model<ActiveFullminusRecords> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/vo/ActiveNewlywedsVO.java
View File

@ -20,10 +20,10 @@ public class ActiveNewlywedsVO {
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分
private String[] courtesyReward;
@ -46,11 +46,11 @@ public class ActiveNewlywedsVO {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/dto/ActiveNewlywedsDTO.java
View File

@ -20,10 +20,10 @@ public class ActiveNewlywedsDTO implements Serializable {
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分
private String[] courtesyReward;
@ -46,12 +46,12 @@ public class ActiveNewlywedsDTO implements Serializable {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public String getActiveCode() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlyweds.java
View File

@ -27,10 +27,10 @@ public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
//活动名称
private String name;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date activeEndTime;
//有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分
private String courtesyReward;
@ -51,12 +51,12 @@ public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public String getActiveCode() {

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlywedsChild.java
View File

@ -51,12 +51,12 @@ public class ActiveNewlywedsChild extends Model<ActiveNewlywedsChild> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlywedsRecords.java
View File

@ -33,12 +33,12 @@ public class ActiveNewlywedsRecords extends Model<ActiveNewlywedsRecords> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/dto/ActiveRecommendDTO.java
View File

@ -51,12 +51,12 @@ public class ActiveRecommendDTO extends Model<ActiveRecommendDTO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public String[] getInviterGiftType() {

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/entity/ActiveRecommend.java
View File

@ -53,12 +53,12 @@ public class ActiveRecommend extends Model<ActiveRecommend> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/entity/ActiveRecommendChild.java
View File

@ -53,12 +53,12 @@ public class ActiveRecommendChild extends Model<ActiveRecommendChild> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/entity/ActiveRecommendRecords.java
View File

@ -44,7 +44,7 @@ public class ActiveRecommendRecords extends Model<ActiveRecommendRecords> {
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/vo/ActiveRecommendVO.java
View File

@ -53,12 +53,12 @@ public class ActiveRecommendVO extends Model<ActiveRecommendVO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchange.java
View File

@ -45,17 +45,17 @@ public class CardExchange extends Model<CardExchange> {
//参与次数
private Integer count;
//过期时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date outTime;
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchangeRecord.java
View File

@ -57,24 +57,24 @@ public class CardExchangeRecord extends Model<CardExchangeRecord> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
//到期时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date outTime;
//核销时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date cancelTime;
//开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableDTO.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardFavorable.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.Date;
@ -52,12 +53,14 @@ public class CardFavorableDTO extends Model<CardFavorableDTO> {
//有效期2
private Integer validityTwo;
//固定有效期开始日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveDate;
//领券后第几天生效
private String validityDay;
//生效时间类型 0：领取时间 1：指定时间
private String effectiveDateType;
//生效时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveDateStart;
//可用时段
private String[] availablePeriod;
@ -66,6 +69,7 @@ public class CardFavorableDTO extends Model<CardFavorableDTO> {
//可用日期
private String[] checkTime;
//排除日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date checkOutTime;
//互斥功能 0：满减活动 1：储值卡付款
private String exclusiveFunction;
@ -80,10 +84,12 @@ public class CardFavorableDTO extends Model<CardFavorableDTO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public String[] getOilType() {

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java
View File

@ -54,14 +54,14 @@ public class CardFavorable extends Model<CardFavorable> {
//有效期2
private Integer validityTwo;
//固定有效期开始日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveDate;
//领券后第几天生效
private String validityDay;
//生效时间类型 0：领取时间 1：指定时间
private String effectiveDateType;
//生效时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveDateStart;
//可用时段
private String availablePeriod;
@ -70,7 +70,7 @@ public class CardFavorable extends Model<CardFavorable> {
//可用日期
private String checkTime;
//排除日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date checkOutTime;
//互斥功能 0：满减活动 1：储值卡付款
private String exclusiveFunction;
@ -85,12 +85,12 @@ public class CardFavorable extends Model<CardFavorable> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorableRecord.java
View File

@ -39,21 +39,22 @@ public class CardFavorableRecord extends Model<CardFavorableRecord> {
//券状态 0：未使用 1：已使用
private String status;
//有效期开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//有效期结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
//描述信息
private String exchangeFrom;
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableService.java
View File

@ -58,7 +58,7 @@ public interface CardFavorableService extends IService<CardFavorable> {
/**
* 查询优惠券接口(小程序)
* @param page
* @param cardFavorable
* @param cardFavorableDTOS
* @return
*/
IPage selectAllByCondition(Page page, CardFavorableDTOS cardFavorableDTOS);

29
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
View File

@ -35,6 +35,9 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -155,17 +158,27 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
if (ObjectUtils.isNotEmpty(cardFavorable) && ObjectUtils.isNotEmpty(cardFavorable.getTimeType())){
if (cardFavorable.getTimeType().equals("0")){
cardFavorableRecord.setStartTime(new Date());
long endTimeL = new Date().getTime() + cardFavorable.getValidityZero() * 86400000;
cardFavorableRecord.setEndTime(new Date(endTimeL));
LocalDate today = LocalDate.now();
LocalDate localDate = today.plusDays(cardFavorable.getValidityZero());
Date from = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
cardFavorableRecord.setEndTime(from);
}else if (cardFavorable.getTimeType().equals("1")){
cardFavorableRecord.setStartTime(cardFavorable.getEffectiveDate());
long endTimeM = cardFavorable.getEffectiveDate().getTime() + cardFavorable.getValidityOne() * 86400000;
cardFavorableRecord.setEndTime(new Date(endTimeM));
LocalDate today = LocalDate.now();
LocalDate localDate = today.plusDays(cardFavorable.getValidityOne());
Date from = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
cardFavorableRecord.setEndTime(from);
}else {
long startTimeN = new Date().getTime() + Integer.parseInt(cardFavorable.getValidityDay()) * 86400000L;
long endTimeN = startTimeN + cardFavorable.getValidityTwo() * 86400000L;
cardFavorableRecord.setStartTime(new Date(startTimeN));
cardFavorableRecord.setEndTime(new Date(endTimeN));
LocalDate today = LocalDate.now();
LocalDate localDate = today.plusDays(cardFavorable.getValidityTwo());
LocalDate localDates = today.plusDays(Integer.parseInt(cardFavorable.getValidityDay()));
Date from = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
Date froms = Date.from(localDates.atStartOfDay(ZoneId.systemDefault()).toInstant());
cardFavorableRecord.setStartTime(froms);
cardFavorableRecord.setEndTime(from);
}
cardFavorableRecord.setCardFavorableId(id);
cardFavorableRecord.setStoreId(cardFavorable.getStoreId());

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
View File

@ -222,7 +222,15 @@ public class CardFavorableServiceImpl extends ServiceImpl<CardFavorableMapper, C
List<CouponVO> records = couponVOS.getRecords();
//有效期
List<CouponVO> collect = records.stream().filter(s -> s.getEndTime().getTime() > System.currentTimeMillis()).collect(Collectors.toList());
couponVOS.setRecords(collect);
if (ObjectUtils.isNotEmpty(collect)){
for (CouponVO couponVO : collect) {
CardFavorableRecord cardFavorableRecord = new CardFavorableRecord();
cardFavorableRecord.setId(couponVO.getCardRecordId());
cardFavorableRecord.setStatus("2");
cardFavorableRecordMapper.updateById(cardFavorableRecord);
}
}
//couponVOS.setRecords(collect);
return couponVOS;
}
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableVO.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardFavorable.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
@ -54,12 +55,14 @@ public class CardFavorableVO extends Model<CardFavorableVO> {
//有效期2
private Integer validityTwo;
//固定有效期开始日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveDate;
//领券后第几天生效
private String validityDay;
//生效时间类型 0：领取时间 1：指定时间
private String effectiveDateType;
//生效时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date effectiveDateStart;
//可用时段
private String[] availablePeriod;
@ -68,6 +71,7 @@ public class CardFavorableVO extends Model<CardFavorableVO> {
//可用日期
private String[] checkTime;
//排除日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date checkOutTime;
//互斥功能 0：满减活动 1：储值卡付款
private String exclusiveFunction;
@ -82,10 +86,12 @@ public class CardFavorableVO extends Model<CardFavorableVO> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CouponVO.java
View File

@ -27,9 +27,9 @@ public class CouponVO implements Serializable {
//券有效期
private String couponTime;
//券开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//券结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java
View File

@ -1,6 +1,8 @@
package com.fuint.business.marketingActivity.cardFule.entity;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.repository.model.base.BaseEntity;
import lombok.Data;
@ -52,6 +54,7 @@ public class CardFuelChange extends BaseEntity {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
/**
* 更新人

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelDiesel.java
View File

@ -43,10 +43,10 @@ public class CardFuelDiesel extends Model<CardFuelDiesel> {
//活动时间 1:不限时间 2：自定义时间
private String activeTime;
//活动开始时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//活动结束时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
//活动进度
private String activityProgress;
@ -55,12 +55,12 @@ public class CardFuelDiesel extends Model<CardFuelDiesel> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelGasoline.java
View File

@ -6,6 +6,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
/**
@ -38,8 +40,10 @@ public class CardFuelGasoline extends Model<CardFuelGasoline> {
//活动时间 1:不限时间 2：自定义时间
private String activeTime;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
//活动进度
private String activityProgress;
@ -48,10 +52,12 @@ public class CardFuelGasoline extends Model<CardFuelGasoline> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java
View File

@ -1,6 +1,8 @@
package com.fuint.business.marketingActivity.cardFule.entity;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.repository.model.base.BaseEntity;
import lombok.Data;
@ -98,6 +100,7 @@ public class CardFuelRecord extends BaseEntity {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
/**
* 更新者
@ -106,6 +109,7 @@ public class CardFuelRecord extends BaseEntity {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
/**
* 支付状态

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/entity/CardFuleOrders.java
View File

@ -50,7 +50,7 @@ public class CardFuleOrders extends Model<CardFuleOrders> {
//订单状态
private String status;
//支付时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
//会员id
private Integer mtUserId;
@ -73,12 +73,12 @@ public class CardFuleOrders extends Model<CardFuleOrders> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/entity/CardGift.java
View File

@ -48,12 +48,12 @@ public class CardGift extends Model<CardGift> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueDTO.java
View File

@ -53,10 +53,10 @@ public class CardValueDTO extends Model<CardValue> {
//活动进度
private String activityProgress;
//活动开始时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//活动结束时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
//活动状态 1：启用 2：禁用
private String activeStatus;
@ -73,12 +73,12 @@ public class CardValueDTO extends Model<CardValue> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
public List<CardValueChild> getCardValueChildList() {

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValue.java
View File

@ -59,10 +59,10 @@ public class CardValue extends Model<CardValue> {
//活动进度
private String activityProgress;
//活动开始时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//活动结束时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
//活动状态 1：启用 2：禁用
private String activeStatus;
@ -77,12 +77,12 @@ public class CardValue extends Model<CardValue> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueChild.java
View File

@ -50,12 +50,12 @@ public class CardValueChild extends Model<CardValueChild> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
View File

@ -61,12 +61,12 @@ public class CardValueRecord extends Model<CardValueRecord> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
// 支付状态
private String payStatus;

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -73,6 +73,8 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.TimeUnit;
@ -839,18 +841,24 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
//优惠券开始结束时间
if (ObjectUtils.isNotEmpty(cardValueVoucher) && ObjectUtils.isNotEmpty(cardValueVoucher.getTimeType())) {
if (cardValueVoucher.getTimeType().equals("0")) {
cardFavorableRecord.setStartTime(new Date());
long endTimeL = new Date().getTime() + cardValueVoucher.getValidityZero() * 86400000;
cardFavorableRecord.setEndTime(new Date(endTimeL));
LocalDate today = LocalDate.now();
LocalDate localDate = today.plusDays(cardValueVoucher.getValidityZero());
Date from = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
cardFavorableRecord.setEndTime(from);
} else if (cardValueVoucher.getTimeType().equals("1")) {
cardFavorableRecord.setStartTime(cardValueVoucher.getEffectiveDate());
long endTimeM = cardValueVoucher.getEffectiveDate().getTime() + cardValueVoucher.getValidityOne() * 86400000;
cardFavorableRecord.setEndTime(new Date(endTimeM));
LocalDate today = LocalDate.now();
LocalDate localDate = today.plusDays(cardValueVoucher.getValidityOne());
Date from = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
cardFavorableRecord.setEndTime(from);
} else {
long startTimeN = new Date().getTime() + Integer.parseInt(cardValueVoucher.getValidityDay()) * 86400000L;
long endTimeN = startTimeN + cardValueVoucher.getValidityTwo() * 86400000L;
cardFavorableRecord.setStartTime(new Date(startTimeN));
cardFavorableRecord.setEndTime(new Date(endTimeN));
LocalDate today = LocalDate.now();
LocalDate localDate = today.plusDays(cardValueVoucher.getValidityTwo());
LocalDate localDates = today.plusDays(Integer.parseInt(cardValueVoucher.getValidityDay()));
Date from = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
Date froms = Date.from(localDates.atStartOfDay(ZoneId.systemDefault()).toInstant());
cardFavorableRecord.setStartTime(froms);
cardFavorableRecord.setEndTime(from);
}
}
cardFavorableRecordService.save(cardFavorableRecord);

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueVO.java
View File

@ -53,10 +53,10 @@ public class CardValueVO extends Model<CardValue> {
//活动进度
private String activityProgress;
//活动开始时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
//活动结束时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
//活动状态 1：启用 2：禁用
private String activeStatus;
@ -73,11 +73,11 @@ public class CardValueVO extends Model<CardValue> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/entity/CardValudChildrens.java
View File

@ -33,12 +33,12 @@ public class CardValudChildrens extends Model<CardValudChildrens> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java
View File

@ -41,7 +41,7 @@ public class CardValueOrders extends Model<CardValueOrders> {
//订单状态
private String status;
//支付时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
//会员id
private Integer mtUserId;
@ -88,12 +88,12 @@ public class CardValueOrders extends Model<CardValueOrders> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/oilDepotConfiguration/entity/OilDepotConfig.java
View File

@ -3,6 +3,8 @@ package com.fuint.business.oilDepotConfiguration.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.Date;
@ -28,10 +30,12 @@ public class OilDepotConfig extends Model<OilDepotConfig> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/dto/OilPurchaseDTO.java
View File

@ -9,9 +9,9 @@ import java.util.Date;
@Data
public class OilPurchaseDTO extends OilPurchaseVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date beginTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
private Integer supplierId;

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilInventory.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.petrolStationManagement.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.repository.model.base.BaseEntity;
import lombok.Data;
@ -29,6 +30,7 @@ public class OilInventory extends BaseEntity {
/**
* 盘点时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date inventoryTime;
/**
* 盘点升数
@ -53,6 +55,7 @@ public class OilInventory extends BaseEntity {
/**
* 制单时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date orderTime;
/**
* 状态

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilInventoryOrder.java
View File

@ -63,7 +63,7 @@ public class OilInventoryOrder extends BaseEntity {
/**
* 制单时间
*/
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
// private Data inventoryTime;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilPurchase.java
View File

@ -62,7 +62,7 @@ public class OilPurchase extends BaseEntity {
/**
* 制单时间
*/
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createdAt;
/**
* 状态

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/vo/OilInventoryOrderVO.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.petrolStationManagement.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.business.petrolStationManagement.entity.OilInventoryOrder;
import lombok.Data;
@ -17,5 +18,6 @@ public class OilInventoryOrderVO extends OilInventoryOrder {
/**
* 盘点时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date inventoryTime;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/vo/OilTankExcel.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.petrolStationManagement.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@ -54,6 +55,7 @@ public class OilTankExcel {
* 更新时间
*/
@ExcelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/Feedback.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.userManager.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -47,6 +48,7 @@ public class Feedback extends BaseEntity implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
/**
* 创建人
@ -55,6 +57,7 @@ public class Feedback extends BaseEntity implements Serializable {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
/**
* 更新人

2
fuintBackend/fuint-quartz/src/main/java/com/fuint/quartz/domain/SysJob.java
View File

@ -104,7 +104,7 @@ public class SysJob extends BaseEntity
this.cronExpression = cronExpression;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
public Date getNextValidTime()
{
if (StringUtils.isNotEmpty(cronExpression))

3
fuintBackend/fuint-quartz/src/main/java/com/fuint/quartz/domain/SysJobLog.java
View File

@ -2,6 +2,7 @@ package com.fuint.quartz.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -42,9 +43,11 @@ public class SysJobLog extends BaseEntity
private String exceptionInfo;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date startTime;
/** 停止时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date stopTime;
public Long getJobLogId()

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtAddress.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -53,9 +55,11 @@ public class MtAddress implements Serializable {
private String isDefault;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtArticle.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -53,9 +55,11 @@ public class MtArticle implements Serializable {
private Long click;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtBalance.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -48,9 +50,11 @@ public class MtBalance implements Serializable {
private BigDecimal amount;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("备注说明")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtBanner.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -47,9 +49,11 @@ public class MtBanner implements Serializable {
private String description;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCart.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -53,9 +55,11 @@ public class MtCart implements Serializable {
private Integer num;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionCash.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -38,9 +40,11 @@ public class MtCommissionCash implements Serializable {
private String description;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

5
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionLog.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -66,12 +68,15 @@ public class MtCommissionLog implements Serializable {
private String isCash;
@ApiModelProperty("提现时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date cashTime;
@ApiModelProperty("是否提现")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRelation.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -41,9 +43,11 @@ public class MtCommissionRelation implements Serializable {
private String description;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRule.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -44,9 +46,11 @@ public class MtCommissionRule implements Serializable {
private Integer storeId;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("备注")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRuleItem.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -60,9 +62,11 @@ public class MtCommissionRuleItem implements Serializable {
private BigDecimal subMember;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("备注信息")

5
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtConfirmLog.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -48,9 +50,11 @@ public class MtConfirmLog implements Serializable {
private Integer orderId;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("卡券所属用户ID")
@ -66,6 +70,7 @@ public class MtConfirmLog implements Serializable {
private String status;
@ApiModelProperty("撤销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date cancelTime;
@ApiModelProperty("最后操作人")

6
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCoupon.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -66,9 +68,11 @@ public class MtCoupon implements Serializable {
private Integer expireTime;
@ApiModelProperty("开始有效期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date beginTime;
@ApiModelProperty("结束有效期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date endTime;
@ApiModelProperty("面额")
@ -111,9 +115,11 @@ public class MtCoupon implements Serializable {
private String outRule;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCouponGoods.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -35,9 +37,11 @@ public class MtCouponGoods implements Serializable {
private Integer goodsId;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCouponGroup.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -53,9 +55,11 @@ public class MtCouponGroup implements Serializable {
private String description;
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtGive.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -72,9 +74,11 @@ public class MtGive implements Serializable {
private String message;
@ApiModelProperty("赠送时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态，A正常；C取消")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtGiveItem.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -35,9 +37,11 @@ public class MtGiveItem implements Serializable {
private Integer userCouponId;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态，A正常；D删除")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtGoods.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -93,9 +95,11 @@ public class MtGoods implements Serializable {
private String description;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtGoodsCate.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -44,9 +46,11 @@ public class MtGoodsCate implements Serializable {
private String description;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtMerchant.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -65,9 +67,11 @@ public class MtMerchant implements Serializable {
private String description;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态，A：有效/启用；D：无效")

5
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtMessage.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -47,9 +49,11 @@ public class MtMessage implements Serializable {
private String isRead;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("参数信息")
@ -59,6 +63,7 @@ public class MtMessage implements Serializable {
private String isSend;
@ApiModelProperty("发送时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date sendTime;
@ApiModelProperty("状态")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOpenGift.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -47,9 +49,11 @@ public class MtOpenGift implements Serializable {
private Integer couponNum;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态")

3
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOpenGiftItem.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -37,6 +39,7 @@ public class MtOpenGiftItem implements Serializable {
private Integer openGiftId;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("状态")

5
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -87,15 +89,18 @@ public class MtOrder implements Serializable {
private String remark;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("订单状态")
private String status;
@ApiModelProperty("支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
@ApiModelProperty("支付状态")

3
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrderAddress.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -53,6 +55,7 @@ public class MtOrderAddress implements Serializable {
private Integer userId;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrderGoods.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -50,9 +52,11 @@ public class MtOrderGoods implements Serializable {
private Integer num;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("A：正常；D：删除")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtPoint.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -44,9 +46,11 @@ public class MtPoint implements Serializable {
private Integer amount;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("备注说明")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtRefund.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -51,9 +53,11 @@ public class MtRefund implements Serializable {
private String remark;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("状态")

3
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtSendLog.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -62,6 +64,7 @@ public class MtSendLog implements Serializable {
private Integer sendNum;
@ApiModelProperty("操作时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("操作人")

4
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtSetting.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -49,9 +51,11 @@ public class MtSetting implements Serializable {
private String description;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("最后操作人")

5
fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtSmsSendedLog.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -41,12 +43,15 @@ public class MtSmsSendedLog implements Serializable {
private String content;
@ApiModelProperty("发送时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date sendTime;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;

Some files were not shown because too many files have changed in this diff Show More