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

商品后台接口统一字段

Browse Source
This commit is contained in:
wangpengfei
2024-12-16 11:18:38 +08:00
parent 266d10bcd5
commit cb42190b25
15 changed files with 161 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ordermall/src/main/java/com/yxt/ordermall/api/ordorderdetails/OrdOrderDetail.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.UUID;
@@ -33,5 +34,14 @@ public class OrdOrderDetail {
@TableField(exist = false)
private String specificationUnit;//份
@TableField(exist = false)
private String packageSpecs;//份
@TableField(exist = false)
private double quantityOfPackage;//份
@TableField(exist = false)
private String packUnit;//份
@TableField(exist = false)
private BigDecimal packprice;//份
@TableField(exist = false)
private String weight;//份
}

14
ordermall/src/main/java/com/yxt/ordermall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java
View File

@@ -1,10 +1,12 @@
package com.yxt.ordermall.api.transferrecordsgoodsdetails;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import com.yxt.ordermall.api.vegecallerreserveorder.OrderGoodsVo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -42,4 +44,16 @@ public class TransferRecordsGoodsDetailsVo implements Vo {
private String linkPhone;
private String address;
private String cardType;
@TableField(exist = false)
private String packageSpecs;//份
@TableField(exist = false)
private double quantityOfPackage;//份
@TableField(exist = false)
private String packUnit;//份
@TableField(exist = false)
private BigDecimal packprice;//份
@TableField(exist = false)
private String weight;//份
private String unitName;
private String specificationUnit;
}

7
ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/LpkCustomerService.java
View File

@@ -93,7 +93,12 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
if (!jsonObject.containsKey("openid")) {
return rb.setMsg("未获得openid，请联系管理员");
}
String unionid = jsonObject.get("unionid").toString();
WxResult wxResult=JSON.toJavaObject(jsonObject,WxResult.class);
String unionid="";
if(StringUtils.isNotBlank(wxResult.getUnionid())){
unionid = wxResult.getUnionid();
}
String openid = jsonObject.get("openid").toString();
Map<String, String> map = new HashMap<>();
map.put("unionid",unionid);

14
ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/WxResult.java Normal file
View File

@@ -0,0 +1,14 @@
package com.yxt.ordermall.biz.lpkcustomer;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/12/16 11:00
*/
@Data
public class WxResult {
private String unionid;
private String openid;
private String session_key;
}

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

@@ -411,6 +411,7 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
vo1.setPackprice(datum.getSPackPrice());
vo1.setPackUnit(datum.getSPackUnit());
vo1.setQuantityOfPackage(datum.getSQuantityOfPackage());
vo1.setUnitName(datum.getGoodsUnitName());
vo.add(vo1);
}
}

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

@@ -629,10 +629,16 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
// LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", detail.getGoodsSid()));
if(StringUtils.isNotBlank(goodsBySkuSid.getData().getPicUrl())){
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());
}
detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份");
detail.setUnitName(goodsBySkuSid.getData().getGoodsUnitName());
detail.setSpecificationUnit(goodsBySkuSid.getData().getSPackUnit());
detail.setPackageSpecs((goodsBySkuSid.getData().getSPackageSpecs()));
detail.setPackprice((goodsBySkuSid.getData().getSPackPrice()));
detail.setPackUnit((goodsBySkuSid.getData().getSPackUnit()));
detail.setQuantityOfPackage(goodsBySkuSid.getData().getSQuantityOfPackage());
detail.setWeight(goodsBySkuSid.getData().getTitle());
}
pagging.setOrdOrderDetails(details);
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

20
ordermall/src/main/java/com/yxt/ordermall/biz/refundorder/RefundOrderService.java
View File

