diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDetailsVo.java b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDetailsVo.java index 0e27fa5..e51ef6d 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDetailsVo.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDetailsVo.java @@ -66,4 +66,5 @@ public class LpkGoodsDetailsVo implements Vo { private double quantityOfPackage; private String packUnit; private BigDecimal packprice; + private String standardPurchasePrice; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDto.java b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDto.java index ba3ec75..83beedb 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDto.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDto.java @@ -53,4 +53,5 @@ public class LpkGoodsDto implements Dto { private double quantityOfPackage; private String packUnit; private BigDecimal packprice; + private BigDecimal standardPurchasePrice; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java index 00ba366..b9e2ec6 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java @@ -44,4 +44,5 @@ public class LpkGoodsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date periodValidity; private String sort; + private String standardPurchasePrice; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/lpkreserveorder/LpkReserveOrderQuery.java b/ordermall/src/main/java/com/yxt/ordermall/api/lpkreserveorder/LpkReserveOrderQuery.java index 71f2edf..2a0c08d 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/lpkreserveorder/LpkReserveOrderQuery.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/lpkreserveorder/LpkReserveOrderQuery.java @@ -18,5 +18,10 @@ public class LpkReserveOrderQuery implements Query { private String bankSid; private String bankName; private String serialNumber; + private String address; + private String brand; + private String userPhone; + private String goodsName; + private String stateValue; private String cardType; //1 家庭 2 亲情卡 3 企业 } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/lpkstore/WarehouseInfoQuery.java b/ordermall/src/main/java/com/yxt/ordermall/api/lpkstore/WarehouseInfoQuery.java index e0930fe..4c373c0 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/lpkstore/WarehouseInfoQuery.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/lpkstore/WarehouseInfoQuery.java @@ -13,6 +13,7 @@ public class WarehouseInfoQuery implements Query { private String name; private String code; private String address; + private String bankName; private String orgLevelKey;//权限等级 @ApiModelProperty("菜单路由") private String menuUrl; diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderQuery.java b/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderQuery.java index 478f945..36a7cf5 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderQuery.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderQuery.java @@ -17,4 +17,10 @@ public class OrdOrderQuery implements Query { private String payTime; private String totalTee; private String outTradeNo; + private String billNo; + private String name; + private String payState; + private String payStartDate; + private String payEndDate; + private String invoiceState; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderVo.java b/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderVo.java index 360fa0f..22245e9 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderVo.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderVo.java @@ -22,6 +22,7 @@ public class OrdOrderVo implements Vo { private String mainSid; private String outTradeNo; private int payStatus;//状态 + private String payStatusValue;//状态 private String payType="微信支付"; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payTime; @@ -42,6 +43,7 @@ public class OrdOrderVo implements Vo { private PayResult result; private long nowDate; private String invoiceStatus;//开票状态 + private String invoiceStatusValue;//开票状态 private boolean invoiceB=false; private String reason;//理由 } diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/empreserveorder/EmpReserveOrderRest.java b/ordermall/src/main/java/com/yxt/ordermall/biz/empreserveorder/EmpReserveOrderRest.java index 51c2230..48e38d5 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/empreserveorder/EmpReserveOrderRest.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/empreserveorder/EmpReserveOrderRest.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "预约订单信息") @RestController -@RequestMapping("/empsreservoorder") +@RequestMapping("/empsssssssreservoorder") public class EmpReserveOrderRest { @Autowired EmpReserveOrderService empReserveOrderService; diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuVo1.java b/ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuVo1.java index 08e4121..0bbd76f 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuVo1.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuVo1.java @@ -38,4 +38,5 @@ public class GoodsSkuVo1 { private String typeSid;// private String brandName;//品牌 private String brandSid;// + private String standardPurchasePrice;// } diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java index 6c5d97e..cf684da 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java @@ -111,6 +111,7 @@ public class LpkGoodsService extends MybatisBaseService select - * + *,case payStatus + when 1 then '未生成支付订单' + when 2 then '待支付' + when 3 then '已取消' + when 4 then '支付成功' + when 5 then '申请退款' + when 6 then '退款成功' + when 7 then '退款失败' + end payStatusValue, + case invoiceStatus + when 0 then '未开票' + when 1 then '提交申请' + when 2 then '申请通过' + when 3 then '不通过' + end invoiceStatusValue from ord_order ${ew.sqlSegment} diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderRest.java b/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderRest.java index 6b95fc6..1e2c271 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderRest.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderRest.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "预约订单信息") @RestController -@RequestMapping("/empsreservoorder") +@RequestMapping("/order") public class OrdOrderRest { @Autowired OrdOrderService ordOrderService; @@ -43,6 +43,11 @@ public class OrdOrderRest { public ResultBean> orderList(@RequestBody PagerQuery query) { return ordOrderService.orderList(query); } + @PostMapping("/pcOrderList") + @ApiOperation(value = "pc支付记录") + public ResultBean> pcOrderList(@RequestBody PagerQuery query) { + return ordOrderService.pcOrderList(query); + } @GetMapping("/OrderDetails/{sid}") @ApiOperation(value = "支付记录明细") public ResultBean getOrderDetails(@PathVariable("sid") String sid) { diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderService.java index 4dfd1d6..f8dffc3 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderService.java @@ -55,8 +55,8 @@ import java.util.stream.Collectors; public class OrdOrderService extends MybatisBaseService { private static final String OrderUrl = "https://ordermall.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid="; - private static final String or = "https://ordermall.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid="; - private static final String payUrl = "https://ordermall.yxtsoft.com/lpkapi/empsreservoorder/getPreOrder"; + private static final String or = "https://ordermall.yxtsoft.com/lpkapi/mall/vegetablecellar/addGoods?mainSid="; + private static final String payUrl = "https://ordermall.yxtsoft.com/lpkapi/mall/order/getPreOrder"; @Autowired OrdOrderDetailService ordOrderDetailsService; @Autowired @@ -613,6 +613,86 @@ public class OrdOrderService extends MybatisBaseService> pcOrderList(PagerQuery pq) { + ResultBean rb = new ResultBean().fail(); + OrdOrderQuery query = pq.getParams(); + IPage page = PagerUtil.queryToPage(pq); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getBillNo())){ + qw.like("outTradeNo",query.getBillNo()); + } + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(query.getStartDate()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(query.getEndDate()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')" + ); + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(query.getPayStartDate()), "date_format (payTime,'%Y-%m-%d') >= date_format('" + query.getPayStartDate() + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(query.getPayEndDate()), "date_format (payTime,'%Y-%m-%d') <= date_format('" + query.getPayEndDate() + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getPayState())) { + if(query.getPayState().equals("99")){ + qw.in("payStatus","5","6","7"); + }else{ + qw.eq("payStatus", query.getPayState()); + } + } + if(StringUtils.isNotBlank(query.getInvoiceState())){ + qw.eq("invoiceStatus",query.getInvoiceState()); + } + qw.eq("1",1); + qw.orderByDesc("createTime"); + IPage pagging = baseMapper.orderList(page, qw); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + for (OrdOrderVo record : pagging.getRecords()) { + List details = ordOrderDetailService.list(new QueryWrapper().eq("orderSid", record.getSid())); + List urls = new ArrayList<>(); + record.getCreateTime(); + if (record.getPayStatus() == 2) { + //1>2 1 、1<2 -1 、1=2 0 + int k = DateUtil.parse(sdf.format(new Date())).compareTo(DateUtil.offsetMinute(record.getCreateTime(), 10)); + if (k != -1) { + record.setPayStatus(3); + OrdOrder r = baseMapper.selectOne(new QueryWrapper().eq("sid", record.getSid())); + r.setPayStatus(3); + baseMapper.updateById(r); + } + } + for (OrdOrderDetail detail : details) { + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid()); + LpkGoods lpkGoods=new LpkGoods(); + if(goodsBySkuSid.getData()!=null){ + lpkGoods = lpkGoodsService.getOne(new QueryWrapper().eq("skuSid", detail.getGoodsSid())); + lpkGoods.setCode(goodsBySkuSid.getData().getGoodsCode()); + lpkGoods.setBarcode(goodsBySkuSid.getData().getBarCode()); + lpkGoods.setName(goodsBySkuSid.getData().getGoodsName()); + lpkGoods.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); + lpkGoods.setPrice(goodsBySkuSid.getData().getSalesPrice()); + lpkGoods.setAppContent(goodsBySkuSid.getData().getExternalCode()); + lpkGoods.setSpecificationUnit(goodsBySkuSid.getData().getSPackUnit()); +// lpkGoods.setContent(goodsBySkuSid.getData().get); + lpkGoods.setWeight(goodsBySkuSid.getData().getTitle()); + lpkGoods.setBrandId(goodsBySkuSid.getData().getBrandSid()); + lpkGoods.setBrandName(goodsBySkuSid.getData().getBrandName()); + lpkGoods.setCategoryId(goodsBySkuSid.getData().getGoodsTypeSid()); + lpkGoods.setCategoryName(goodsBySkuSid.getData().getGoodsTypeName()); + }else{ + lpkGoods = lpkGoodsService.getOne(new QueryWrapper().eq("sid", detail.getGoodsSid())); + } + if(lpkGoods!=null){ + if(StringUtils.isNotBlank(lpkGoods.getPicUrl())){ + urls.add(fileUploadComponent.getUrlPrefix() + lpkGoods.getPicUrl()); + } + } + + } + record.setOrdOrderDetails(new ArrayList<>()); + record.setCount(String.valueOf(details.size())); + record.setPicUrls(urls); + } + if (query.getPayState().equals("2")) { + pagging.setRecords(pagging.getRecords().stream().filter(s -> s.getPayStatus() != 3).collect(Collectors.toList())); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } public ResultBean getOrderDetails(String sid) { ResultBean rb = new ResultBean().fail(); OrdOrderVo pagging = baseMapper.getOrderDetails(sid); @@ -707,11 +787,18 @@ public class OrdOrderService extends MybatisBaseService().eq("sid", detail.getGoodsSid())); - detail.setPicUrl(fileUploadComponent.getUrlPrefix() + lpkGoods.getPicUrl()); - detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份"); - detail.setUnitName(lpkGoods.getUnitName()); - detail.setSpecificationUnit(lpkGoods.getSpecificationUnit()); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + rb.setMsg(goodsBySkuSid.getMsg()); + return rb; + } +// LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper().eq("sid", detail.getGoodsSid())); + if(goodsBySkuSid.getData()!=null){ + detail.setPicUrl(fileUploadComponent.getUrlPrefix() + goodsBySkuSid.getData().getPicUrl()); + detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份"); + detail.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); + detail.setSpecificationUnit(goodsBySkuSid.getData().getSPackUnit()); + } } pagging.setOrdOrderDetails(details); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveCustomerExcel.java b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveCustomerExcel.java index 8088791..667827b 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveCustomerExcel.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveCustomerExcel.java @@ -15,17 +15,18 @@ public class ReserveCustomerExcel { @ExcelProperty(value = "预约日期",index = 0) private String reserveDate; @ColumnWidth(20) - @ExcelProperty(value = "支行",index = 1) - private String bankName; + @ExcelProperty(value = "预约单状态",index = 1) + private String stateValue; + @ColumnWidth(20) - @ExcelProperty(value = "提货门店",index = 2) + @ExcelProperty(value = "提货点",index = 2) private String storeName; @ColumnWidth(20) - @ExcelProperty(value = "礼包名称",index = 3) + @ExcelProperty(value = "品牌",index = 3) private String brandName; @ColumnWidth(20) - @ExcelProperty(value = "姓名",index = 4) + @ExcelProperty(value = "客户名称",index = 4) private String userName; @ColumnWidth(20) @@ -38,7 +39,4 @@ public class ReserveCustomerExcel { @ColumnWidth(20) @ExcelProperty(value = "商品数量(份)",index = 7) private String goodsNumber; - @ColumnWidth(20) - @ExcelProperty(value = "客户所属支行",index = 8) - private String customerBank; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveOrderVo.java b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveOrderVo.java index caed3bf..47a2f1f 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveOrderVo.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveOrderVo.java @@ -30,4 +30,6 @@ public class ReserveOrderVo implements Vo { private String goodsName; private String goodsNumber; private String customerBank; + private String stateValue; + private String sid; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml index 528c553..e1f7884 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml @@ -73,40 +73,72 @@ ORDER BY vo.reserveDate ASC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +