diff --git a/src/main/java/com/gszc/entity/Custom.java b/src/main/java/com/gszc/entity/Custom.java index 59b09ed..513ebcb 100644 --- a/src/main/java/com/gszc/entity/Custom.java +++ b/src/main/java/com/gszc/entity/Custom.java @@ -1,15 +1,14 @@ package com.gszc.entity; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.List; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* @@ -140,7 +139,7 @@ logout 已注销 @ApiModelProperty(value = "营业执照") private String businessLicense; - private LocalDateTime serviceBeginDate; + private Date serviceBeginDate; /** * 批注的图标 @@ -149,7 +148,7 @@ red yellow blue purple @ApiModelProperty(value = "批注的图标 red yellow blue purple") private String notice; - private LocalDateTime serviceEndDate; + private Date serviceEndDate; /** * 使用jsonarray @@ -157,9 +156,9 @@ red yellow blue purple @ApiModelProperty(value = "使用jsonarray") private String noticeContent; - private LocalDateTime createDate; + private Date createDate; - private LocalDateTime modifyDate; + private Date modifyDate; @ApiModelProperty(value = "小程序用户id") private String miniUserId; diff --git a/src/main/java/com/gszc/entity/CustomSupport.java b/src/main/java/com/gszc/entity/CustomSupport.java index 4774190..999bb11 100644 --- a/src/main/java/com/gszc/entity/CustomSupport.java +++ b/src/main/java/com/gszc/entity/CustomSupport.java @@ -1,15 +1,15 @@ package com.gszc.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.io.Serializable; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** *

* @@ -60,9 +60,9 @@ individualBusiness 个体工商户经营者 @ApiModelProperty(value = "营业执照") private String businessLicense; - private LocalDateTime createDate; + private Date createDate; - private LocalDateTime modifyDate; + private Date modifyDate; private String customId; diff --git a/src/main/java/com/gszc/entity/Invoice.java b/src/main/java/com/gszc/entity/Invoice.java index 5b770e1..b721e19 100644 --- a/src/main/java/com/gszc/entity/Invoice.java +++ b/src/main/java/com/gszc/entity/Invoice.java @@ -1,15 +1,15 @@ package com.gszc.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.io.Serializable; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** *

* @@ -60,9 +60,9 @@ public class Invoice implements Serializable { private String trackingImg; - private LocalDateTime createDate; + private Date createDate; - private LocalDateTime modifyDate; + private Date modifyDate; private String statusCode; diff --git a/src/main/java/com/gszc/entity/InvoiceHeader.java b/src/main/java/com/gszc/entity/InvoiceHeader.java index b2e2d39..480b868 100644 --- a/src/main/java/com/gszc/entity/InvoiceHeader.java +++ b/src/main/java/com/gszc/entity/InvoiceHeader.java @@ -1,14 +1,14 @@ package com.gszc.entity; -import java.time.LocalDateTime; -import java.io.Serializable; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* 发票抬头 @@ -53,9 +53,9 @@ public class InvoiceHeader implements Serializable { @ApiModelProperty(value = "收件电话") private String receiveTelephone; - private LocalDateTime createDate; + private Date createDate; - private LocalDateTime modifyDate; + private Date modifyDate; private String miniUserId; diff --git a/src/main/java/com/gszc/entity/MiniUser.java b/src/main/java/com/gszc/entity/MiniUser.java index e7c9862..6175d69 100644 --- a/src/main/java/com/gszc/entity/MiniUser.java +++ b/src/main/java/com/gszc/entity/MiniUser.java @@ -1,11 +1,12 @@ package com.gszc.entity; -import java.time.LocalDateTime; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* @@ -35,7 +36,7 @@ public class MiniUser implements Serializable { private String headImg; - private LocalDateTime createDate; + private Date createDate; } diff --git a/src/main/java/com/gszc/entity/PcUser.java b/src/main/java/com/gszc/entity/PcUser.java index ad1dabc..edbe932 100644 --- a/src/main/java/com/gszc/entity/PcUser.java +++ b/src/main/java/com/gszc/entity/PcUser.java @@ -1,14 +1,14 @@ package com.gszc.entity; -import java.time.LocalDateTime; -import java.io.Serializable; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* 管理端用户 @@ -42,9 +42,9 @@ public class PcUser implements Serializable { @ApiModelProperty(value = "密码") private String password; - private LocalDateTime createDate; + private Date createDate; - private LocalDateTime modifyDate; + private Date modifyDate; /** * admin-管理员 diff --git a/src/main/java/com/gszc/entity/ReceiveAddress.java b/src/main/java/com/gszc/entity/ReceiveAddress.java index cf65898..558596f 100644 --- a/src/main/java/com/gszc/entity/ReceiveAddress.java +++ b/src/main/java/com/gszc/entity/ReceiveAddress.java @@ -1,14 +1,14 @@ package com.gszc.entity; -import java.time.LocalDateTime; -import java.io.Serializable; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* @@ -42,9 +42,9 @@ public class ReceiveAddress implements Serializable { @ApiModelProperty(value = "是否默认") private Boolean isDefault; - private LocalDateTime createDate; + private Date createDate; - private LocalDateTime modifyDate; + private Date modifyDate; private String miniUserId; diff --git a/src/main/java/com/gszc/mapper/CustomMapper.java b/src/main/java/com/gszc/mapper/CustomMapper.java index 5661d0f..10e6ee6 100644 --- a/src/main/java/com/gszc/mapper/CustomMapper.java +++ b/src/main/java/com/gszc/mapper/CustomMapper.java @@ -2,6 +2,7 @@ package com.gszc.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.gszc.entity.Custom; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.gszc.entity.Custom; * @author ky * @since 2020-04-27 */ +@Repository public interface CustomMapper extends BaseMapper { } diff --git a/src/main/java/com/gszc/mapper/CustomSupportMapper.java b/src/main/java/com/gszc/mapper/CustomSupportMapper.java index 7e9bb84..8afe993 100644 --- a/src/main/java/com/gszc/mapper/CustomSupportMapper.java +++ b/src/main/java/com/gszc/mapper/CustomSupportMapper.java @@ -2,6 +2,7 @@ package com.gszc.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.gszc.entity.CustomSupport; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.gszc.entity.CustomSupport; * @author ky * @since 2020-04-27 */ +@Repository public interface CustomSupportMapper extends BaseMapper { } diff --git a/src/main/java/com/gszc/mapper/InvoiceHeaderMapper.java b/src/main/java/com/gszc/mapper/InvoiceHeaderMapper.java index b71b56e..8c70578 100644 --- a/src/main/java/com/gszc/mapper/InvoiceHeaderMapper.java +++ b/src/main/java/com/gszc/mapper/InvoiceHeaderMapper.java @@ -2,6 +2,7 @@ package com.gszc.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.gszc.entity.InvoiceHeader; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.gszc.entity.InvoiceHeader; * @author ky * @since 2020-04-27 */ +@Repository public interface InvoiceHeaderMapper extends BaseMapper { } diff --git a/src/main/java/com/gszc/mapper/InvoiceMapper.java b/src/main/java/com/gszc/mapper/InvoiceMapper.java index 96a8b4f..7cbd691 100644 --- a/src/main/java/com/gszc/mapper/InvoiceMapper.java +++ b/src/main/java/com/gszc/mapper/InvoiceMapper.java @@ -2,6 +2,7 @@ package com.gszc.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.gszc.entity.Invoice; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.gszc.entity.Invoice; * @author ky * @since 2020-04-27 */ +@Repository public interface InvoiceMapper extends BaseMapper { } diff --git a/src/main/java/com/gszc/mapper/MiniUserMapper.java b/src/main/java/com/gszc/mapper/MiniUserMapper.java index 5c30d50..91b0eea 100644 --- a/src/main/java/com/gszc/mapper/MiniUserMapper.java +++ b/src/main/java/com/gszc/mapper/MiniUserMapper.java @@ -2,6 +2,7 @@ package com.gszc.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.gszc.entity.MiniUser; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.gszc.entity.MiniUser; * @author ky * @since 2020-04-27 */ +@Repository public interface MiniUserMapper extends BaseMapper { } diff --git a/src/main/java/com/gszc/mapper/PcUserMapper.java b/src/main/java/com/gszc/mapper/PcUserMapper.java index cc81bbe..326e155 100644 --- a/src/main/java/com/gszc/mapper/PcUserMapper.java +++ b/src/main/java/com/gszc/mapper/PcUserMapper.java @@ -2,6 +2,7 @@ package com.gszc.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.gszc.entity.PcUser; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.gszc.entity.PcUser; * @author ky * @since 2020-04-27 */ +@Repository public interface PcUserMapper extends BaseMapper { } diff --git a/src/main/java/com/gszc/mapper/ReceiveAddressMapper.java b/src/main/java/com/gszc/mapper/ReceiveAddressMapper.java index 81e8eb3..a79cb02 100644 --- a/src/main/java/com/gszc/mapper/ReceiveAddressMapper.java +++ b/src/main/java/com/gszc/mapper/ReceiveAddressMapper.java @@ -2,6 +2,7 @@ package com.gszc.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.gszc.entity.ReceiveAddress; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.gszc.entity.ReceiveAddress; * @author ky * @since 2020-04-27 */ +@Repository public interface ReceiveAddressMapper extends BaseMapper { } diff --git a/src/main/java/com/gszc/service/MiniAppService.java b/src/main/java/com/gszc/service/MiniAppService.java index 0c8fe90..9943abb 100644 --- a/src/main/java/com/gszc/service/MiniAppService.java +++ b/src/main/java/com/gszc/service/MiniAppService.java @@ -14,10 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; @Service @Transactional @@ -103,7 +100,7 @@ public class MiniAppService { miniUser.setId(id); miniUser.setSessionKey(sessionKey); miniUser.setOpenId(openid); - miniUser.setCreateDate(LocalDateTime.now()); + miniUser.setCreateDate(new Date()); // oceanUser.setSessionKey(sessionKey); // oceanUser.setOpenId(openid); // oceanUser.setUnionId(unionid); diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java index 87b0f01..7fad30f 100644 --- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java @@ -56,16 +56,16 @@ public class CustomServiceImpl extends ServiceImpl impleme public void customRegister(Custom custom,List customSupports){ String uuid = UUID.randomUUID().toString(); custom.setId(uuid); - custom.setCreateDate(LocalDateTime.now()); - custom.setModifyDate(LocalDateTime.now()); + custom.setCreateDate( new Date()); + custom.setModifyDate( new Date()); custom.setStatusCode("todo"); customMapper.insert(custom); if(customSupports.size()>0){ for(CustomSupport customSupport:customSupports){ String id = UUID.randomUUID().toString(); customSupport.setId(id); - customSupport.setCreateDate(LocalDateTime.now()); - customSupport.setModifyDate(LocalDateTime.now()); + customSupport.setCreateDate( new Date()); + customSupport.setModifyDate( new Date()); customSupport.setCustomId(uuid); customSupportMapper.insert(customSupport); } @@ -141,7 +141,7 @@ public class CustomServiceImpl extends ServiceImpl impleme Custom custom = new Custom(); custom.setId(customId); - custom.setModifyDate(LocalDateTime.now()); + custom.setModifyDate( new Date()); custom.setCopycatId(userId); custom.setStatusCode("disable"); customMapper.updateById(custom); @@ -156,7 +156,7 @@ public class CustomServiceImpl extends ServiceImpl impleme Custom custom = new Custom(); custom.setId(customId); - custom.setModifyDate(LocalDateTime.now()); + custom.setModifyDate( new Date()); custom.setCopycatId(userId); customMapper.updateById(custom); } @@ -169,7 +169,7 @@ public class CustomServiceImpl extends ServiceImpl impleme Custom custom = new Custom(); custom.setId(customId); - custom.setModifyDate(LocalDateTime.now()); + custom.setModifyDate( new Date()); custom.setNotice(notice); custom.setNoticeContent(noticeContent); customMapper.updateById(custom); @@ -183,15 +183,12 @@ public class CustomServiceImpl extends ServiceImpl impleme Custom custom = new Custom(); custom.setId(customId); - custom.setModifyDate(LocalDateTime.now()); + custom.setModifyDate( new Date()); custom.setBusinessLicense(businessLicense); custom.setSocialCreditCode(socialCreditCode); custom.setStatusCode("enable"); - Instant serviceBeginDateIn = Instant.ofEpochMilli(serviceBeginDate); - Instant serviceEndDateIn = Instant.ofEpochMilli(serviceEndDate); - ZoneId zone = ZoneId.systemDefault(); - custom.setServiceBeginDate(LocalDateTime.ofInstant(serviceBeginDateIn, zone)); - custom.setServiceEndDate(LocalDateTime.ofInstant(serviceEndDateIn, zone)); + custom.setServiceBeginDate(new Date(serviceBeginDate)); + custom.setServiceEndDate(new Date(serviceEndDate)); customMapper.updateById(custom); } diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java index 0be7e6d..7ef908a 100644 --- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -43,8 +44,8 @@ public class InvoiceServiceImpl extends ServiceImpl impl public void addInvoice(Invoice invoice){ String uuid = UUID.randomUUID().toString(); invoice.setId(uuid); - invoice.setCreateDate(LocalDateTime.now()); - invoice.setModifyDate(LocalDateTime.now()); + invoice.setCreateDate(new Date()); + invoice.setModifyDate(new Date()); invoiceMapper.insert(invoice); } @@ -78,13 +79,13 @@ public class InvoiceServiceImpl extends ServiceImpl impl public void addInvoiceHeader(InvoiceHeader invoiceHeader){ String uuid = UUID.randomUUID().toString(); invoiceHeader.setId(uuid); - invoiceHeader.setCreateDate(LocalDateTime.now()); - invoiceHeader.setModifyDate(LocalDateTime.now()); + invoiceHeader.setCreateDate(new Date()); + invoiceHeader.setModifyDate(new Date()); invoiceHeaderMapper.insert(invoiceHeader); } public void updateInvoiceHeader(InvoiceHeader invoiceHeader){ - invoiceHeader.setModifyDate(LocalDateTime.now()); + invoiceHeader.setModifyDate(new Date()); invoiceHeaderMapper.updateById(invoiceHeader); } @@ -111,7 +112,7 @@ public class InvoiceServiceImpl extends ServiceImpl impl Invoice invoice = new Invoice(); invoice.setId(invoiceId); invoice.setStatusCode("enable"); - invoice.setModifyDate(LocalDateTime.now()); + invoice.setModifyDate(new Date()); invoice.setTrackingCompany(trackingCompany); invoice.setTrackingCode(trackingCode); diff --git a/src/main/java/com/gszc/service/impl/PcUserServiceImpl.java b/src/main/java/com/gszc/service/impl/PcUserServiceImpl.java index 8af4ff5..c84400a 100644 --- a/src/main/java/com/gszc/service/impl/PcUserServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/PcUserServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -37,15 +38,15 @@ public class PcUserServiceImpl extends ServiceImpl impleme public void addUser(PcUser pcUser){ String uuid = UUID.randomUUID().toString(); pcUser.setId(uuid); - pcUser.setCreateDate(LocalDateTime.now()); - pcUser.setModifyDate(LocalDateTime.now()); + pcUser.setCreateDate(new Date()); + pcUser.setModifyDate(new Date()); pcUser.setType("user"); pcUserMapper.insert(pcUser); } public void updateUser(PcUser pcUser){ - pcUser.setModifyDate(LocalDateTime.now()); + pcUser.setModifyDate(new Date()); pcUserMapper.updateById(pcUser); } diff --git a/src/main/java/com/gszc/service/impl/ReceiveAddressServiceImpl.java b/src/main/java/com/gszc/service/impl/ReceiveAddressServiceImpl.java index aee2618..82eb6f7 100644 --- a/src/main/java/com/gszc/service/impl/ReceiveAddressServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/ReceiveAddressServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -29,13 +30,13 @@ public class ReceiveAddressServiceImpl extends ServiceImpl