初始化
This commit is contained in:
24
src/main/java/com/yxt/yythmall/YxtYythmallApplication.java
Normal file
24
src/main/java/com/yxt/yythmall/YxtYythmallApplication.java
Normal file
@@ -0,0 +1,24 @@
|
||||
package com.yxt.yythmall;
|
||||
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
*/
|
||||
@SpringBootApplication(scanBasePackages = {
|
||||
"com.yxt.yythmall.config",
|
||||
"com.yxt.common.base.config",
|
||||
"com.yxt.yythmall"
|
||||
})
|
||||
// 启用自带定时任务
|
||||
@EnableScheduling
|
||||
@EnableFeignClients(basePackages = {})
|
||||
public class YxtYythmallApplication {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(YxtYythmallApplication.class, args);
|
||||
}
|
||||
}
|
||||
41
src/main/java/com/yxt/yythmall/adminapi/AdminBankRest.java
Normal file
41
src/main/java/com/yxt/yythmall/adminapi/AdminBankRest.java
Normal file
@@ -0,0 +1,41 @@
|
||||
package com.yxt.yythmall.adminapi;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsBrandVo;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo;
|
||||
import com.yxt.yythmall.adminservice.AdminMallService;
|
||||
import com.yxt.yythmall.api.lpkbank.LpkBank;
|
||||
import com.yxt.yythmall.api.lpkstore.LpkStore;
|
||||
import com.yxt.yythmall.biz.lpkbank.LpkBankService;
|
||||
import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController("com.yxt.yythmall.adminapi.AdminBankRest")
|
||||
@RequestMapping("/adminapi/bank")
|
||||
public class AdminBankRest {
|
||||
|
||||
@Autowired
|
||||
private LpkBankService lpkBankService;
|
||||
@Autowired
|
||||
private LpkStoreService lpkStoreService;
|
||||
|
||||
@GetMapping(value = "/listBankAll")
|
||||
public ResultBean<List<LpkBank>> listBankAll() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<LpkBank> list = lpkBankService.listAllBank();
|
||||
return rb.success().setData(list);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/listStoreOfBank")
|
||||
public ResultBean<List<LpkStore>> listStoreOfBank(@RequestParam(name = "bankSid", required = false) String bankSid) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<LpkStore> list = lpkStoreService.listStoreOfBank(bankSid);
|
||||
return rb.success().setData(list);
|
||||
}
|
||||
}
|
||||
33
src/main/java/com/yxt/yythmall/adminapi/AdminMallRest.java
Normal file
33
src/main/java/com/yxt/yythmall/adminapi/AdminMallRest.java
Normal file
@@ -0,0 +1,33 @@
|
||||
package com.yxt.yythmall.adminapi;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsBrandVo;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo;
|
||||
import com.yxt.yythmall.adminservice.AdminMallService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController("com.yxt.yythmall.adminapi.AdminMallRest")
|
||||
@RequestMapping("/adminapi/mall")
|
||||
public class AdminMallRest {
|
||||
|
||||
@Autowired
|
||||
private AdminMallService adminMallService;
|
||||
|
||||
@GetMapping(value = "/listAllBrand")
|
||||
public ResultBean<List<PmsBrandVo>> listAllBrand() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<PmsBrandVo> list = adminMallService.listBrand();
|
||||
return rb.success().setData(list);
|
||||
}
|
||||
@GetMapping(value = "/listAllCategory")
|
||||
public ResultBean<List<PmsBrandVo>> listAllCategory() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<PmsProductCategoryVo> list = adminMallService.listAllCategory();
|
||||
return rb.success().setData(list);
|
||||
}
|
||||
}
|
||||
128
src/main/java/com/yxt/yythmall/adminapi/AdminReserveRest.java
Normal file
128
src/main/java/com/yxt/yythmall/adminapi/AdminReserveRest.java
Normal file
@@ -0,0 +1,128 @@
|
||||
package com.yxt.yythmall.adminapi;
|
||||
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderQuery;
|
||||
import com.yxt.yythmall.biz.vegecallerreserveorder.*;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController("com.yxt.yythmall.adminapi.AdminReserveRest")
|
||||
@RequestMapping("/adminapi/reserve")
|
||||
public class AdminReserveRest {
|
||||
|
||||
@Autowired
|
||||
private VegeCellarReserveOrderService vegeCellarReserveOrderService;
|
||||
|
||||
@ApiOperation("精确到客户的预约单列表")
|
||||
@PostMapping("/pageOfCustomer")
|
||||
public ResultBean<IPage<ReserveOrderVo>> pageOfCustomer(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
|
||||
return vegeCellarReserveOrderService.pageOfCustomer(pq);
|
||||
}
|
||||
|
||||
@PostMapping("/expExcelOfCustomer")
|
||||
public void expExcelOfCustomer(@RequestBody LpkReserveOrderQuery pq, HttpServletResponse response) throws IOException {
|
||||
// 这里注意 有同学反应使用swagger 会导致各种问题,请直接用浏览器或者用postman
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
|
||||
String fileName = URLEncoder.encode("预约单明细", "UTF-8").replaceAll("\\+", "%20");
|
||||
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
|
||||
// Map<String, List<ReserveCustomerExcel>> map = vegeCellarReserveOrderService.mapForExcelCustomer(pq);
|
||||
List<ReserveCustomerExcel> list = vegeCellarReserveOrderService.listForExcelCustomer(pq);
|
||||
EasyExcel.write(response.getOutputStream(), ReserveCustomerExcel.class).sheet("预约单明细").doWrite(list);
|
||||
// try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ReserveCustomerExcel.class).build()) {
|
||||
// AtomicInteger i= new AtomicInteger();
|
||||
// map.forEach((key,val) ->{
|
||||
// WriteSheet writeSheet = EasyExcel.writerSheet(i.get(),key).build();
|
||||
// i.getAndIncrement();
|
||||
// excelWriter.write(val, writeSheet);
|
||||
// });
|
||||
// }
|
||||
}
|
||||
|
||||
@ApiOperation("精确到客户的预约单列表")
|
||||
@PostMapping("/pageOfStore")
|
||||
public ResultBean<IPage<ReserveOrderVo>> pageOfStore(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
|
||||
return vegeCellarReserveOrderService.pageOfStore(pq);
|
||||
}
|
||||
|
||||
@PostMapping("/expExcelOfStore")
|
||||
public void expExcelOfStore(@RequestBody LpkReserveOrderQuery pq, HttpServletResponse response) throws IOException {
|
||||
// 这里注意 有同学反应使用swagger 会导致各种问题,请直接用浏览器或者用postman
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
|
||||
String fileName = URLEncoder.encode("提货点配货单", "UTF-8").replaceAll("\\+", "%20");
|
||||
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
|
||||
// Map<String, List<ReserveStoreExcel>> map = vegeCellarReserveOrderService.mapForExcelStore(pq);
|
||||
List<ReserveStoreExcel> list = vegeCellarReserveOrderService.listForExcelStore(pq);
|
||||
|
||||
EasyExcel.write(response.getOutputStream(), ReserveStoreExcel.class).sheet("网点配货单").doWrite(list);
|
||||
// try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ReserveStoreExcel.class).build()) {
|
||||
// AtomicInteger i= new AtomicInteger();
|
||||
// map.forEach((key,val) ->{
|
||||
// WriteSheet writeSheet = EasyExcel.writerSheet(i.get(),key).build();
|
||||
// i.getAndIncrement();
|
||||
// excelWriter.write(val, writeSheet);
|
||||
// });
|
||||
// }
|
||||
}
|
||||
|
||||
@ApiOperation("精确到客户的预约单列表")
|
||||
@PostMapping("/pageOfBank")
|
||||
public ResultBean<IPage<ReserveOrderVo>> pageOfBank(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
|
||||
return vegeCellarReserveOrderService.pageOfBank(pq);
|
||||
}
|
||||
|
||||
@PostMapping("/expExcelOfBank")
|
||||
public void expExcelOfBank(@RequestBody LpkReserveOrderQuery pq, HttpServletResponse response) throws IOException {
|
||||
// 这里注意 有同学反应使用swagger 会导致各种问题,请直接用浏览器或者用postman
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
|
||||
String fileName = URLEncoder.encode("支行配货单", "UTF-8").replaceAll("\\+", "%20");
|
||||
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
|
||||
Map<String, List<ReserveBankExcel>> map = vegeCellarReserveOrderService.mapForExcelBank(pq);
|
||||
List<ReserveBankExcel> list = vegeCellarReserveOrderService.listForExcelBank(pq);
|
||||
EasyExcel.write(response.getOutputStream(), ReserveBankExcel.class).sheet("支行配货单").doWrite(list);
|
||||
// try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ReserveBankExcel.class).build()) {
|
||||
// AtomicInteger i= new AtomicInteger();
|
||||
// map.forEach((key,val) ->{
|
||||
// WriteSheet writeSheet = EasyExcel.writerSheet(i.get(),key).build();
|
||||
// i.getAndIncrement();
|
||||
// excelWriter.write(val, writeSheet);
|
||||
// });
|
||||
// }
|
||||
}
|
||||
|
||||
@ApiOperation("精确到客户的预约单列表")
|
||||
@PostMapping("/pageOfAll")
|
||||
public ResultBean<IPage<ReserveOrderVo>> pageOfAll(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
|
||||
return vegeCellarReserveOrderService.pageOfAll(pq);
|
||||
}
|
||||
|
||||
@PostMapping("/expExcelOfAll")
|
||||
public void expExcelOfAll(@RequestBody LpkReserveOrderQuery pq, HttpServletResponse response) throws IOException {
|
||||
// 这里注意 有同学反应使用swagger 会导致各种问题,请直接用浏览器或者用postman
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
|
||||
String fileName = URLEncoder.encode("提货点配货单", "UTF-8").replaceAll("\\+", "%20");
|
||||
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
|
||||
List<ReserveAllExcel> list = vegeCellarReserveOrderService.listForExcelAll(pq);
|
||||
EasyExcel.write(response.getOutputStream(), ReserveAllExcel.class).sheet("总配货明细").doWrite(list);
|
||||
}
|
||||
}
|
||||
52
src/main/java/com/yxt/yythmall/adminapi/BannerRest.java
Normal file
52
src/main/java/com/yxt/yythmall/adminapi/BannerRest.java
Normal file
@@ -0,0 +1,52 @@
|
||||
package com.yxt.yythmall.adminapi;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.yythmall.biz.appletbanner.AppletBanner;
|
||||
import com.yxt.yythmall.biz.appletbanner.AppletBannerQuery;
|
||||
import com.yxt.yythmall.biz.appletbanner.AppletBannerService;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController("com.yxt.yythmall.adminapi.BannerRest")
|
||||
@RequestMapping("/adminapi/banner")
|
||||
public class BannerRest {
|
||||
@Autowired
|
||||
private AppletBannerService appletBannerService;
|
||||
|
||||
|
||||
@ApiOperation("分页列表")
|
||||
@PostMapping("/pageList")
|
||||
public ResultBean<IPage<AppletBanner>> pageList(@RequestBody PagerQuery<AppletBannerQuery> pq) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
IPage<AppletBanner> page = appletBannerService.pageList(pq);
|
||||
return rb.success().setData(page);
|
||||
}
|
||||
|
||||
@ApiOperation("修改或保存")
|
||||
@PostMapping("/saveOrUpdate")
|
||||
public ResultBean saveOrUpdate(@RequestBody AppletBanner dto) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
appletBannerService.doSaveOrUpdate(dto);
|
||||
return rb.success();
|
||||
}
|
||||
|
||||
@ApiOperation("初始化")
|
||||
@GetMapping("/noticeInit/{sid}")
|
||||
public ResultBean<AppletBanner> noticeInit(@PathVariable("sid") String sid) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
AppletBanner ab = appletBannerService.fetchBySid(sid);
|
||||
return rb.success().setData(ab);
|
||||
}
|
||||
|
||||
@ApiOperation("是否显示")
|
||||
@GetMapping("/isDisplayed/{sid}/{state}")
|
||||
public ResultBean isDisplayed(@PathVariable("sid") String sid, @PathVariable("state") String state) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
appletBannerService.updateShowState(sid, state);
|
||||
return rb.success().setMsg("更改成功!");
|
||||
}
|
||||
}
|
||||
24
src/main/java/com/yxt/yythmall/adminapi/OrdertoolsRest.java
Normal file
24
src/main/java/com/yxt/yythmall/adminapi/OrdertoolsRest.java
Normal file
@@ -0,0 +1,24 @@
|
||||
package com.yxt.yythmall.adminapi;
|
||||
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.yythmall.adminapi.ordertools.OrdertoolsService;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
@RestController("com.yxt.yythmall.adminapi.OrdertoolsRest")
|
||||
@RequestMapping("/adminapi/ordertools")
|
||||
public class OrdertoolsRest {
|
||||
@Autowired
|
||||
private OrdertoolsService ordertoolsService;
|
||||
|
||||
@ApiOperation("上传和导出")
|
||||
@PostMapping("/uploadExcelFile")
|
||||
public ResultBean uploadExcelFile(@RequestParam("file") MultipartFile file) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
String fileUrl = ordertoolsService.uploadAndResetData(file);
|
||||
return rb.success().setData(fileUrl);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.yxt.yythmall.adminapi.ordertools;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
import com.alibaba.excel.context.AnalysisContext;
|
||||
import com.alibaba.excel.read.builder.ExcelReaderBuilder;
|
||||
import com.alibaba.excel.read.listener.ReadListener;
|
||||
import com.yxt.common.base.config.component.FileUploadComponent;
|
||||
import com.yxt.common.core.result.FileUploadResult;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.yythmall.biz.ordorder.OrdOrderService;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class OrdertoolsService {
|
||||
|
||||
@Autowired
|
||||
private FileUploadComponent fileUploadComponent;
|
||||
|
||||
@Autowired
|
||||
private OrdOrderService ordOrderService;
|
||||
|
||||
public String uploadAndResetData(MultipartFile file) {
|
||||
ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "zfdd");
|
||||
String filePath = fub.getData().getFilePath();
|
||||
String fp = fileUploadComponent.getUploadPath() + filePath;
|
||||
String outFilePath = "zfdd/fhd" + System.currentTimeMillis() + ".xlsx";
|
||||
String outFileName = fileUploadComponent.getUploadPath() + outFilePath;
|
||||
String outFileUrl = fileUploadComponent.getUrlPrefix() + outFilePath;
|
||||
|
||||
List<WxOrderIn> inList = new ArrayList<>();
|
||||
ExcelReaderBuilder read = EasyExcel.read(fp, WxOrderIn.class, createReadListener(inList));
|
||||
read.sheet().doRead();
|
||||
|
||||
List<ToImportOrderExcel> toList = new ArrayList<>();
|
||||
inList.forEach(inObj -> {
|
||||
ToImportOrderExcel toObj = new ToImportOrderExcel();
|
||||
toObj.setTranOrderNo(inObj.getTranOrderNo());
|
||||
toObj.setMerchantOrderNo(inObj.getMerchantOrderNo());
|
||||
toObj.setMerchantNo(inObj.getMerchantNo());
|
||||
toObj.setGoodsNames(ordOrderService.orderGoodsNames(inObj.getMerchantOrderNo()));
|
||||
toList.add(toObj);
|
||||
});
|
||||
EasyExcel.write(outFileName, ToImportOrderExcel.class).sheet("发货单").doWrite(toList);
|
||||
|
||||
return outFileUrl;
|
||||
}
|
||||
|
||||
private ReadListener<WxOrderIn> createReadListener(List<WxOrderIn> inList) {
|
||||
|
||||
return new ReadListener<WxOrderIn>() {
|
||||
@Override
|
||||
public void invoke(WxOrderIn obj, AnalysisContext analysisContext) {
|
||||
inList.add(obj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.yxt.yythmall.adminapi.ordertools;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@EqualsAndHashCode
|
||||
public class ToImportOrderExcel {
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "交易单号",index = 0)
|
||||
private String tranOrderNo; // 交易单号
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "商户单号",index = 1)
|
||||
private String merchantOrderNo; // 商户单号
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "商户号",index = 2)
|
||||
private String merchantNo;// 商户号
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "发货方式",index = 3)
|
||||
private String modeOfDespatch = "用户自提";// 发货方式
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "发货模式",index = 4)
|
||||
private String deliveryMode = "统一发货";// 发货模式
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "快递公司",index = 5)
|
||||
private String kdgs = ""; // 快递公司
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "快递单号(多个快递单使用;分隔)",index = 6)
|
||||
private String kddh = ""; // 快递单号(多个快递单使用;分隔)
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "是否完成发货",index = 7)
|
||||
private String sfwcfh = ""; // 是否完成发货
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "是否重新发货",index = 8)
|
||||
private String sfcxfh = ""; // 是否重新发货
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "商品信息",index = 9)
|
||||
private String goodsNames; // 商品信息
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.yxt.yythmall.adminapi.ordertools;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class WxOrderIn {
|
||||
private String tranTime; // 支付时间
|
||||
private String tranOrderNo; // 交易单号
|
||||
private String merchantOrderNo; // 商户单号
|
||||
private String merchantNo;// 商户号
|
||||
private String status; // 状态
|
||||
}
|
||||
31
src/main/java/com/yxt/yythmall/adminapi/vo/PmsBrandVo.java
Normal file
31
src/main/java/com/yxt/yythmall/adminapi/vo/PmsBrandVo.java
Normal file
@@ -0,0 +1,31 @@
|
||||
package com.yxt.yythmall.adminapi.vo;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PmsBrandVo {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String name;
|
||||
private Integer sort;
|
||||
/**
|
||||
* 起始销售数量
|
||||
*/
|
||||
private Integer qssl;
|
||||
/**
|
||||
* 订购协议
|
||||
*/
|
||||
private String dgxy;
|
||||
/**
|
||||
* 品牌logo
|
||||
*/
|
||||
private String logo;
|
||||
|
||||
/**
|
||||
* 专区大图
|
||||
*/
|
||||
private String bigPic;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.adminapi.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PmsProductCategoryVo {
|
||||
private Long id;
|
||||
private Long parentId;
|
||||
|
||||
private String name;
|
||||
private Integer level;
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 图标
|
||||
*/
|
||||
private String icon;
|
||||
|
||||
private String keywords;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
private String description;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.yxt.yythmall.adminservice;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsBrandVo;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo;
|
||||
import com.yxt.yythmall.api.lpkgoods.LpkGoods;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface AdminMallMapper extends BaseMapper<LpkGoods> {
|
||||
|
||||
@Select("select * from pms_brand ")
|
||||
List<PmsBrandVo> listBrand();
|
||||
|
||||
@Select("select * from pms_product_category where parent_id=0 ")
|
||||
List<PmsProductCategoryVo> listAllCategory();
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.yxt.yythmall.adminservice;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsBrandVo;
|
||||
import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo;
|
||||
import com.yxt.yythmall.api.lpkgoods.LpkGoods;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class AdminMallService extends ServiceImpl<AdminMallMapper, LpkGoods> {
|
||||
|
||||
|
||||
public List<PmsBrandVo> listBrand() {
|
||||
return baseMapper.listBrand();
|
||||
}
|
||||
|
||||
public List<PmsProductCategoryVo> listAllCategory() {
|
||||
return baseMapper.listAllCategory();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:06
|
||||
*/
|
||||
@ApiModel(value = "礼包信息", description = "礼包信息")
|
||||
@TableName("applet_giftbag")
|
||||
@Data
|
||||
public class AppletGiftBag {
|
||||
private String id;
|
||||
private String sid = UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date dateStart;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date dateEnd;
|
||||
private String name;
|
||||
private String price;
|
||||
private String iconUrl;
|
||||
private String isGrounding;
|
||||
private String isRecommend;
|
||||
private String preferentialPrice;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/6 15:39
|
||||
*/
|
||||
@Data
|
||||
public class AppletGiftBagDetailVo {
|
||||
private String sid;
|
||||
private String name;
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String price;
|
||||
private String iconUrl;
|
||||
private String isEnable;
|
||||
private String isGrounding;
|
||||
private String isRecommend;
|
||||
private String remark;
|
||||
private String count;
|
||||
private List<GiftBagGoods> goods = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:13
|
||||
*/
|
||||
@ApiModel(value = "礼包信息 数据传输对象", description = "礼包信息 数据传输对象")
|
||||
@Data
|
||||
public class AppletGiftBagDto implements Dto {
|
||||
|
||||
private String sid;
|
||||
private String remarks;
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String name;
|
||||
private String price;
|
||||
private String iconUrl;
|
||||
private String isGrounding;
|
||||
private String isRecommend;
|
||||
private String preferentialPrice;
|
||||
//商品sid
|
||||
private List<GiftBagGoods> goods = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description
|
||||
* @date 2023/11/22 11:15
|
||||
*/
|
||||
@Data
|
||||
public class AppletGiftBagInitVo implements Vo {
|
||||
private String sid;
|
||||
private String remarks;
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String name;
|
||||
private String price;
|
||||
private String iconUrl;
|
||||
private String isRecommend;
|
||||
private String preferentialPrice;
|
||||
//商品sid
|
||||
private List<GiftBagGoods> goods = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:31
|
||||
*/
|
||||
@ApiModel(value = "礼包信息 查询条件", description = "礼包信息 查询条件")
|
||||
@Data
|
||||
public class AppletGiftBagQuery implements Query {
|
||||
private String name;
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecordVo;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:12
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "礼包信息 视图数据对象", description = "礼包信息 视图数据对象")
|
||||
@NoArgsConstructor
|
||||
public class AppletGiftBagVo implements Vo {
|
||||
private String sid;
|
||||
private String name;//
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String price;//礼包总价格
|
||||
private String prefPrice;//优惠价格
|
||||
private String iconUrl;//图片
|
||||
private String isEnable;
|
||||
private String isGrounding;
|
||||
private String isRecommend;//是否推荐 1 推荐 0 默认
|
||||
private String remarks;
|
||||
private String count;//
|
||||
private String goodsSid;
|
||||
private String weight="0";//重量
|
||||
private List<GiftBagGoods> giftBagGoods;
|
||||
private List<RecommendRecord> recordList;
|
||||
private List<NewcomerRecoRecordVo> newcomerRecoRecordVos;
|
||||
|
||||
public String getPrice() {
|
||||
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
|
||||
if(null==price){
|
||||
price="0";
|
||||
}
|
||||
return price=decimalFormat.format(Double.valueOf(price));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.yxt.common.base.utils.StringUtils;
|
||||
import lombok.Data;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description
|
||||
* @date 2023/11/22 11:08
|
||||
*/
|
||||
@Data
|
||||
public class GiftBagGoods {
|
||||
private String goodsSid;
|
||||
private String goodsNumber = "0";//份数
|
||||
private String name; //商品名
|
||||
private String unitName; //单位
|
||||
private String price; //商品单价
|
||||
private String iconUrl;//图片
|
||||
private String remark; //备注
|
||||
private String weight; //每份的重量
|
||||
private String jPrice; //每斤单价
|
||||
private String specificationUnit; //规格单位
|
||||
private String totalValue; //总价值
|
||||
private String spec; //总价值
|
||||
private String count="0"; //总价值
|
||||
private String mefenPrice;
|
||||
|
||||
// public String getJPrice() {
|
||||
//
|
||||
// if (StringUtils.isBlank(jPrice)) {
|
||||
// jPrice = "0";
|
||||
// }
|
||||
// DecimalFormat decimalFormat = new DecimalFormat("#0.00");
|
||||
// return decimalFormat.format(Double.valueOf(jPrice));
|
||||
// }
|
||||
|
||||
public String getMefenPrice() {
|
||||
double dj = 0.0;
|
||||
if (StrUtil.isNotBlank(price)) {
|
||||
try {
|
||||
dj = Double.parseDouble(price);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
int js = 1;
|
||||
if (StrUtil.isNotBlank(weight)) {
|
||||
try {
|
||||
js = Integer.parseInt(weight);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
double mfjg = dj * js;
|
||||
return NumberUtil.decimalFormatMoney(mfjg);
|
||||
}
|
||||
|
||||
public String getSubtotal() {
|
||||
double dj = 0.0;
|
||||
if (StrUtil.isNotBlank(price)) {
|
||||
try {
|
||||
dj = Double.parseDouble(price);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
int js = 1;
|
||||
if (StrUtil.isNotBlank(weight)) {
|
||||
try {
|
||||
js = Integer.parseInt(weight);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
int fs = 1;
|
||||
if (StrUtil.isNotBlank(goodsNumber)) {
|
||||
try {
|
||||
fs = Integer.parseInt(goodsNumber);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
double mfjg = dj * js * fs;
|
||||
return NumberUtil.decimalFormatMoney(mfjg);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/16 12:07
|
||||
*/
|
||||
@Data
|
||||
public class GiftBagGoodss {
|
||||
private String goodsSid;
|
||||
private String goodsNumber = "0";//份数
|
||||
private String name; //商品名
|
||||
private String unitName; //单位
|
||||
private String price; //商品单价
|
||||
private String iconUrl;//图片
|
||||
private String remark; //备注
|
||||
private String weight; //每份的重量
|
||||
private String jPrice; //每斤单价
|
||||
private String specificationUnit; //规格单位
|
||||
private String prefPrice;//优惠价格
|
||||
private String bagPrice;//礼包价格
|
||||
private String totalValue; //总价值
|
||||
private String spec; //总价值
|
||||
private String count="0"; //总价值
|
||||
private String mefenPrice="0";
|
||||
private boolean showCart=false;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date periodValidity;
|
||||
private String state="0";
|
||||
private String remarks;
|
||||
|
||||
|
||||
|
||||
|
||||
public String getSubtotal() {
|
||||
double dj = 0.0;
|
||||
if (StrUtil.isNotBlank(price)) {
|
||||
try {
|
||||
dj = Double.parseDouble(price);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
int js = 1;
|
||||
if (StrUtil.isNotBlank(weight)) {
|
||||
try {
|
||||
js = Integer.parseInt(weight);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
int fs = 1;
|
||||
if (StrUtil.isNotBlank(goodsNumber)) {
|
||||
try {
|
||||
fs = Integer.parseInt(goodsNumber);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
double mfjg = dj * js * fs;
|
||||
int m=(int)mfjg;
|
||||
// return NumberUtil.decimalFormatMoney(mfjg);
|
||||
return String.valueOf(m);
|
||||
}
|
||||
}
|
||||
16
src/main/java/com/yxt/yythmall/api/appletgiftbag/GoodsV.java
Normal file
16
src/main/java/com/yxt/yythmall/api/appletgiftbag/GoodsV.java
Normal file
@@ -0,0 +1,16 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/17 10:18
|
||||
*/
|
||||
@Data
|
||||
public class GoodsV {
|
||||
private String weight;
|
||||
private String price;
|
||||
private List<GiftBagGoodss> giftBagGoodssList;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/18 8:50
|
||||
*/
|
||||
@Data
|
||||
public class MyGoodsVo {
|
||||
private String goodsSid;
|
||||
private String name; //商品名
|
||||
private String goodsNumber ;//份数
|
||||
private String residue ;//剩余
|
||||
private String iconUrl;//图片
|
||||
private String weight; //每份的重量
|
||||
private String remark; //备注
|
||||
private String type; //0 百姓菜窖 1 精品菜窖 2 企业菜窖
|
||||
private String specificationUnit; //规格单位
|
||||
private String unitName; //份
|
||||
private String count="0";
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date periodValidity;
|
||||
private String state="0";//商品过期状态 0未过期 1已过期
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.yxt.yythmall.api.appletgiftbag;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/11 9:29
|
||||
*/
|
||||
@Data
|
||||
public class RecommendRecord {
|
||||
private String content;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.yxt.yythmall.api.appletgiftbaggoods;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:06
|
||||
*/
|
||||
@ApiModel(value = "礼包包含商品信息", description = "礼包包含商品信息")
|
||||
@TableName("applet_giftbag_goods")
|
||||
@Data
|
||||
public class AppletGiftBagGoods {
|
||||
private String id;
|
||||
private String sid = UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String giftbagSid;
|
||||
private String goodsSid;
|
||||
private String goodsNumber;
|
||||
// private String isGrounding;
|
||||
private double price;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.yxt.yythmall.api.appletgiftbaggoods;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:13
|
||||
*/
|
||||
@ApiModel(value = "礼包包含商品信息 数据传输对象", description = "礼包包含商品信息 数据传输对象")
|
||||
@Data
|
||||
public class AppletGiftBagGoodsDto implements Dto {
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.appletgiftbaggoods;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:31
|
||||
*/
|
||||
@ApiModel(value = "礼包包含商品信息 查询条件", description = "礼包包含商品信息 查询条件")
|
||||
@Data
|
||||
public class AppletGiftBagGoodsQuery implements Query {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.yxt.yythmall.api.appletgiftbaggoods;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:12
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "礼包包含商品信息 视图数据对象", description = "礼包包含商品信息 视图数据对象")
|
||||
@NoArgsConstructor
|
||||
public class AppletGiftBagGoodsVo implements Vo {
|
||||
private String goodsName;
|
||||
private double goodsNumber;
|
||||
private String picUrl;
|
||||
private String goodsSid;
|
||||
private String price;
|
||||
private String unitName;
|
||||
private String remarks;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.yxt.yythmall.api.appletnotice;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:10
|
||||
*/
|
||||
@Data
|
||||
public class AppletNotice {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String title;
|
||||
private String content;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date startDate;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
|
||||
private Date endDate;
|
||||
private String sort;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
|
||||
private Date releaseTime;//发布时间
|
||||
private String publisher;//发布人
|
||||
private String isShow;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.yxt.yythmall.api.appletnotice;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class AppletNoticeDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String title;//标题
|
||||
private String content;//内容
|
||||
|
||||
private String startDate;//开始时间
|
||||
|
||||
private String endDate;//结束时间
|
||||
private String sort;//排序
|
||||
|
||||
private String releaseTime;//发布时间
|
||||
private String publisher;//发布人
|
||||
private String isShow;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.yxt.yythmall.api.appletnotice;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class AppletNoticeQuery implements Query {
|
||||
private String startDate; //开始时间
|
||||
private String endDate; //结束时间
|
||||
private String countNumber; //总数
|
||||
private String name;
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.yxt.yythmall.api.appletnotice;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class AppletNoticeVo implements Vo {
|
||||
private String id;
|
||||
private String sid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String title;//标题
|
||||
private String content;//内容
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date startDate;//开始时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date endDate;//结束时间
|
||||
private String sort;//排序
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date releaseTime;//发布时间
|
||||
private String publisher;//发布人
|
||||
private String isShow;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.api.approvalrecords;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class ApprovalRecords {
|
||||
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String approvalOpinions;//审核意见
|
||||
private String operator;//操作人
|
||||
private String operatorSid;//操作人sid
|
||||
private String approvalStatus;//审核状态
|
||||
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.yxt.yythmall.api.approvalrecords;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class ApprovalRecordsDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String approvalOpinions;//审核意见
|
||||
private String operator;//操作人
|
||||
private String operatorSid;//操作人sid
|
||||
private String approvalStatus;//审核状态
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.approvalrecords;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class ApprovalRecordsQuery implements Query {
|
||||
private String shortName;
|
||||
private String name;
|
||||
private String reviewStatus;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.yxt.yythmall.api.approvalrecords;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class ApprovalRecordsVo implements Vo {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String approvalOpinions;//审核意见
|
||||
private String operator;//操作人
|
||||
private String operatorSid;//操作人sid
|
||||
private String approvalStatus;//审核状态
|
||||
private String customerName;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.yythmall.api.cannotreservedictionary;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:06
|
||||
*/
|
||||
@ApiModel(value = "不能预约时间字典", description = "不能预约时间字典")
|
||||
@TableName("cannot_reserve_dictionary")
|
||||
@Data
|
||||
public class CannotReserveDictionary {
|
||||
private String id;
|
||||
private String sid = UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String unavailableTime;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.yxt.yythmall.api.cannotreservedictionary;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:13
|
||||
*/
|
||||
@ApiModel(value = "不能预约时间字典 数据传输对象", description = "不能预约时间字典 数据传输对象")
|
||||
@Data
|
||||
public class CannotReserveDictionaryDto implements Dto {
|
||||
private String id;
|
||||
private String sid ;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String unavailableTime;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.cannotreservedictionary;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:31
|
||||
*/
|
||||
@ApiModel(value = "不能预约时间字典 查询条件", description = "不能预约时间字典 查询条件")
|
||||
@Data
|
||||
public class CannotReserveDictionaryQuery implements Query {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.api.cannotreservedictionary;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:12
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "不能预约时间字典 视图数据对象", description = "不能预约时间字典 视图数据对象")
|
||||
@NoArgsConstructor
|
||||
public class CannotReserveDictionaryVo implements Vo {
|
||||
private String id;
|
||||
private String sid ;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String unavailableTime;
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.yxt.yythmall.api.customerinvoice;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class CustomerInvoice {
|
||||
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String invoiceTypeSid;//发票类型sid
|
||||
private String invoiceType;//发票类型
|
||||
private String headingType;//发票类型
|
||||
private String invoiceHeader;//发票抬头
|
||||
private String dutyParagraph;//税号
|
||||
private String bankOfDeposit;//开户行
|
||||
private String bankAccount;//账号
|
||||
private String enterpriseAddress;//企业地址
|
||||
private String enterprisePhone;//企业电话
|
||||
private String isDefault;//是否默认 1 为默认
|
||||
private String customerSid;
|
||||
private String email;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.yxt.yythmall.api.customerinvoice;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class CustomerInvoiceDto implements Dto {
|
||||
private String sid;
|
||||
private String id;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String invoiceTypeSid;//发票类型sid
|
||||
private String invoiceType;//发票类型
|
||||
private String headingType;//发票类型
|
||||
private String invoiceHeader;//发票抬头
|
||||
private String dutyParagraph;//税号
|
||||
private String bankOfDeposit;//开户行
|
||||
private String bankAccount;//账号
|
||||
private String enterpriseAddress;//企业地址
|
||||
private String enterprisePhone;//企业电话
|
||||
private String isDefault;//是否默认 1 为默认
|
||||
private String customerSid;
|
||||
private String email;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.yxt.yythmall.api.customerinvoice;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class CustomerInvoiceQuery implements Query {
|
||||
private String shortName;
|
||||
private String name;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.yxt.yythmall.api.customerinvoice;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class CustomerInvoiceVo implements Vo {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String invoiceTypeSid;//发票类型sid
|
||||
private String invoiceType;//发票类型
|
||||
private String headingType;//发票类型
|
||||
private String invoiceHeader;//发票抬头
|
||||
private String dutyParagraph;//税号
|
||||
private String bankOfDeposit;//开户行
|
||||
private String bankAccount;//账号
|
||||
private String enterpriseAddress;//企业地址
|
||||
private String enterprisePhone;//企业电话
|
||||
private String isDefault;//是否默认 1 为默认
|
||||
private String customerSid;
|
||||
private String email;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.yxt.yythmall.api.customerstore;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:06
|
||||
*/
|
||||
@ApiModel(value = "礼包包含商品信息", description = "礼包包含商品信息")
|
||||
@TableName("customer_store")
|
||||
@Data
|
||||
public class CustomerStore {
|
||||
private String id;
|
||||
private String sid = UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String storeSid;
|
||||
// private String isGrounding;
|
||||
private String phone;
|
||||
private String name;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.yxt.yythmall.api.customerstore;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:13
|
||||
*/
|
||||
@ApiModel(value = "礼包包含商品信息 数据传输对象", description = "礼包包含商品信息 数据传输对象")
|
||||
@Data
|
||||
public class CustomerStoreDto implements Dto {
|
||||
private String id;
|
||||
private String sid ;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String storeSid;
|
||||
// private String isGrounding;
|
||||
private String phone;
|
||||
private String name;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.customerstore;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:31
|
||||
*/
|
||||
@ApiModel(value = "礼包包含商品信息 查询条件", description = "礼包包含商品信息 查询条件")
|
||||
@Data
|
||||
public class CustomerStoreQuery implements Query {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package com.yxt.yythmall.api.customerstore;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/21 15:12
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "礼包包含商品信息 视图数据对象", description = "礼包包含商品信息 视图数据对象")
|
||||
@NoArgsConstructor
|
||||
public class CustomerStoreVo implements Vo {
|
||||
private String id;
|
||||
private String sid ;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String storeSid;
|
||||
private String storeName;//提货点名称
|
||||
private String businessHours;//营业时间
|
||||
private String address;//地址
|
||||
// private String isGrounding;
|
||||
private String phone;//电话
|
||||
private String name;//姓名
|
||||
private String start;
|
||||
private String end;
|
||||
private String reserveDate;
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.yxt.common.base.utils.StringUtils;
|
||||
import com.yxt.yythmall.api.empcardgift.EmpCardGiftVo;
|
||||
import com.yxt.yythmall.api.lpkgiftcard.GoodsVo;
|
||||
import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo;
|
||||
import com.yxt.yythmall.api.lpkstore.StoreSelect;
|
||||
import lombok.Data;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/9 15:26
|
||||
*/
|
||||
@Data
|
||||
public class EmpAppletNewVo {
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String customerSid;
|
||||
private String giftbagSid;
|
||||
private String code;
|
||||
private String sid ;
|
||||
private String state;
|
||||
private String states;
|
||||
private boolean showBtn=true;
|
||||
private boolean showRecord=true;
|
||||
private String time;
|
||||
private String name="卡号:";
|
||||
private String pName;
|
||||
private String start;
|
||||
private String end;
|
||||
private String store; //门店
|
||||
private String reserveDate; //预约时间
|
||||
private List<GoodsVo> goodsVos;
|
||||
private List<StoreSelect> select;
|
||||
private String storeSid;//上次提货地点
|
||||
private String addressName;
|
||||
private String isReservation;//是否超过预约时间 0 否 1是
|
||||
private boolean notRese=true; //是否能预约
|
||||
private List<EmpCardGiftVo> empCardGiftVos;
|
||||
private String value;
|
||||
private String serialNumber;
|
||||
private String giftCode;
|
||||
private String giftCodeKey;
|
||||
private String qrCode;
|
||||
private List<LpkReserveOrderCardVo> orderCardVoList;
|
||||
private String isTransfer;
|
||||
|
||||
|
||||
|
||||
|
||||
public String getState() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
|
||||
if( String.valueOf(i).equals("-1")){
|
||||
state="已过期";
|
||||
showBtn=false;
|
||||
}else if(isTransfer.equals("1")){
|
||||
state="已转赠";
|
||||
showBtn=false;
|
||||
this.notRese=false;
|
||||
}
|
||||
else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
this.notRese=false;
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}else if(states.equals("4")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="待提货";
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
241
src/main/java/com/yxt/yythmall/api/empcard/EmpAppletVo.java
Normal file
241
src/main/java/com/yxt/yythmall/api/empcard/EmpAppletVo.java
Normal file
@@ -0,0 +1,241 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import cn.hutool.core.date.DateUnit;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.yxt.common.base.utils.StringUtils;
|
||||
import com.yxt.yythmall.api.empcardgift.EmpCardGiftVo;
|
||||
import com.yxt.yythmall.api.lpkgiftcard.GoodsVo;
|
||||
import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo;
|
||||
import com.yxt.yythmall.api.lpkstore.StoreSelect;
|
||||
import lombok.Data;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.ZoneId;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 11:26
|
||||
*/
|
||||
@Data
|
||||
public class EmpAppletVo {
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String customerSid;
|
||||
private String giftbagSid;
|
||||
private String code;
|
||||
private String sid ;
|
||||
private String state;
|
||||
private String states;
|
||||
private boolean showBtn=true;
|
||||
private boolean showRecord=true;
|
||||
private String time;
|
||||
private String name="卡号:";
|
||||
private String pName;
|
||||
private String start;
|
||||
private String end;
|
||||
private String store; //门店
|
||||
private String reserveDate; //预约时间
|
||||
private List<GoodsVo> goodsVos;
|
||||
private List<StoreSelect> select;
|
||||
private String storeSid;//上次提货地点
|
||||
private String addressName;
|
||||
private String isReservation;//是否超过预约时间 0 否 1是
|
||||
private boolean notRese=true; //是否能预约
|
||||
private List<EmpCardGiftVo> empCardGiftVos;
|
||||
private String value;
|
||||
private String serialNumber;
|
||||
private String giftCode;
|
||||
private String giftCodeKey;
|
||||
private String qrCode;
|
||||
private List<LpkReserveOrderCardVo> orderCardVoList;
|
||||
private String isTransfer;
|
||||
|
||||
public String getStart() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
LocalDate today = LocalDate.now(); // 获取今天的日期
|
||||
LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15,分钟数为0
|
||||
LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
|
||||
|
||||
ZoneId zoneId = ZoneId.systemDefault();
|
||||
Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
|
||||
// System.out.println(date);
|
||||
//1>2 1 、1<2 -1 、1=2 0
|
||||
int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
|
||||
if(String.valueOf(k).equals("1")){
|
||||
int j=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse("2024-01-15"))));
|
||||
if(String.valueOf(j).equals("1")){
|
||||
start=sdf.format(DateUtil.offsetDay(new Date(),+2));
|
||||
}else{
|
||||
// start=sdf.format(DateUtil.offsetDay(new Date(),+2));
|
||||
start=sdf.format(DateUtil.offsetDay(DateUtil.parse("2024-01-15"),+2));
|
||||
}
|
||||
|
||||
}else{
|
||||
int j=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse("2024-01-15"))));
|
||||
if(String.valueOf(j).equals("1")){
|
||||
start=sdf.format(DateUtil.offsetDay(new Date(),+1));
|
||||
}else{
|
||||
// start=sdf.format(DateUtil.offsetDay(new Date(),+2));
|
||||
start=sdf.format(DateUtil.offsetDay(DateUtil.parse("2024-01-15"),+1));
|
||||
}
|
||||
// start=sdf.format(DateUtil.offsetDay(new Date(),+1));
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))));
|
||||
if(String.valueOf(i).equals("-1")){
|
||||
long o=DateUtil.between(DateUtil.parse(start),DateUtil.parse(dateEnd), DateUnit.DAY);
|
||||
if(o<10){
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),10));
|
||||
}else{
|
||||
// end=sdf.format(DateUtil.parse(dateEnd));
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(start),4));
|
||||
}
|
||||
}else{
|
||||
if(String.valueOf(k).equals("1")){
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),2));
|
||||
}else{
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),1));
|
||||
}
|
||||
}
|
||||
}
|
||||
reserveDate=start;
|
||||
return start;
|
||||
}
|
||||
public String getName() {
|
||||
name=name+code;
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getTime() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy.MM.dd");
|
||||
if(StringUtils.isNotBlank(dateStart)){
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
time=sdf.format(DateUtil.parse(dateStart))+"~"+sdf.format(DateUtil.parse(dateEnd));
|
||||
}
|
||||
}
|
||||
return time;
|
||||
}
|
||||
|
||||
/* public boolean isShowBtn() {
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("1")){
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}
|
||||
return showBtn;
|
||||
}*/
|
||||
/*public String getState() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
|
||||
if( String.valueOf(i).equals("-1")){
|
||||
state="已过期";
|
||||
showBtn=false;
|
||||
}else{
|
||||
state="待提货";
|
||||
if(states.equals("2")){
|
||||
this.state="已绑定";
|
||||
|
||||
}else if(states.equals("3")){
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}
|
||||
}else{
|
||||
state="已绑定";
|
||||
if(states.equals("2")){
|
||||
this.state="已预约";
|
||||
}
|
||||
}
|
||||
return state;
|
||||
}*/
|
||||
public String getState() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
|
||||
if( String.valueOf(i).equals("-1")){
|
||||
state="已过期";
|
||||
showBtn=false;
|
||||
}else if(isTransfer.equals("1")){
|
||||
state="已转赠";
|
||||
showBtn=false;
|
||||
this.notRese=false;
|
||||
}
|
||||
else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
this.notRese=false;
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}else if(states.equals("4")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="待提货";
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return state;
|
||||
}
|
||||
// public String getState() {
|
||||
// SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
// if(StringUtils.isNotBlank(dateEnd)){
|
||||
// int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
|
||||
// if( String.valueOf(i).equals("-1")){
|
||||
// state="已过期";
|
||||
// showBtn=false;
|
||||
// }else{
|
||||
// state="待提货";
|
||||
// if(states.equals("5")){
|
||||
// if(isReservation.equals("0")){
|
||||
// this.state="已预约";
|
||||
// this.notRese=false;
|
||||
// }else{
|
||||
// this.state="已完成";
|
||||
// showBtn=false;
|
||||
// }
|
||||
// }else if(states.equals("4")){
|
||||
// if(isReservation.equals("0")){
|
||||
// this.state="已预约";
|
||||
// }else{
|
||||
// this.state="待提货";
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }else{
|
||||
// state="待提货";
|
||||
// if(states.equals("5")){
|
||||
// if(isReservation.equals("0")){
|
||||
// this.state="已预约";
|
||||
// }else{
|
||||
// this.state="已完成";
|
||||
// showBtn=false;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return state;
|
||||
// }
|
||||
}
|
||||
38
src/main/java/com/yxt/yythmall/api/empcard/EmpCard.java
Normal file
38
src/main/java/com/yxt/yythmall/api/empcard/EmpCard.java
Normal file
@@ -0,0 +1,38 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:10
|
||||
*/
|
||||
@Data
|
||||
public class EmpCard {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String recordId;
|
||||
private String recordSid;
|
||||
private String giftbagSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private Date bindDate;
|
||||
private String isReservation ;//是否超过预约时间 0 否 1是
|
||||
private String isTransfer ;//是否转增 0 未转赠 1 转赠
|
||||
private String isItInvalid ;//是否失效 0 有效 1失效 用于排序失效卡排后边
|
||||
|
||||
}
|
||||
35
src/main/java/com/yxt/yythmall/api/empcard/EmpCardDto.java
Normal file
35
src/main/java/com/yxt/yythmall/api/empcard/EmpCardDto.java
Normal file
@@ -0,0 +1,35 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String recordId;
|
||||
private String recordSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
private String grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
|
||||
private String giftbagSid;
|
||||
private String num;
|
||||
private String cardArea;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import com.yxt.common.core.utils.ExportEntityMap;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 11:29
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardExport {
|
||||
@ExportEntityMap(CnName = "企业卡二维码", EnName = "pic")
|
||||
private String pic;
|
||||
@ExportEntityMap(CnName = "企业卡编码第一行", EnName = "code1")
|
||||
private String code1;
|
||||
@ExportEntityMap(CnName = "企业卡编码第二行", EnName = "code2")
|
||||
private String code2;
|
||||
@ExportEntityMap(CnName = "企业卡密码", EnName = "codeKey")
|
||||
private String codeKey;
|
||||
@ExportEntityMap(CnName = "序列号", EnName = "serialNumber")
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
}
|
||||
20
src/main/java/com/yxt/yythmall/api/empcard/EmpCardQuery.java
Normal file
20
src/main/java/com/yxt/yythmall/api/empcard/EmpCardQuery.java
Normal file
@@ -0,0 +1,20 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardQuery implements Query {
|
||||
private String state;
|
||||
private String noEnd;
|
||||
private String noStart;
|
||||
|
||||
private String number;
|
||||
private String sid;
|
||||
private String customerSid;
|
||||
private String serialNumber;
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnore;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/22 14:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardStatisticsExportVo {
|
||||
@ColumnWidth(30)
|
||||
@ExcelProperty(value = "卡号",index = 1)
|
||||
private String code;
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "序列号",index = 0)
|
||||
private String serialNumber;
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "发行时间",index = 2)
|
||||
private String createTime;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "卡片种类",index = 2)
|
||||
// private String cardType;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "发行人",index = 3)
|
||||
// private String people;
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "状态",index = 3)
|
||||
private String stateValue;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "是否过期",index = 5)
|
||||
// private String isExpire;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "是否作废",index = 6)
|
||||
// private String isCancel;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "绑定id",index = 7)
|
||||
// private String bind;
|
||||
@ColumnWidth(20)
|
||||
@ExcelProperty(value = "绑定时间",index = 4)
|
||||
private String bindDate;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "提货卡商品",index = 9)
|
||||
// private String goodsName;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "商品数量(份)",index = 10)
|
||||
// private String goodsNumber;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "已提数量(份)",index = 11)
|
||||
// private String receiveNumber;
|
||||
// @ColumnWidth(20)
|
||||
// @ExcelProperty(value = "未提数量(份)",index = 12)
|
||||
// private String unclaimedNumber;
|
||||
@ExcelIgnore
|
||||
private String isEnable;
|
||||
}
|
||||
35
src/main/java/com/yxt/yythmall/api/empcard/EmpCardVo.java
Normal file
35
src/main/java/com/yxt/yythmall/api/empcard/EmpCardVo.java
Normal file
@@ -0,0 +1,35 @@
|
||||
package com.yxt.yythmall.api.empcard;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardVo implements Vo {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String recordId;
|
||||
private String recordSid;
|
||||
private String giftbagSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
private String grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private double goodsNumber;
|
||||
private String goodsSid;
|
||||
private String cardType;
|
||||
private String stateValue;
|
||||
private String bindDate;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.yxt.yythmall.api.empcardbuildrecord;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:10
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardBuildRecord {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
// private String isEnable;
|
||||
private String giftbagSid;
|
||||
|
||||
private String startNumber;
|
||||
private String endNumber;
|
||||
private String countNumber;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date buildDate;
|
||||
private String cardArea;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.yxt.yythmall.api.empcardbuildrecord;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardBuildRecordDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String recordId;
|
||||
private String recordSid;
|
||||
private String giftbagSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
private String grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private String Num;
|
||||
private String cardArea;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.empcardbuildrecord;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardBuildRecordQuery implements Query {
|
||||
private String startDate; //开始时间
|
||||
private String endDate; //结束时间
|
||||
private String countNumber; //总数
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.yxt.yythmall.api.empcardbuildrecord;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardBuildRecordVo implements Vo {
|
||||
private String sid;
|
||||
private String buildDate; //创建时间
|
||||
private String countNumber; //总数
|
||||
private String startNumber; //起始号
|
||||
private String endNumber; //结束号
|
||||
private String bagName;
|
||||
private String grantCountNumber; //发放总数
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/11 16:54
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGift {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String empCardSid;
|
||||
private String empCardSerialNumber;
|
||||
private String empCardCode;
|
||||
private String empCardCustomerSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private String recordSid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date bindDate;
|
||||
private String isItInvalid;
|
||||
private String isReservation;
|
||||
private String isShare;
|
||||
@TableField(exist = false)
|
||||
private String goods;
|
||||
private String cardType; //1企业卡 2 福礼卡 3提货卡
|
||||
private String isTransfer; //是否转增 0 未转赠 1 转赠
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date endDate; //结束日期
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date startDate; //开始日期
|
||||
private String isSenior;//是否是最高级的卡 1 是 2不是
|
||||
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/11 16:58
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String empCardSid;
|
||||
private String empCardSerialNumber;
|
||||
private String empCardCode;
|
||||
private String empCardCustomerSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private String recordSid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date bindDate;
|
||||
private String isItInvalid;
|
||||
private String iReservation;
|
||||
private List<GoodsVo> goodsVoList;
|
||||
private String count;
|
||||
private String cardType;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import com.yxt.common.core.utils.ExportEntityMap;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author Fan
|
||||
* @description
|
||||
* @date 2023/11/27 10:34
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftExport {
|
||||
@ExportEntityMap(CnName = "提货二维码", EnName = "pic")
|
||||
private String pic;
|
||||
@ExportEntityMap(CnName = "提货编码第一行", EnName = "code1")
|
||||
private String code1;
|
||||
@ExportEntityMap(CnName = "提货编码第二行", EnName = "code2")
|
||||
private String code2;
|
||||
@ExportEntityMap(CnName = "提货密码", EnName = "codeKey")
|
||||
private String codeKey;
|
||||
@ExportEntityMap(CnName = "序列号", EnName = "serialNumber")
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author Fan
|
||||
* @description
|
||||
* @date 2023/11/24 10:07
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftListQuery implements Query {
|
||||
private String state;
|
||||
private String noStart; //序列号开始
|
||||
private String noEnd; //序列号结束
|
||||
private String sid;
|
||||
private String number;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/11 17:09
|
||||
*/
|
||||
public class EmpCardGiftListVo {
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/11 16:57
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftQuery implements Query {
|
||||
private String id;
|
||||
private String sid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String empCardSid;
|
||||
private String empCardSerialNumber;
|
||||
private String empCardCode;
|
||||
private String empCardCustomerSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private String recordSid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date bindDate;
|
||||
private String isItInvalid;
|
||||
private String iReservation;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @description:
|
||||
* @author: dimengzhe
|
||||
* @date: 2024/1/2
|
||||
**/
|
||||
@Data
|
||||
public class EmpCardGiftStatisticsQuery implements Query {
|
||||
private static final long serialVersionUID = -8730985789870186066L;
|
||||
@ApiModelProperty("卡券序列号")
|
||||
private String serialNumber;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @description:
|
||||
* @author: dimengzhe
|
||||
* @date: 2024/1/2
|
||||
**/
|
||||
@Data
|
||||
public class EmpCardGiftStatisticsVo {
|
||||
|
||||
@ApiModelProperty("卡券序列号")
|
||||
private String serialNumber;
|
||||
@ApiModelProperty("提货编号")
|
||||
private String code;
|
||||
@ApiModelProperty("发行时间")
|
||||
private String createTime;
|
||||
@ApiModelProperty("卡券状态")
|
||||
private String stateValue;
|
||||
@ApiModelProperty("绑定时间")
|
||||
private String bindDate;
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/11 16:57
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftVo implements Vo {
|
||||
private String id;
|
||||
private String sid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String empCardSid;
|
||||
private String empCardSerialNumber;
|
||||
private String empCardCode;
|
||||
private String empCardCustomerSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private String recordSid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date bindDate;
|
||||
private String isItInvalid;
|
||||
private String iReservation;
|
||||
private String isShare;
|
||||
private double goodsNumber=0;
|
||||
private String qrCode;
|
||||
private String goods;
|
||||
private String share;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date startDate;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date endDate;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/6 15:49
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftWordVo {
|
||||
private String qrCode;//二维码
|
||||
private String bagName;//礼包名
|
||||
private String serialNumber;//序列号
|
||||
private String code;//卡号
|
||||
private String codeKey;//密码
|
||||
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.yxt.common.base.utils.StringUtils;
|
||||
import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo;
|
||||
import com.yxt.yythmall.api.lpkstore.StoreSelect;
|
||||
import lombok.Data;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/9 15:29
|
||||
*/
|
||||
@Data
|
||||
public class EmpGiftAppletNVo {
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String customerSid;
|
||||
private String giftbagSid;
|
||||
private String code;
|
||||
private String sid;
|
||||
private String state;
|
||||
private String states;
|
||||
private boolean showBtn = true;
|
||||
private boolean showRecord = true;
|
||||
private String time;
|
||||
private String name = "卡号:";
|
||||
private String pName;
|
||||
private String start;
|
||||
private String end;
|
||||
private String store; //门店
|
||||
private String reserveDate; //预约时间
|
||||
private List<GoodsVo> goodsVos;
|
||||
private List<StoreSelect> select;
|
||||
private String storeSid;//上次提货地点
|
||||
private String addressName;
|
||||
private String isReservation;//是否超过预约时间 0 否 1是
|
||||
private boolean notRese = true; //是否能预约
|
||||
private List<LpkReserveOrderCardVo> orderCardVoList;
|
||||
private List<EmpCardGift> empCardGifts;
|
||||
private String value;
|
||||
private String serialNumber;
|
||||
private String isEnable;
|
||||
private String isTransfer;//是否转增 0 未转赠 1 转赠
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public String getState() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
|
||||
if( String.valueOf(i).equals("-1")){
|
||||
state="已过期";
|
||||
showBtn=false;
|
||||
}else if(isEnable.equals("2")){
|
||||
state="已作废";
|
||||
showBtn=false;
|
||||
}
|
||||
else if(isTransfer.equals("1")){
|
||||
state="已转赠";
|
||||
showBtn=false;
|
||||
this.notRese=false;
|
||||
}
|
||||
else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
this.notRese=false;
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}else if(states.equals("4")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="待提货";
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,170 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import cn.hutool.core.date.DateUnit;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.yxt.common.base.utils.StringUtils;
|
||||
import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo;
|
||||
import com.yxt.yythmall.api.lpkstore.StoreSelect;
|
||||
import lombok.Data;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.ZoneId;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/11 17:14
|
||||
*/
|
||||
@Data
|
||||
public class EmpGiftAppletVo {
|
||||
|
||||
private String dateStart;
|
||||
private String dateEnd;
|
||||
private String customerSid;
|
||||
private String giftbagSid;
|
||||
private String code;
|
||||
private String sid;
|
||||
private String state;
|
||||
private String states;
|
||||
private boolean showBtn = true;
|
||||
private boolean showRecord = true;
|
||||
private String time;
|
||||
private String name = "卡号:";
|
||||
private String pName;
|
||||
private String start;
|
||||
private String end;
|
||||
private String store; //门店
|
||||
private String reserveDate; //预约时间
|
||||
private List<GoodsVo> goodsVos;
|
||||
private List<StoreSelect> select;
|
||||
private String storeSid;//上次提货地点
|
||||
private String addressName;
|
||||
private String isReservation;//是否超过预约时间 0 否 1是
|
||||
private boolean notRese = true; //是否能预约
|
||||
private List<LpkReserveOrderCardVo> orderCardVoList;
|
||||
private List<EmpCardGift> empCardGifts;
|
||||
private String value;
|
||||
private String serialNumber;
|
||||
private String isEnable;
|
||||
private String isTransfer;//是否转增 0 未转赠 1 转赠
|
||||
private String isSenior;//是否是最高级的卡 1 是 2不是
|
||||
|
||||
|
||||
|
||||
public String getStart() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
LocalDate today = LocalDate.now(); // 获取今天的日期
|
||||
LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15,分钟数为0
|
||||
LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
|
||||
|
||||
ZoneId zoneId = ZoneId.systemDefault();
|
||||
Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
|
||||
// System.out.println(date);
|
||||
//1>2 1 、1<2 -1 、1=2 0
|
||||
int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
|
||||
if(String.valueOf(k).equals("1")){
|
||||
start=sdf.format(DateUtil.offsetDay(new Date(),+2));
|
||||
}else{
|
||||
start=sdf.format(DateUtil.offsetDay(new Date(),+1));
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))));
|
||||
if(String.valueOf(i).equals("-1")){
|
||||
long o=DateUtil.between(DateUtil.parse(start),DateUtil.parse(dateEnd), DateUnit.DAY);
|
||||
if(o<10){
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),10));
|
||||
}else{
|
||||
// end=sdf.format(DateUtil.parse(dateEnd));
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(start),4));
|
||||
}
|
||||
}else{
|
||||
if(String.valueOf(k).equals("1")){
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),2));
|
||||
}else{
|
||||
end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),1));
|
||||
}
|
||||
}
|
||||
}
|
||||
reserveDate=start;
|
||||
return start;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
name=name+code;
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getTime() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy.MM.dd");
|
||||
if(StringUtils.isNotBlank(dateStart)){
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
time=sdf.format(DateUtil.parse(dateStart))+"~"+sdf.format(DateUtil.parse(dateEnd));
|
||||
}
|
||||
}
|
||||
return time;
|
||||
}
|
||||
|
||||
public boolean isShowBtn() {
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("1")){
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}
|
||||
return showBtn;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
if(StringUtils.isNotBlank(dateEnd)){
|
||||
int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
|
||||
if( String.valueOf(i).equals("-1")){
|
||||
state="已过期";
|
||||
showBtn=false;
|
||||
}else if(isEnable.equals("2")){
|
||||
state="已作废";
|
||||
showBtn=false;
|
||||
}
|
||||
else if(isTransfer.equals("1")){
|
||||
state="已转赠";
|
||||
showBtn=false;
|
||||
this.notRese=false;
|
||||
}
|
||||
else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
this.notRese=false;
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}else if(states.equals("4")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="待提货";
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
state="待提货";
|
||||
if(states.equals("5")){
|
||||
if(isReservation.equals("0")){
|
||||
this.state="已预约";
|
||||
}else{
|
||||
this.state="已完成";
|
||||
showBtn=false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return state;
|
||||
}
|
||||
}
|
||||
21
src/main/java/com/yxt/yythmall/api/empcardgift/GoodsVo.java
Normal file
21
src/main/java/com/yxt/yythmall/api/empcardgift/GoodsVo.java
Normal file
@@ -0,0 +1,21 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/22 15:35
|
||||
*/
|
||||
@Data
|
||||
public class GoodsVo {
|
||||
private String goods;
|
||||
private String pic;
|
||||
private double num;
|
||||
private double lNum;
|
||||
private double select = 0;
|
||||
private String goodsSid;
|
||||
private double orderNum; //预约数量
|
||||
private String price; //预约数量
|
||||
private String unitName; //预约数量
|
||||
private String remarks; //预约数量
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.yxt.yythmall.api.empcardgift;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/20 16:27
|
||||
*/
|
||||
@Data
|
||||
public class SaveVegetableVo {
|
||||
private String goodsSid;
|
||||
private String goodsName;
|
||||
private String goodsNumber;
|
||||
private String barndId;
|
||||
private String cetegoryId;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.yythmall.api.empcardgiftgoods;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:10
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftGoods {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String empCardGiftSid;
|
||||
private String goodsSid;
|
||||
private String goodsNumber;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.yxt.yythmall.api.empcardgiftgoods;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftGoodsDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String empCardGiftSid;
|
||||
private String goodsSid;
|
||||
private double goodsNumber;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.empcardgiftgoods;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftGoodsQuery implements Query {
|
||||
private String empCardGiftSid;
|
||||
private String goodsSid;
|
||||
private String goodsNumber;
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.yythmall.api.empcardgiftgoods;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGiftGoodsVo implements Vo {
|
||||
private String id;
|
||||
private String sid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String empCardGiftSid;
|
||||
private String goodsSid;
|
||||
private Integer goodsNumber;
|
||||
private String name;
|
||||
private String unitName;
|
||||
private String picUrl;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.yxt.yythmall.api.empcardgiftgoods;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2024/1/9 11:42
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGoodsVo {
|
||||
private String goodsName;
|
||||
private String goodsSid;
|
||||
private double goodsNumber;
|
||||
private double residue;
|
||||
private String unitName;
|
||||
private String specificationUnit;
|
||||
private String weight;
|
||||
private String remarks;
|
||||
private String content;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.api.empcardgrantlog;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:10
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGrantLog {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String empCardSid;
|
||||
private String empCardCustomerSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
// private String isShare;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.yxt.yythmall.api.empcardgrantlog;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGrantLogDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String recordId;
|
||||
private String recordSid;
|
||||
private String giftbagSid;
|
||||
private String serialNumber;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String state;
|
||||
private String grantName;
|
||||
private String grantDate;
|
||||
private String customerSid;
|
||||
private String customerMobile;
|
||||
private String Num;
|
||||
private String cardArea;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.empcardgrantlog;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGrantLogQuery implements Query {
|
||||
private String startDate; //开始时间
|
||||
private String endDate; //结束时间
|
||||
private String countNumber; //总数
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.yxt.yythmall.api.empcardgrantlog;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import com.yxt.yythmall.api.empcardgift.GoodsVo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/8 9:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpCardGrantLogVo implements Vo {
|
||||
private String sid;
|
||||
private String buildDate; //创建时间
|
||||
private String countNumber; //总数
|
||||
private String startNumber; //起始号
|
||||
private String endNumber; //结束号
|
||||
private String bagName;
|
||||
private String grantCountNumber; //发放总数
|
||||
private List<GoodsVo> goodsVos;
|
||||
private String cardSid;
|
||||
private String goods;
|
||||
private double goodsNumber=0;
|
||||
private String goodsSid;
|
||||
private String code;
|
||||
private String codeKey;
|
||||
private String remarks;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/23 10:29
|
||||
*/
|
||||
@Data
|
||||
public class EmpReserveOrder {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String reserveType;
|
||||
private String cardSid;
|
||||
private String cardCode;
|
||||
private String isCustomer;
|
||||
private String customerSid;
|
||||
private String userName;
|
||||
private String userPhone;
|
||||
private String userAddress;
|
||||
private String storeSid;
|
||||
private String reserveDate;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import com.yxt.yythmall.api.lpkgiftcard.GoodsVo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Fan
|
||||
* @description
|
||||
* @date 2023/11/27 16:53
|
||||
*/
|
||||
@Data
|
||||
public class EmpReserveOrderCardVo implements Vo {
|
||||
private String code; //卡号
|
||||
private String sid;
|
||||
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
|
||||
private Date reserveDate; //预约时间
|
||||
private String store; //提货门店
|
||||
private String storeSid; //提货门店
|
||||
private String bagName; //礼包
|
||||
private String cardSid; // 提货卡sid
|
||||
private String orderSid; //预约订单sid
|
||||
private String userName;
|
||||
private String userPhone;
|
||||
private String state;//提货状态
|
||||
private List<GoodsVo> goodsVos;
|
||||
private String goods;
|
||||
private String serialNumber;
|
||||
|
||||
public String getState() {
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
int c= DateUtil.parse(sdf.format(reserveDate)).compareTo(DateUtil.parse(sdf.format(new Date())));
|
||||
if(String.valueOf(c).equals("-1")){
|
||||
this.state="已提货";
|
||||
}else{
|
||||
this.state="未提货";
|
||||
}
|
||||
return state;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import com.yxt.yythmall.api.empcardgift.GoodsVo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/23 10:29
|
||||
*/
|
||||
@Data
|
||||
public class EmpReserveOrderDto implements Dto {
|
||||
private String cardSid;//礼包卡sid
|
||||
private String sid;
|
||||
private String value;
|
||||
private String storeSid;//发放点
|
||||
private String customerSid;//客户sid
|
||||
private String reserveDate;//发放时间
|
||||
private String userName;//用户名
|
||||
private String userPhone;//用户联系方式
|
||||
private List<GoodsVo> goodsVos;
|
||||
private String orderSid;
|
||||
private String addressName;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/23 10:30
|
||||
*/
|
||||
@Data
|
||||
public class EmpReserveOrderQuery implements Query {
|
||||
private String userName; //用户名
|
||||
private String store; // 门店
|
||||
private String startDate; //预约开始日期
|
||||
private String endDate; // 预约结束日期
|
||||
private String userSid;
|
||||
private String storeSid;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Fan
|
||||
* @description
|
||||
* @date 2023/11/27 15:11
|
||||
*/
|
||||
@Data
|
||||
public class EmpReserveOrderVo implements Vo {
|
||||
private String sid; //预约订单sid
|
||||
private String userName; //用户名
|
||||
private String userPhone; //用户电话
|
||||
private String store; //门店
|
||||
private String storeSid; //门店
|
||||
@JsonFormat(pattern = "yyyy-MM-dd ",timezone="GMT+8")
|
||||
private Date reserveDate; //预约时间
|
||||
private String bagName; //礼包
|
||||
private String code; //卡号
|
||||
private String goodsInfo;
|
||||
private List<OrderGoodsVo> goodsVo = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/23 14:34
|
||||
*/
|
||||
@Data
|
||||
public class Goods {
|
||||
private double goodsNumber;//数量
|
||||
private String goodsSid;//商品sid
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author Fan
|
||||
* @description
|
||||
* @date 2023/11/28 10:11
|
||||
*/
|
||||
@Data
|
||||
public class OrderGoodsVo implements Vo {
|
||||
private int num;
|
||||
private String goodName;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import com.yxt.common.core.utils.ExportEntityMap;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author Fan
|
||||
* @description
|
||||
* @date 2023/11/28 10:26
|
||||
*/
|
||||
@Data
|
||||
public class ReserveOrderExport {
|
||||
@ExportEntityMap(CnName = "预约时间", EnName = "reserveDate")
|
||||
private String reserveDate;
|
||||
@ExportEntityMap(CnName = "提货门店", EnName = "store")
|
||||
private String store;
|
||||
@ExportEntityMap(CnName = "姓名", EnName = "userName")
|
||||
private String userName;
|
||||
@ExportEntityMap(CnName = "联系方式", EnName = "userPhone")
|
||||
private String userPhone;
|
||||
@ExportEntityMap(CnName = "提货卡号", EnName = "code")
|
||||
private String code;
|
||||
@ExportEntityMap(CnName = "礼包名称", EnName = "bagName")
|
||||
private String bagName;
|
||||
@ExportEntityMap(CnName = "商品明细", EnName = "goodsInfo")
|
||||
private String goodsInfo;
|
||||
private String sid;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.yxt.yythmall.api.empreserveorder;
|
||||
|
||||
import com.yxt.common.core.utils.ExportEntityMap;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/12/11 13:58
|
||||
*/
|
||||
@Data
|
||||
public class ReserveOrderExportByStore {
|
||||
@ExportEntityMap(CnName = "预约时间", EnName = "reserveDate")
|
||||
private String reserveDate;
|
||||
@ExportEntityMap(CnName = "提货门店", EnName = "store")
|
||||
private String store;
|
||||
private String storeSid;
|
||||
@ExportEntityMap(CnName = "商品明细", EnName = "goodsInfo")
|
||||
private String goodsInfo;
|
||||
private String sid;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.yythmall.api.empreserveordergoods;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/23 10:29
|
||||
*/
|
||||
@Data
|
||||
public class EmpReserveOrderGoods {
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date createTime;
|
||||
private String remarks;
|
||||
private String cardSid;
|
||||
private String goodsSid;
|
||||
private double goodsNumber;
|
||||
private String num;
|
||||
private String orderSid;
|
||||
private String goodsName;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.yxt.yythmall.api.empreserveordergoods;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/23 10:29
|
||||
*/
|
||||
@Data
|
||||
public class EmpReserveOrderGoodsDto {
|
||||
private String cardSid;
|
||||
private String goodsSid;
|
||||
private String goodsNumber;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.yxt.yythmall.api.empreserveordergoods;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/23 10:30
|
||||
*/
|
||||
public class EmpReserveOrderGoodsQuery {
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.yythmall.api.enterprisecertification;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseCertification {
|
||||
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String enterpriseName;
|
||||
private String shippingAddress;
|
||||
private String contacts;
|
||||
private String telephone;
|
||||
private String reviewStatus;
|
||||
private String state;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.api.enterprisecertification;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseCertificationDto implements Dto {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String enterpriseName;//企业名称
|
||||
private String shippingAddress;//地址
|
||||
private String contacts;//联系人
|
||||
private String telephone;//联系电话
|
||||
private String reviewStatus;
|
||||
private String state;
|
||||
private String operator;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.yxt.yythmall.api.enterprisecertification;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseCertificationQuery implements Query {
|
||||
private String shortName;
|
||||
private String name;
|
||||
private String reviewStatus;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.api.enterprisecertification;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseCertificationVo implements Vo {
|
||||
private String id;
|
||||
private String sid;
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String customerSid;
|
||||
private String enterpriseName;
|
||||
private String shippingAddress;
|
||||
private String contacts;
|
||||
private String telephone;
|
||||
private String reviewStatus;
|
||||
private String state;
|
||||
private String customerName;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.yythmall.api.invoiceapprovalrecords;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
* @date 2023/11/30 9:27
|
||||
*/
|
||||
@Data
|
||||
public class InvoiceApprovalRecords {
|
||||
|
||||
private String id;
|
||||
private String sid= UUID.randomUUID().toString();
|
||||
private String createTime;
|
||||
private String remarks;
|
||||
private String isEnable;
|
||||
private String orderSid;
|
||||
private String approvalOpinions;//审核意见
|
||||
private String operator;//操作人
|
||||
private String operatorSid;//操作人sid
|
||||
private String approvalStatus;//审核状态
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user