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-13 09:13:39 +08:00
parent 7466b3dc06
commit 266d10bcd5
8 changed files with 140 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/MyGoodsVo.java
View File

@@ -3,6 +3,7 @@ package com.yxt.ordermall.api.appletgiftbag;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -25,4 +26,8 @@ public class MyGoodsVo {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date periodValidity;
private String state="0";//商品过期状态 0未过期 1已过期
private String packageSpecs;
private double quantityOfPackage;
private String packUnit;
private BigDecimal packprice;
}

8
ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsMapper.xml
View File

@@ -89,6 +89,14 @@
order by createTime desc
</select>
<select id="getGoodsApplet" resultType="com.yxt.ordermall.api.appletgiftbag.MyGoodsVo">
SELECT
r.*
FROM
vegetable_cellar r
WHERE
r.customerSid =#{query.customerSid} and r.affiliation =#{query.affiliation}
</select>
<select id="getGoodsApplet1" resultType="com.yxt.ordermall.api.appletgiftbag.MyGoodsVo">
SELECT
s.sid AS goodsSid,
date_format( s.createTime, '%Y-%m-%d' ) AS createTime,

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

@@ -21,6 +21,7 @@ import com.yxt.ordermall.api.lpkgoods.*;
import com.yxt.ordermall.api.shoppingcart.ShoppingCart;
import com.yxt.ordermall.api.shoppingcart.ShoppingCartQuery;
import com.yxt.ordermall.api.shoppingcart.ShoppingCartVo;
import com.yxt.ordermall.api.vegetablecellar.VegetableCellar;
import com.yxt.ordermall.biz.enterprisecertification.EnterpriseCertificationService;
import com.yxt.ordermall.biz.func.basebrandinfo.BaseBrandInfoVo;
import com.yxt.ordermall.biz.func.basegoodssku.*;
@@ -34,6 +35,7 @@ import com.yxt.ordermall.biz.func.commonmethod.CommonMethod;
import com.yxt.ordermall.biz.func.commonmethod.DataRule;
import com.yxt.ordermall.biz.lpkcustomer.LpkCustomerService;
import com.yxt.ordermall.biz.shoppingcart.ShoppingCartService;
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.base.basegoodsspu.BaseGoodsSpuFeign;
@@ -53,6 +55,7 @@ import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@@ -81,6 +84,8 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
BaseGoodsTypeFeign baseGoodsTypeFeign;
@Autowired
BaseBrandInfoFeign baseBrandInfoFeign;
@Autowired
VegetableCellarService vegetableCellarService;
public ResultBean<PagerVo<LpkGoodsVo>> goodsListPage(PagerQuery<LpkGoodsQuery> pq) {
ResultBean rb = ResultBean.fireFail();
@@ -380,13 +385,38 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
}
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
query.setNow(sdf.format(new Date()));
List<MyGoodsVo> vo =baseMapper.getGoodsApplet(query);
vo.forEach(s->{
double i=Double.valueOf(s.getGoodsNumber());
s.setGoodsNumber(DoubleUtils.removeZeros(String.valueOf((int)i)));
s.setWeight(DoubleUtils.removeZeros(s.getWeight()));
s.setIconUrl(fileUploadComponent.getUrlPrefix()+s.getIconUrl());
});
List<MyGoodsVo> goodsApplet = baseMapper.getGoodsApplet(query);
List<MyGoodsVo> vo = new ArrayList<>();
if(goodsApplet.size()!=0){
List<String > strings=goodsApplet.stream().map(s->s.getGoodsSid()).collect(Collectors.toList());
ResultBean<List<GoodsSkuDetailVo>> goodsInSkuSid = baseGoodsSkuFeign.getGoodsInSkuSid(strings);
if(!goodsInSkuSid.getCode().equals("200")){
return goodsInSkuSid;
}
for (GoodsSkuDetailVo datum : goodsInSkuSid.getData()) {
for (MyGoodsVo myGoodsVo : goodsApplet) {
if(myGoodsVo.getGoodsSid().equals(datum.getSkuSid())){
MyGoodsVo vo1=new MyGoodsVo();
vo1.setGoodsSid(datum.getSkuSid());
vo1.setName(datum.getGoodsName());
vo1.setSpecificationUnit(datum.getSPackUnit());
vo1.setCount("0");
vo1.setGoodsNumber(myGoodsVo.getGoodsNumber());
if(StringUtils.isNotBlank(datum.getPicUrl())){
vo1.setIconUrl(fileUploadComponent.getUrlPrefix()+datum.getPicUrl());
}
vo1.setWeight(datum.getTitle());
vo1.setPackageSpecs(datum.getSPackageSpecs());
vo1.setPackprice(datum.getSPackPrice());
vo1.setPackUnit(datum.getSPackUnit());
vo1.setQuantityOfPackage(datum.getSQuantityOfPackage());
vo.add(vo1);
}
}
}
}
return rb.success().setData(vo);
}
public ResultBean<PagerVo<MyGoodsVo>> vegeCellarInvalidList(PagerQuery<LpkGoodsQuery> pq) {
@@ -423,19 +453,23 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
return rb.setMsg("参数不全");
}
List<GoodsTypeVo> vo =new ArrayList<>();
List<BrandVo> list1= IPmsBrandService.getList().getData();
for (BrandVo brandVo : list1) {
OrgPathQuery orgPathQuery=new OrgPathQuery();
orgPathQuery.setOrgPath(query.getOrgPath());
ResultBean<List<BaseBrandInfoVo>> listResultBean = baseBrandInfoFeign.listAll(orgPathQuery);
if(!listResultBean.getCode().equals("200")){
return listResultBean;
}
for (BaseBrandInfoVo datum : listResultBean.getData()) {
GoodsTypeVo vo1=new GoodsTypeVo();
query.setAffiliation(brandVo.getId());
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
query.setNow(sdf.format(new Date()));
List<MyGoodsVo> myGoodsVos =baseMapper.getGoodsApplet(query);
vo1.setName(brandVo.getBrandName());
vo1.setId(brandVo.getId());
vo1.setSid(brandVo.getId());
vo1.setCount(String.valueOf(myGoodsVos.size()));
query.setAffiliation(datum.getSid());
List<VegetableCellar> list = vegetableCellarService.list(new QueryWrapper<VegetableCellar>().eq("customerSid", query.getCustomerSid()).eq("affiliation", query.getAffiliation()));
vo1.setName(datum.getBrandName());
vo1.setId(datum.getSid());
vo1.setSid(datum.getSid());
vo1.setCount(String.valueOf(list.size()));
vo.add(vo1);
}
return rb.success().setData(vo);
}
public ResultBean<List<GoodsTypeVo>> getAllType() {

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

@@ -573,8 +573,31 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
}
}
for (OrdOrderDetail detail : details) {
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", detail.getGoodsSid()));
urls.add(fileUploadComponent.getUrlPrefix() + lpkGoods.getPicUrl());
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.setCount(String.valueOf(details.size()));
record.setPicUrls(urls);
@@ -586,7 +609,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
return rb.success().setData(p);
}
public ResultBean<OrdOrderVo> getOrderDetails(String sid) {
public ResultBean getOrderDetails(String sid) {
ResultBean rb = new ResultBean().fail();
OrdOrderVo pagging = baseMapper.getOrderDetails(sid);
if (StringUtils.isBlank(sid)) {
@@ -599,11 +622,17 @@ 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")){
return goodsBySkuSid;
}
// 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());
}
}
pagging.setOrdOrderDetails(details);
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