@@ -12,10 +12,12 @@ import com.yxt.ordermall.api.refundorder.RefundOrderDto;
import com.yxt.ordermall.api.vegetablecellar.VegetableCellar;
import com.yxt.ordermall.api.vegetablecellar.VegetableCellarDto;
import com.yxt.ordermall.api.vegetablecellar.vegeVo;
import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo;
import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService;
import com.yxt.ordermall.biz.ordorder.OrdOrderService;
import com.yxt.ordermall.biz.ordorderdetails.OrdOrderDetailService;
import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService;
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -43,6 +45,8 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
LpkGoodsService lpkGoodsService;
@Autowired
VegetableCellarService vegetableCellarService;
@Autowired
BaseGoodsSkuFeign baseGoodsSkuFeign;
@@ -57,7 +61,7 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
for (OrdOrderDetail detail : w) {
LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>()
.eq("sid",detail.getGoodsSid())
.eq("skuSid",detail.getGoodsSid())
.apply("date_format(periodValidity,'%Y-%m-%d') >= date_format ('"+sdf.format(new Date())+"','%Y-%m-%d')"));
if(goods==null){
return rb.setMsg(detail.getGoodsName()+"商品不在有效期内，无法退款");
@@ -108,7 +112,12 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
OrdOrder order=ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("mainSid",mainSid));
List<OrdOrderDetail> detailList=ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",order.getSid()));
for(OrdOrderDetail detail:detailList){
LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",detail.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
return goodsBySkuSid;
}
cl.setBrandId(goodsBySkuSid.getData().getBrandSid());
VegetableCellar vegetableCellar=vegetableCellarService.getOne(new QueryWrapper<VegetableCellar>().eq("customerSid",order.getUserSid())
.eq("goodsSid",detail.getGoodsSid()).eq("affiliation",cl.getBrandId()));
// if(vegetableCellar.getGoodsNumber().equals(String.valueOf(detail.getPartNumber()))){
@@ -126,7 +135,12 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
List<OrdOrderDetail> detailList=ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",order.getSid()));
List<vegeVo> vos =new ArrayList<>();
for (OrdOrderDetail detail : detailList) {
LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",detail.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
return goodsBySkuSid;
}
goods.setBrandId(goodsBySkuSid.getData().getBrandSid());
vegeVo vo=new vegeVo();
vo.setBrandId(String.valueOf(goods.getBrandId()));
vo.setGoodsSid(detail.getGoodsSid());

4
ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java
View File

@@ -88,6 +88,9 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
String periodValidity=sdf.format(date);
List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId());
List<String> collect = list.stream().map(s -> s.getGoodsSid()).collect(Collectors.toList());
if(collect.size()==0){
return rb.success().setData(list);
}
ResultBean<List<GoodsSkuDetailVo>> goodsInSkuSid = baseGoodsSkuFeign.getGoodsInSkuSid(collect);
if(!goodsInSkuSid.getCode().equals("200")){
rb.setCode(goodsInSkuSid.getCode());
@@ -100,6 +103,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
shoppingCartVo.setGoodsName(datum.getGoodsName());
shoppingCartVo.setUnitName(datum.getGoodsUnitName());
shoppingCartVo.setPrice(datum.getSalesPrice());
shoppingCartVo.setJPrice(datum.getSalesPrice());
if(StringUtils.isNotBlank(datum.getPicUrl())){
shoppingCartVo.setIconUrl(datum.getPicUrl());
}

2
ordermall/src/main/java/com/yxt/ordermall/biz/transferrecords/TransferRecordsRest.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
* @author wangpengfei
* @date 2023/11/23 10:35
*/
@Api(tags = "预约订单信息")
@Api(tags = "转赠订单信息")
@RestController
@RequestMapping("transferrecords")
public class TransferRecordsRest {

38
ordermall/src/main/java/com/yxt/ordermall/biz/transferrecords/TransferRecordsService.java
View File

@@ -21,9 +21,11 @@ import com.yxt.ordermall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDet
import com.yxt.ordermall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDetailsVo;
import com.yxt.ordermall.api.vegecallerreserveorder.OrderGoodsVo;
import com.yxt.ordermall.api.vegecallerreserveorder.VegeCellarReserveOrder;
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.transferrecordsgoodsdetails.TransferRecordsGoodsDetailsService;
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.ordermall.utils.DoubleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,6 +47,8 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
TransferRecordsGoodsDetailsService transferRecordsGoodsDetailsService;
@Autowired
LpkGoodsService lpkGoodsService;
@Autowired
BaseGoodsSkuFeign baseGoodsSkuFeign;
@Transactional(rollbackFor = Exception.class)
@@ -82,15 +86,27 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
List<TransferRecordsGoodsDetailsVo> vos=new ArrayList<>();
for (TransferRecordsGoodsDetails transferRecordsGoodsDetails : list) {
TransferRecordsGoodsDetailsVo vo=new TransferRecordsGoodsDetailsVo();
LpkGoods k=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",transferRecordsGoodsDetails.getGoodsSid()));
LpkGoods k=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",transferRecordsGoodsDetails.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(transferRecordsGoodsDetails.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
return goodsBySkuSid;
}
k.setName(goodsBySkuSid.getData().getGoodsName());
transferRecordsGoodsDetails.setGoodsName(k.getName());
// transferRecordsGoodsDetails.setRemarks(DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()))+"份");
BeanUtil.copyProperties(transferRecordsGoodsDetails,vo);
vo.setGoodsContent(k.getContent());
// vo.setGoodsContent(k.getContent());
vo.setGoodsFs("共"+DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()))+"份");
vo.setGoodsJs("合计"+DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()*Double.valueOf(k.getWeight())))+"斤");
vo.setPrice(DoubleUtils.removeZeros(String.valueOf(Double.valueOf(k.getPrice())*Double.valueOf(k.getWeight())))+"元/斤");
vo.setGoodsPicUrl(fileUploadComponent.getUrlPrefix()+k.getPicUrl());
// vo.setGoodsJs("合计"+DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()*Double.valueOf(k.getWeight())))+"斤");
// vo.setPrice(DoubleUtils.removeZeros(String.valueOf(Double.valueOf(k.getPrice())*Double.valueOf(k.getWeight())))+"元/斤");
vo.setGoodsPicUrl(fileUploadComponent.getUrlPrefix()+goodsBySkuSid.getData().getPicUrl());
vo.setPackageSpecs(goodsBySkuSid.getData().getSPackageSpecs());
vo.setPackprice(goodsBySkuSid.getData().getSPackPrice());
vo.setPackUnit(goodsBySkuSid.getData().getSPackUnit());
vo.setQuantityOfPackage(goodsBySkuSid.getData().getSQuantityOfPackage());
vo.setWeight(goodsBySkuSid.getData().getTitle());
vo.setUnitName(goodsBySkuSid.getData().getGoodsUnitName());
vo.setSpecificationUnit(goodsBySkuSid.getData().getSPackUnit());
vos.add(vo);
}
transferRecordsVo.setList(vos);
@@ -117,12 +133,22 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
for(TransferRecordsVo vo:pagging.getRecords()){
List<TransferRecordsGoodsDetails> goods =transferRecordsGoodsDetailsService.selByOrderSids(vo.getSid());
for(TransferRecordsGoodsDetails goods1:goods){
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid()));
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",goods1.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
return goodsBySkuSid;
}
if(lpkGoods==null){
continue;
}
lpkGoods.setName(goodsBySkuSid.getData().getGoodsName());
lpkGoods.setUnitName(goodsBySkuSid.getData().getGoodsUnitName());
// OrderGoodsVo orderGoodsVo=new OrderGoodsVo();
// orderGoodsVo.setGoodName(lpkGoods.getName());
// orderGoodsVo.setNum(Integer.parseInt(goods1.getNum()));
// orderGoodsVo.setUnitName(lpkGoods.getUnitName());
// goodsVo.add(orderGoodsVo);
if(StringUtils.isBlank(vo.getGoodss())){
vo.setGoodss(lpkGoods.getName()+"："+removeZeros(String.valueOf(goods1.getGoodsNumber()))+lpkGoods.getUnitName());
}else{

11
ordermall/src/main/java/com/yxt/ordermall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsService.java
View File

@@ -10,8 +10,10 @@ import com.yxt.ordermall.api.lpkgoods.LpkGoods;
import com.yxt.ordermall.api.transferrecords.TransferRecordsDto;
import com.yxt.ordermall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDetails;
import com.yxt.ordermall.api.vegetablecellar.VegetableCellar;
import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo;
import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService;
import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService;
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +30,8 @@ public class TransferRecordsGoodsDetailsService extends MybatisBaseService<Trans
VegetableCellarService vegetableCellarService;
@Autowired
LpkGoodsService lpkGoodsService;
@Autowired
BaseGoodsSkuFeign baseGoodsSkuFeign;
public ResultBean<TransferRecordsGoodsDetails> getReserveByCardSid(String carSid, String goodsSid) {
ResultBean rb = new ResultBean();
@@ -47,7 +51,12 @@ public class TransferRecordsGoodsDetailsService extends MybatisBaseService<Trans
goods.setGoodsNumber(goods1.getSelect());
goods.setCreateTime(new DateTime());
baseMapper.insert(goods);
LpkGoods l= lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid()));
LpkGoods l= lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",goods1.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
return rb.setMsg(goodsBySkuSid.getCode());
}
l.setBrandId(goodsBySkuSid.getData().getBrandSid());
VegetableCellar vegetableCellar= vegetableCellarService.list(new QueryWrapper<VegetableCellar>().eq("customerSid",dto.getCustomerSid())
.eq("goodsSid",goods1.getGoodsSid()).eq("affiliation",l.getBrandId())).get(0);
double d=Double.valueOf(vegetableCellar.getGoodsNumber());

13
ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java
View File

@@ -12,8 +12,10 @@ import com.yxt.ordermall.api.vegecallerreservedetails.VegeCellarReserveDetails;
import com.yxt.ordermall.api.vegecallerreserveorder.VegeCellarReserveOrderDto;
import com.yxt.ordermall.api.vegetablecellar.VegetableCellar;
import com.yxt.ordermall.biz.customerstore.CustomerStoreService;
import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo;
import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService;
import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService;
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,6 +34,8 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService<VegeCell
CustomerStoreService customerStoreService;
@Autowired
LpkGoodsService lpkGoodsService;
@Autowired
BaseGoodsSkuFeign baseGoodsSkuFeign;
public ResultBean<VegeCellarReserveDetails> getReserveByCardSid(String carSid, String goodsSid) {
@@ -48,12 +52,17 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService<VegeCell
for (GoodsVo goods1 : dto.getGoodsVos()) {
if (goods1.getSelect() != 0) {
// goods.setCardSid(dto.getSid());
LpkGoods goods2=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid()));
LpkGoods goods2=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",goods1.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
return goodsBySkuSid;
}
goods.setGoodsSid(goods1.getGoodsSid());
goods.setGoodsNumber(goods1.getSelect());
goods.setGoodsName(goods2.getName());
goods.setGoodsName(goodsBySkuSid.getData().getGoodsName());
goods.setCreateTime(new DateTime());
goods.setOrderSid(dto.getOrderSid());
goods2.setBrandId(goodsBySkuSid.getData().getBrandSid());
baseMapper.insert(goods);
VegetableCellar vegetableCellar= vegetableCellarService.list(new QueryWrapper<VegetableCellar>().eq("customerSid",dto.getCustomerSid())
.eq("goodsSid",goods1.getGoodsSid()).eq("affiliation",goods2.getBrandId())).get(0);

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

@@ -14,8 +14,8 @@
o.userName,
o.userPhone,
case o.state
when 0 then '待提菜'
when 1 then '已提菜'
when 0 then '待提货'
when 1 then '已提货'
end stateValue ,
case o.affiliation
when 1001000 then '百姓菜窖'
@@ -99,7 +99,7 @@
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.sid
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
@@ -130,7 +130,7 @@
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.sid
left join lpk_goods lg on vd.goodsSid=lg.skuSid
left join pms_brand pb on pb.id=vo.affiliation
<where>
${ew.sqlSegment}
@@ -155,7 +155,7 @@
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.sid
left join lpk_goods lg on vd.goodsSid=lg.skuSid
left join pms_brand pb on pb.id=vo.affiliation
<where>
${ew.sqlSegment}
@@ -173,7 +173,7 @@
sum(vd.goodsNumber) goodsNumber
from vege_cellar_reserve_order vo
left join vege_cellar_reserve_details vd on vo.sid=vd.orderSid
left join lpk_goods lg on vd.goodsSid=lg.sid
left join lpk_goods lg on vd.goodsSid=lg.skuSid
left join pms_brand pb on pb.id=vo.affiliation
<where>
${ew.sqlSegment}

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

