product_platform/yxt-yythmall-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

3/12

Browse Source
This commit is contained in:
wangpengfei
2024-03-12 18:00:20 +08:00
parent cf38e67f6e
commit 29242c9ee8
13 changed files with 281 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/yxt/yythmall/api/invoicerecords/InvoiceRecords.java Normal file
View File

@@ -0,0 +1,27 @@
package com.yxt.yythmall.api.invoicerecords;
import lombok.Data;
import java.util.UUID;
/**
* @author wangpengfei
* @date 2023/11/30 9:27
*/
@Data
public class InvoiceRecords {
private String id;
private String sid= UUID.randomUUID().toString();
private String createTime;
private String remarks;
private String isEnable;
private String invoiceType;//发票类型
private String invoiceHeader;//发票抬头
private String dutyParagraph;//税号
private String bankOfDeposit;//开户行
private String bankAccount;//账号
private String enterpriseAddress;//企业地址
private String orderSid;//订单sid
}

24
src/main/java/com/yxt/yythmall/api/invoicerecords/InvoiceRecordsDto.java Normal file
View File

@@ -0,0 +1,24 @@
package com.yxt.yythmall.api.invoicerecords;
import com.yxt.common.core.dto.Dto;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/11/30 9:27
*/
@Data
public class InvoiceRecordsDto implements Dto {
private String sid;
private String id;
private String createTime;
private String remarks;
private String isEnable;
private String invoiceType;//发票类型
private String invoiceHeader;//发票抬头
private String dutyParagraph;//税号
private String bankOfDeposit;//开户行
private String bankAccount;//账号
private String enterpriseAddress;//企业地址
private String orderSid;//订单sid
}

14
src/main/java/com/yxt/yythmall/api/invoicerecords/InvoiceRecordsQuery.java Normal file
View File

@@ -0,0 +1,14 @@
package com.yxt.yythmall.api.invoicerecords;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/11/30 9:27
*/
@Data
public class InvoiceRecordsQuery implements Query {
private String shortName;
private String name;
}

24
src/main/java/com/yxt/yythmall/api/invoicerecords/InvoiceRecordsVo.java Normal file
View File

@@ -0,0 +1,24 @@
package com.yxt.yythmall.api.invoicerecords;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/11/30 9:27
*/
@Data
public class InvoiceRecordsVo implements Vo {
private String id;
private String sid;
private String createTime;
private String remarks;
private String isEnable;
private String invoiceType;//发票类型
private String invoiceHeader;//发票抬头
private String dutyParagraph;//税号
private String bankOfDeposit;//开户行
private String bankAccount;//账号
private String enterpriseAddress;//企业地址
private String orderSid;//订单sid
}

2
src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
View File

@@ -45,4 +45,6 @@ public class VegeCellarReserveOrderVo implements Vo {
private String reserveCode;
private String newCode;
private boolean showLsit=false;
private String state;
private boolean isCancel=false;//是否能取消
}

29
src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsMapper.java Normal file
View File

@@ -0,0 +1,29 @@
package com.yxt.yythmall.biz.invoicerecords;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecords;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Mapper
public interface InvoiceRecordsMapper extends BaseMapper<InvoiceRecords> {
@Select("select * from invoice_records")
List<InvoiceRecordsVo> listAll();
@Select("select * from invoice_records where sid=#{sid}")
InvoiceRecordsVo getInvoiceRecordsBySid( @Param("sid") String sid);
}

7
src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.yythmall.biz.invoicerecords.InvoiceRecordsMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

58
src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsRest.java Normal file
View File

@@ -0,0 +1,58 @@
package com.yxt.yythmall.biz.invoicerecords;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsDto;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsQuery;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Api(tags = "礼品卡生成记录")
@RestController
@RequestMapping("invoicerecords")
public class InvoiceRecordsRest {
@Autowired
InvoiceRecordsService InvoiceRecordsService;
@ApiOperation("查询所有的发票信息")
@GetMapping("/listAll")
public ResultBean listAll() {
return InvoiceRecordsService.listAll();
}
@ApiOperation("保存")
@PostMapping("/save")
public ResultBean save(@RequestBody InvoiceRecordsDto dto) {
return InvoiceRecordsService.save(dto);
}
@ApiOperation("修改")
@PostMapping("/update")
public ResultBean update(@RequestBody InvoiceRecordsDto dto) {
return InvoiceRecordsService.update(dto);
}
@ApiOperation("根据sid查询")
@GetMapping("/getInvoiceRecordsBySid/{sid}")
public ResultBean getInvoiceRecordsBySid(@PathVariable String sid){
ResultBean rb = ResultBean.fireFail();
InvoiceRecordsVo InvoiceRecordsVo=InvoiceRecordsService.getInvoiceRecordsBySid(sid);
return rb.success().setData(InvoiceRecordsVo);
}
@ApiOperation("删除")
@DeleteMapping("/delete/{sid}")
public ResultBean delete(@PathVariable String sid) {
return InvoiceRecordsService.delete(sid);
}
}

63
src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsService.java Normal file
View File

@@ -0,0 +1,63 @@
package com.yxt.yythmall.biz.invoicerecords;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecords;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsDto;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsQuery;
import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsVo;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Service
public class InvoiceRecordsService extends MybatisBaseService<InvoiceRecordsMapper, InvoiceRecords> {
public ResultBean listAll() {
ResultBean rb = ResultBean.fireFail();
List<InvoiceRecordsVo> pagging = baseMapper.listAll();
return rb.success().setData(pagging);
}
public ResultBean save(InvoiceRecordsDto dto) {
ResultBean rb = ResultBean.fireFail();
InvoiceRecords entity=new InvoiceRecords();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return rb.success().setMsg("添加成功");
}
public ResultBean update(InvoiceRecordsDto dto) {
ResultBean rb=new ResultBean();
String dtoSid = dto.getSid();
InvoiceRecords entity=fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
return rb.success().setMsg("修改成功");
}
public InvoiceRecordsVo getInvoiceRecordsBySid(String sid){
return baseMapper.getInvoiceRecordsBySid(sid);
}
public ResultBean delete(String sid) {
ResultBean rb=new ResultBean();
baseMapper.delete(new QueryWrapper<InvoiceRecords>().eq("sid",sid));
return rb.success().setMsg("删除成功");
}
public List<InvoiceRecords> listAllBank() {
return baseMapper.selectList(null);
}
}

3
src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
View File

@@ -24,7 +24,8 @@
end affiliationValue,
s.name as storeName,
s.address as address,
s.phone as linkPhone
s.phone as linkPhone,
o.state
FROM
vege_cellar_reserve_order AS o
left join lpk_store s on s.sid=o.storeSid

2
src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java
View File

@@ -29,7 +29,7 @@ public class VegeCellarReserveOrderRest {
return vegeCellarReserveOrderService.submission(dto);
}
@ApiOperation("取消预约")
@PostMapping("/cancelReservation/{code}")
@GetMapping("/cancelReservation/{code}")
public ResultBean cancelReservation(@PathVariable("code") String code) {
return vegeCellarReserveOrderService.cancelReservation(code);
}

51
src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
View File

@@ -195,10 +195,11 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
if(StringUtils.isNotBlank(vo.getReserveCode())){
vo.setNewCode(addSpaces(vo.getReserveCode()));
}
ifCancel(vo.getReserveDate());
if(vo.getState().equals("0")){
vo.setCancel(ifCancel(vo.getReserveDate()));
}
vo.setGoodsVo(goodsVo);
}
PagerVo<VegeCellarReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
@@ -216,15 +217,21 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
return true;
}
public static void main(String[] args) {
String reserveDate="2024-03-13 00:00:00";
ZoneId zoneId = ZoneId.systemDefault();
LocalDate today =DateUtil.offsetDay(DateUtil.parse(reserveDate),-1).toInstant().atZone(zoneId).toLocalDate(); // 获取今天的日期
LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
System.out.println( date);
}
// public static void main(String[] args) {
// String reserveDate="2024-03-13 00:00:00";
// SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// ZoneId zoneId = ZoneId.systemDefault();
// LocalDate today =DateUtil.offsetDay(DateUtil.parse(sdf1.format(DateUtil.parse(reserveDate))),-1).toInstant().atZone(zoneId).toLocalDate(); // 获取今天的日期
// LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
// LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
// Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
// //1>2 1 、1<2 -1 、1=2 0
// int k=DateUtil.parse(sdf1.format(date)).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse("2024-03-12 15:00:01"))));
// if(String.valueOf(k).equals("-1")){
// System.out.println(false);
// }
// System.out.println(true);
// }
private QueryWrapper<VegeCellarReserveOrder> buildQuery(LpkReserveOrderQuery query) {
@@ -255,7 +262,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
ResultBean rb = ResultBean.fireFail();
LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfCustomer(page, qw);
return rb.success().setData(pagerVo);
@@ -263,7 +270,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
public Map<String, List<ReserveCustomerExcel>> mapForExcelCustomer(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
Map<String, List<ReserveCustomerExcel>> map = new HashMap<>();
list.forEach(vo -> {
@@ -281,7 +288,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
public List<ReserveCustomerExcel> listForExcelCustomer(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
List<ReserveCustomerExcel> volist = new ArrayList<>();
list.forEach(vo -> {
@@ -296,7 +303,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
ResultBean rb = ResultBean.fireFail();
LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfStore(page, qw);
return rb.success().setData(pagerVo);
@@ -304,7 +311,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
public Map<String, List<ReserveStoreExcel>> mapForExcelStore(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfStore(qw);
Map<String, List<ReserveStoreExcel>> map = new HashMap<>();
list.forEach(vo -> {
@@ -322,7 +329,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
public List<ReserveStoreExcel> listForExcelStore(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfStore(qw);
List<ReserveStoreExcel> listRes = new ArrayList<>();
@@ -338,7 +345,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
ResultBean rb = ResultBean.fireFail();
LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfBank(page, qw);
return rb.success().setData(pagerVo);
@@ -346,7 +353,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
public Map<String, List<ReserveBankExcel>> mapForExcelBank(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfBank(qw);
Map<String, List<ReserveBankExcel>> map = new HashMap<>();
list.forEach(vo -> {
@@ -364,7 +371,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
public List<ReserveBankExcel> listForExcelBank(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfBank(qw);
List<ReserveBankExcel> volist = new ArrayList<>();
list.forEach(vo -> {
@@ -379,7 +386,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
ResultBean rb = ResultBean.fireFail();
LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfAll(page, qw);
return rb.success().setData(pagerVo);
@@ -389,7 +396,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
// qw.ne("vo.state","2");
qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfAll(qw);
List<ReserveAllExcel> listRes = new ArrayList<>();

1
src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java
View File

@@ -110,6 +110,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
.excludePathPatterns("/lpkcustomer/updateCustomerBank")
.excludePathPatterns("/lpkgoods/isEnterprise/**")
.excludePathPatterns("/enterprisecertification/save")
.excludePathPatterns("/lpksreservoorders/cancelReservation/**")
.excludePathPatterns("//wxapi/**")
;
}