product_platform/ordermall_admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

01/09

Browse Source
This commit is contained in:
wangpengfei
2025-01-09 10:22:11 +08:00
parent 6c8dc103c0
commit 563e481840
18 changed files with 301 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDetailsVo.java
View File

@@ -66,4 +66,5 @@ public class LpkGoodsDetailsVo implements Vo {
private double quantityOfPackage;
private String packUnit;
private BigDecimal packprice;
private String standardPurchasePrice;
}

1
ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDto.java
View File

@@ -53,4 +53,5 @@ public class LpkGoodsDto implements Dto {
private double quantityOfPackage;
private String packUnit;
private BigDecimal packprice;
private BigDecimal standardPurchasePrice;
}

1
ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java
View File

@@ -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;
}

5
ordermall/src/main/java/com/yxt/ordermall/api/lpkreserveorder/LpkReserveOrderQuery.java
View File

@@ -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 企业
}

1
ordermall/src/main/java/com/yxt/ordermall/api/lpkstore/WarehouseInfoQuery.java
View File

@@ -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;

6
ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderQuery.java
View File

@@ -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;
}

2
ordermall/src/main/java/com/yxt/ordermall/api/ordorder/OrdOrderVo.java
View File

@@ -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;//理由
}

2
ordermall/src/main/java/com/yxt/ordermall/biz/empreserveorder/EmpReserveOrderRest.java
View File

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "预约订单信息")
@RestController
@RequestMapping("/empsreservoorder")
@RequestMapping("/empsssssssreservoorder")
public class EmpReserveOrderRest {
@Autowired
EmpReserveOrderService empReserveOrderService;

1
ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuVo1.java
View File

@@ -38,4 +38,5 @@ public class GoodsSkuVo1 {
private String typeSid;//
private String brandName;//品牌
private String brandSid;//
private String standardPurchasePrice;//
}

4
ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java
View File

@@ -111,6 +111,7 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
vv.setCategoryName(record.getGoodsTypeName());
vv.setSort(record.getSortNo());
vv.setSid(record.getSkuSid());
vv.setStandardPurchasePrice(record.getStandardPurchasePrice());
if (StringUtils.isNotBlank(record.getPicUrl())) {
vv.setPicUrl(fileUploadComponent.getUrlPrefix() + record.getPicUrl());
}
@@ -156,11 +157,13 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
extendDto.setPackPrice(dto.getPackprice());
extendDto.setQuantityOfPackage(dto.getQuantityOfPackage());
extendDto.setPackageSpecs(dto.getPackageSpecs());
extendDto.setStandardPurchasePrice(dto.getStandardPurchasePrice().toString());
dto1.setSid(dto.getSkuSid());
dto1.setTitle(dto.getWeight());
dto1.setIndexes(dto.getRemarks());
dto1.setRemarks(dto.getContent());
dto1.setSignSid(dto.getSignSid());
dto1.setGoodsSkuCode(dto.getCode());
baseGoodsSkus.add(dto1);
for (BaseGoodsSkuDto goodsSkus : baseGoodsSkus) {
goodsSkus.setBaseGoodsSkuExtend(extendDto);
@@ -232,6 +235,7 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
lpkGoods.setPackageSpecs(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPackageSpecs());
lpkGoods.setPackUnit(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPackUnit());
lpkGoods.setPackprice(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPackPrice());
lpkGoods.setStandardPurchasePrice(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getStandardPurchasePrice());
if (StringUtils.isNotBlank(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPicUrl())) {
lpkGoods.setPicUrl(fileUploadComponent.getUrlPrefix() + data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPicUrl());
}

16
ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderMapper.xml
View File

@@ -6,7 +6,21 @@
<select id="orderList" resultType="com.yxt.ordermall.api.ordorder.OrdOrderVo">
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
<where>
${ew.sqlSegment}

7
ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderRest.java
View File

@@ -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<PagerVo<OrdOrderVo>> orderList(@RequestBody PagerQuery<OrdOrderQuery> query) {
return ordOrderService.orderList(query);
}
@PostMapping("/pcOrderList")
@ApiOperation(value = "pc支付记录")
public ResultBean<PagerVo<OrdOrderVo>> pcOrderList(@RequestBody PagerQuery<OrdOrderQuery> query) {
return ordOrderService.pcOrderList(query);
}
@GetMapping("/OrderDetails/{sid}")
@ApiOperation(value = "支付记录明细")
public ResultBean<OrdOrderVo> getOrderDetails(@PathVariable("sid") String sid) {

101
ordermall/src/main/java/com/yxt/ordermall/biz/ordorder/OrdOrderService.java
View File

@@ -55,8 +55,8 @@ import java.util.stream.Collectors;
public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder> {
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<OrdOrderMapper, OrdOrder
return rb.success().setData(p);
}
public ResultBean<PagerVo<OrdOrderVo>> pcOrderList(PagerQuery<OrdOrderQuery> pq) {
ResultBean rb = new ResultBean().fail();
OrdOrderQuery query = pq.getParams();
IPage<OrdOrder> page = PagerUtil.queryToPage(pq);
QueryWrapper<OrdOrder> 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<OrdOrderVo> pagging = baseMapper.orderList(page, qw);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (OrdOrderVo record : pagging.getRecords()) {
List<OrdOrderDetail> details = ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid", record.getSid()));
List<String> 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<OrdOrder>().eq("sid", record.getSid()));
r.setPayStatus(3);
baseMapper.updateById(r);
}
}
for (OrdOrderDetail detail : details) {
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid());
LpkGoods lpkGoods=new LpkGoods();
if(goodsBySkuSid.getData()!=null){
lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().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<LpkGoods>().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<LpkStoreVo> 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<OrdOrderMapper, OrdOrder
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
pagging.setSurcharge(removeZeros(String.valueOf(decimalFormat.format(Double.valueOf(pagging.getTotalTee()) - Double.valueOf(pagging.getMeet())))));
for (OrdOrderDetail detail : details) {
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().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<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
rb.setMsg(goodsBySkuSid.getMsg());
return rb;
}
// LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().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");

14
ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveCustomerExcel.java
View File

@@ -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;
}

2
ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/ReserveOrderVo.java
View File

@@ -30,4 +30,6 @@ public class ReserveOrderVo implements Vo {
private String goodsName;
private String goodsNumber;
private String customerBank;
private String stateValue;
private String sid;
}

74
ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
View File

@@ -73,40 +73,72 @@
ORDER BY vo.reserveDate ASC
</select>
<!-- <select id="pageOfCustomer" resultType="com.yxt.ordermall.biz.vegecallerreserveorder.ReserveOrderVo">-->
<!-- select-->
<!-- date_format(vo.reserveDate,'%Y-%m-%d') reserveDate,-->
<!-- vo.customerSid,-->
<!-- vo.storeSid,-->
<!-- ls.name storeName,-->
<!-- ls.linker storeLinker,-->
<!-- ls.phone storePhone,-->
<!-- ls.address storeAddress,-->
<!-- vo.affiliation affiliation,-->
<!-- pb.name brandName,-->
<!-- vo.userName userName,-->
<!-- vo.userPhone userPhone,-->
<!-- lb.sid bankSid,-->
<!-- lb.name bankName,-->
<!-- lb.linker bankLinker,-->
<!-- lb.linkPhone bankPhone,-->
<!-- lb.address bankAddress,-->
<!-- vd.goodsSid,-->
<!-- vd.goodsName goodsName,-->
<!-- vd.goodsNumber goodsNumber,-->
<!-- lcb.name customerBank,-->
<!-- case vo.state-->
<!-- when 0 then '待提货'-->
<!-- when 1 then '已提货'-->
<!-- end stateValue-->
<!-- from vege_cellar_reserve_order vo-->
<!-- LEFT JOIN lpk_store ls ON ls.sid=vo.storeSid-->
<!-- LEFT JOIN lpk_bank lb ON lb.sid=ls.bankSid-->
<!-- left join vege_cellar_reserve_details vd on vo.sid=vd.orderSid-->
<!-- left join lpk_goods lg on vd.goodsSid=lg.skuSid-->
<!-- left join pms_brand pb on pb.id=vo.affiliation-->
<!-- LEFT JOIN lpk_customer lc ON lc.sid=vo.customerSid-->
<!-- LEFT JOIN lpk_customer_bank lcb ON lcb.sid = lc.customerBankSid-->
<!-- <where>-->
<!-- ${ew.sqlSegment}-->
<!-- </where>-->
<!--&#45;&#45; ORDER BY vo.reserveDate,vo.storeSid,vo.userName,vo.userPhone ASC-->
<!-- ORDER BY vo.reserveDate -->
<!-- </select>-->
<select id="pageOfCustomer" resultType="com.yxt.ordermall.biz.vegecallerreserveorder.ReserveOrderVo">
select
date_format(vo.reserveDate,'%Y-%m-%d') reserveDate,
vo.sid,
date_format( vo.reserveDate, '%Y-%m-%d' ) reserveDate,
vo.customerSid,
vo.storeSid,
ls.name storeName,
ls.linker storeLinker,
ls.phone storePhone,
ls.address storeAddress,
vo.affiliation affiliation,
pb.name brandName,
vo.userName userName,
vo.userPhone userPhone,
lb.sid bankSid,
lb.name bankName,
lb.linker bankLinker,
lb.linkPhone bankPhone,
lb.address bankAddress,
vd.goodsSid,
vd.goodsName goodsName,
vd.goodsNumber goodsNumber,
lcb.name customerBank
from vege_cellar_reserve_order vo
LEFT JOIN lpk_store ls ON ls.sid=vo.storeSid
LEFT JOIN lpk_bank lb ON lb.sid=ls.bankSid
left join vege_cellar_reserve_details vd on vo.sid=vd.orderSid
left join lpk_goods lg on vd.goodsSid=lg.skuSid
left join pms_brand pb on pb.id=vo.affiliation
LEFT JOIN lpk_customer lc ON lc.sid=vo.customerSid
LEFT JOIN lpk_customer_bank lcb ON lcb.sid = lc.customerBankSid
case vo.state
when 0 then '待提货'
when 1 then '已提货'
when 2 then '已取消'
end stateValue
FROM
vege_cellar_reserve_details vd
LEFT JOIN vege_cellar_reserve_order vo ON vo.sid = vd.orderSid
<where>
${ew.sqlSegment}
</where>
ORDER BY vo.reserveDate,vo.storeSid,vo.userName,vo.userPhone ASC
-- ORDER BY vo.reserveDate,vo.storeSid,vo.userName,vo.userPhone ASC
ORDER BY vo.reserveDate desc
</select>
<select id="pageOfStore" resultType="com.yxt.ordermall.biz.vegecallerreserveorder.ReserveOrderVo">
select

7
ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java
View File

@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/23 10:35
@@ -33,6 +35,11 @@ public class VegeCellarReserveOrderRest {
public ResultBean cancelReservation(@PathVariable("code") String code) {
return vegeCellarReserveOrderService.cancelReservation(code);
}
@ApiOperation("pc取消预约")
@PostMapping("/pcCancelReservation")
public ResultBean cancelReservation(@RequestBody String [] sids) {
return vegeCellarReserveOrderService.cancelReservation(sids);
}
@ApiOperation("移动端预约订单列表")
@PostMapping("/orderListByUserSid")
public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByUserSid(@RequestBody PagerQuery<VegeCellarReserveOrderQuery> pq) {

107
ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
View File

@@ -22,12 +22,14 @@ import com.yxt.ordermall.api.vegecallerreserveorder.*;
import com.yxt.ordermall.api.vegetablecellar.VegetableCellarDto;
import com.yxt.ordermall.api.vegetablecellar.vegeVo;
import com.yxt.ordermall.biz.cannotreservedictionary.CannotReserveDictionaryService;
import com.yxt.ordermall.biz.func.basebrandinfo.BaseBrandInfoVo;
import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo;
import com.yxt.ordermall.biz.lpkgiftcard.generateRule.UniqueIdGenerator;
import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService;
import com.yxt.ordermall.biz.lpkstore.LpkStoreService;
import com.yxt.ordermall.biz.vegecallerreservedetail.VegeCellarReserveDetailsService;
import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService;
import com.yxt.ordermall.feign.base.basebrandinfo.BaseBrandInfoFeign;
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.ordermall.feign.warehouse.warehouseinfo.WarehouseInfoFeign;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,7 @@ import java.time.LocalTime;
import java.time.ZoneId;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@@ -63,6 +66,8 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
BaseGoodsSkuFeign baseGoodsSkuFeign;
@Autowired
WarehouseInfoFeign warehouseInfoFeign;
@Autowired
BaseBrandInfoFeign baseBrandInfoFeign;
@Transactional(rollbackFor = Exception.class)
public ResultBean submission(VegeCellarReserveOrderDto dto) {
@@ -126,7 +131,38 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
rb=vegetableCellarService.save1Goods(dto);
return rb;
}
@Transactional(rollbackFor = Exception.class)
public ResultBean cancelReservation(String [] sids) {
ResultBean rb = new ResultBean().fail();
List<String> collect = Arrays.stream(sids).distinct().collect(Collectors.toList());
for (String sid : collect) {
List<String> state=new ArrayList<>();
state.add("0");
state.add("1");
VegeCellarReserveOrder vegeCellarReserveOrder = baseMapper.selectOne(new QueryWrapper<VegeCellarReserveOrder>().eq("sid", sid).in("state",state));
if(vegeCellarReserveOrder==null){
return rb.setMsg("预约单不符合取消条件");
}
vegeCellarReserveOrder.setState("2");
baseMapper.updateById(vegeCellarReserveOrder);
List<VegeCellarReserveDetails> list=vegeCellarReserveDetailsService.selByOrderSids(vegeCellarReserveOrder.getSid());
VegetableCellarDto dto=new VegetableCellarDto();
List<vegeVo> vos=new ArrayList<>();
for (VegeCellarReserveDetails details:list){
String brandId=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",details.getGoodsSid())).getBrandId().toString();
vegeVo vo=new vegeVo();
vo.setBrandId(brandId);
vo.setGoodsSid(details.getGoodsSid());
vo.setGoodsNumber(String.valueOf(details.getGoodsNumber()));
vos.add(vo);
}
dto.setVos(vos);
dto.setCustomerSid(vegeCellarReserveOrder.getCustomerSid());
rb=vegetableCellarService.save1Goods(dto);
}
return rb;
}
// public boolean isSatAndSun(String date) {
// DateTime dateTime = DateUtil.parse(date);
@@ -267,33 +303,65 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
if (StrUtil.isNotBlank(query.getEndDate())) {
qw.le("date_format(vo.reserveDate,'%Y-%m-%d')", query.getEndDate());
}
if (StrUtil.isNotBlank(query.getBankSid())) {
qw.eq("lb.sid", query.getBankSid());
if (StrUtil.isNotBlank(query.getAddress())) {
qw.eq("vo.storeSid", query.getAddress());
}
if (StrUtil.isNotBlank(query.getStore())) {
qw.eq("vo.storeSid", query.getStore());
if (StrUtil.isNotBlank(query.getBrand())) {
qw.eq("vo.affiliation", query.getBrand());
}
if (StrUtil.isNotBlank(query.getCardType())) {
qw.eq("vo.affiliation", query.getCardType());
if (StrUtil.isNotBlank(query.getUserName())) {
qw.like("vo.userName", query.getUserName());
}
if (StrUtil.isNotBlank(query.getUserPhone())) {
qw.like("vo.userPhone", query.getUserPhone());
}
if (StrUtil.isNotBlank(query.getGoodsName())) {
qw.like("vd.goodsName", query.getGoodsName());
}
if (StrUtil.isNotBlank(query.getStateValue())) {
qw.eq("vo.state", query.getStateValue());
}
// qw.orderByAsc("vo.reserveDate");
return qw;
}
// public ResultBean<IPage<ReserveOrderVo>> pageOfCustomer(PagerQuery<LpkReserveOrderQuery> pq) {
// ResultBean rb = ResultBean.fireFail();
// LpkReserveOrderQuery query = pq.getParams();
// QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
//// qw.orderByDesc("vo.reserveDate");
// qw.ne("vo.state","2");
// IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
// IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfCustomer(page, qw);
// return rb.success().setData(pagerVo);
// }
public ResultBean<IPage<ReserveOrderVo>> pageOfCustomer(PagerQuery<LpkReserveOrderQuery> pq) {
ResultBean rb = ResultBean.fireFail();
LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
qw.ne("vo.state","2");
// qw.orderByDesc("vo.reserveDate");
// qw.ne("vo.state","2");
IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfCustomer(page, qw);
for (ReserveOrderVo record : pagerVo.getRecords()) {
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(record.getGoodsSid());
if(goodsBySkuSid.getData()!=null){
record.setGoodsName(goodsBySkuSid.getData().getGoodsName());
}
ResultBean<BaseBrandInfoVo> initialization = baseBrandInfoFeign.initialization(record.getAffiliation());
if(initialization.getData()!=null){
record.setBrandName(initialization.getData().getBrandName());
}
ResultBean<WarehouseInfoVo> initialization1 = warehouseInfoFeign.initialization(record.getStoreSid());
if(initialization1.getData()!=null){
record.setStoreName(initialization1.getData().getWarehouseName());
}
}
return rb.success().setData(pagerVo);
}
public Map<String, List<ReserveCustomerExcel>> mapForExcelCustomer(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
qw.ne("vo.state","2");
// qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
Map<String, List<ReserveCustomerExcel>> map = new HashMap<>();
list.forEach(vo -> {
@@ -311,8 +379,23 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
public List<ReserveCustomerExcel> listForExcelCustomer(LpkReserveOrderQuery query) {
QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
qw.ne("vo.state","2");
// qw.ne("vo.state","2");
List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
for (ReserveOrderVo record :list) {
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(record.getGoodsSid());
if(goodsBySkuSid.getData()!=null){
record.setGoodsName(goodsBySkuSid.getData().getGoodsName());
}
ResultBean<BaseBrandInfoVo> initialization = baseBrandInfoFeign.initialization(record.getAffiliation());
if(initialization.getData()!=null){
record.setBrandName(initialization.getData().getBrandName());
}
ResultBean<WarehouseInfoVo> initialization1 = warehouseInfoFeign.initialization(record.getStoreSid());
if(initialization1.getData()!=null){
record.setStoreName(initialization1.getData().getWarehouseName());
}
}
List<ReserveCustomerExcel> volist = new ArrayList<>();
list.forEach(vo -> {
ReserveCustomerExcel ex = new ReserveCustomerExcel();