@@ -21,11 +21,13 @@ 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.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.basegoodssku.BaseGoodsSkuFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +57,8 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
CannotReserveDictionaryService cannotReserveDictionaryService;
@Autowired
VegetableCellarService vegetableCellarService;
@Autowired
BaseGoodsSkuFeign baseGoodsSkuFeign;
@Transactional(rollbackFor = Exception.class)
public ResultBean submission(VegeCellarReserveOrderDto dto) {
@@ -180,7 +184,17 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
List<VegeCellarReserveDetails> goods = vegeCellarReserveDetailsService.selByOrderSids(vo.getSid());
List<OrderGoodsVo> goodsVo = new ArrayList<>();
for (VegeCellarReserveDetails goods1 : goods) {
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid", goods1.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
rb.setMsg(goodsBySkuSid.getMsg());
return rb;
}
if(null==lpkGoods){
continue;
}
lpkGoods.setName(goodsBySkuSid.getData().getGoodsName());
lpkGoods.setUnitName(goodsBySkuSid.getData().getGoodsUnitName());
OrderGoodsVo orderGoodsVo=new OrderGoodsVo();
orderGoodsVo.setGoodName(lpkGoods.getName());
orderGoodsVo.setNum(Integer.parseInt(goods1.getNum()));

11
ordermall/src/main/java/com/yxt/ordermall/biz/vegetablecellar/VegetableCellarService.java
View File

@@ -14,6 +14,7 @@ import com.yxt.ordermall.api.shoppingcart.ShoppingCart;
import com.yxt.ordermall.api.transferrecords.TransferRecords;
import com.yxt.ordermall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDetails;
import com.yxt.ordermall.api.vegetablecellar.*;
import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo;
import com.yxt.ordermall.biz.lpkcustomer.LpkCustomerService;
import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService;
import com.yxt.ordermall.biz.newcomerrecorecord.NewcomerRecoRecordService;
@@ -23,6 +24,7 @@ import com.yxt.ordermall.biz.recommendnewuserbagdetails.RecommendNewUserBagDetai
import com.yxt.ordermall.biz.shoppingcart.ShoppingCartService;
import com.yxt.ordermall.biz.transferrecords.TransferRecordsService;
import com.yxt.ordermall.biz.transferrecordsgoodsdetails.TransferRecordsGoodsDetailsService;
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -58,6 +60,8 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
RecommendNewUserBagDetailsService recommendNewUserBagDetailsService;
@Autowired
VegetableCellarService vegetableCellarService;
@Autowired
BaseGoodsSkuFeign baseGoodsSkuFeign;
@Transactional(rollbackFor = Exception.class)
public ResultBean addGoods(String mainSid) {
ResultBean rb = ResultBean.fireFail();
@@ -174,7 +178,12 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
}
List<TransferRecordsGoodsDetails>list=transferRecordsGoodsDetailsService.list(new QueryWrapper<TransferRecordsGoodsDetails>().eq("orderSid",dto.getTransferSid()));
for(TransferRecordsGoodsDetails detail:list){
LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",detail.getGoodsSid()));
ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid());
if(!goodsBySkuSid.getCode().equals("200")){
return goodsBySkuSid;
}
cl.setBrandId(goodsBySkuSid.getData().getBrandSid());
VegetableCellar vegetableCellar=baseMapper.selectOne(new QueryWrapper<VegetableCellar>().eq("customerSid",dto.getCustomerSid())
.eq("goodsSid",detail.getGoodsSid()).eq("affiliation",cl.getBrandId()));
if(vegetableCellar==null){