10
ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartMapper.xml
View File

@@ -6,6 +6,16 @@
<select id="ShoppingCartList" resultType="com.yxt.ordermall.api.shoppingcart.ShoppingCartVo">
select
r.*
from shopping_cart as r
left join lpk_goods s on s.skuSid=r.goodsSid
<where>
r.customerSid =#{customerSid} and r.affiliation=#{brandId}
and s.isAppletGrounding=1 and s.useTo=1
</where>
</select>
<select id="ShoppingCartList1" resultType="com.yxt.ordermall.api.shoppingcart.ShoppingCartVo">
select
r.*,s.unitName,
s.price as jPrice,

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

@@ -26,6 +26,7 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@@ -86,11 +87,28 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
Date date=new Date();
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());
ResultBean<List<GoodsSkuDetailVo>> goodsInSkuSid = baseGoodsSkuFeign.getGoodsInSkuSid(collect);
if(!goodsInSkuSid.getCode().equals("200")){
rb.setCode(goodsInSkuSid.getCode());
rb.setMsg(goodsInSkuSid.getMsg());
return rb;
}
for (GoodsSkuDetailVo datum : goodsInSkuSid.getData()) {
for (ShoppingCartVo shoppingCartVo : list) {
if(datum.getSkuSid().equals(shoppingCartVo.getGoodsSid())){
shoppingCartVo.setGoodsName(datum.getGoodsName());
shoppingCartVo.setUnitName(datum.getGoodsUnitName());
shoppingCartVo.setPrice(datum.getSalesPrice());
if(StringUtils.isNotBlank(datum.getPicUrl())){
shoppingCartVo.setIconUrl(datum.getPicUrl());
}
shoppingCartVo.setRemarks(datum.getIndexes());
}
}
}
list.forEach(s -> {
s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getJPrice()) * Double.valueOf(s.getGoodsNumber())))));
s.setIconUrl(fileUploadComponent.getUrlPrefix() + s.getIconUrl());
});
return rb.success().setData(list).setMsg("成功");

3
ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeign.java
View File

@@ -46,4 +46,7 @@ public interface BaseGoodsSkuFeign {
@ApiOperation("采购单选择商品")
@GetMapping("/getGoodsBySkuSid/{skuSid}")
public ResultBean<GoodsSkuDetailVo> getGoodsBySkuSid(@PathVariable("skuSid") String skuSid);
@ApiOperation("采购单选择商品")
@PostMapping("/getGoodsInSkuSid")
public ResultBean<List<GoodsSkuDetailVo>> getGoodsInSkuSid(@RequestBody List<String> skuSids);
}

5
ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java
View File

@@ -55,4 +55,9 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
public ResultBean<GoodsSkuDetailVo> getGoodsBySkuSid(String skuSid) {
return null;
}
@Override
public ResultBean<List<GoodsSkuDetailVo>> getGoodsInSkuSid(List<String> skuSids) {
return null;
}
}