Browse Source

商品后台接口统一字段

master
wangpengfei 6 months ago
parent
commit
a3739834ac
  1. 10
      ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoodss.java
  2. 1
      ordermall/src/main/java/com/yxt/ordermall/api/lpkcustomer/LpkCustomer.java
  3. 1
      ordermall/src/main/java/com/yxt/ordermall/api/lpkgiftcard/LpkGiftCardQuery.java
  4. 5
      ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDetailsVo.java
  5. 6
      ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDto.java
  6. 85
      ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuDetailVo.java
  7. 40
      ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuSelectQuery.java
  8. 2
      ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsRest.java
  9. 99
      ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java
  10. 5
      ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartMapper.java
  11. 3
      ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartMapper.xml
  12. 77
      ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java
  13. 8
      ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeign.java
  14. 10
      ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java

10
ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoodss.java

@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
@ -15,6 +16,7 @@ public class GiftBagGoodss {
private String goodsSid; private String goodsSid;
private String goodsNumber = "0";//份数 private String goodsNumber = "0";//份数
private String name; //商品名 private String name; //商品名
private String title; //商品名
private String unitName; //单位 private String unitName; //单位
private String price; //商品单价 private String price; //商品单价
private String iconUrl;//图片 private String iconUrl;//图片
@ -33,6 +35,10 @@ public class GiftBagGoodss {
private Date periodValidity; private Date periodValidity;
private String state="0"; private String state="0";
private String remarks; private String remarks;
private String packageSpecs;
private double quantityOfPackage;
private String packUnit;
private BigDecimal packprice;
@ -46,10 +52,10 @@ public class GiftBagGoodss {
e.printStackTrace(); e.printStackTrace();
} }
} }
int js = 1; double js = 1;
if (StrUtil.isNotBlank(weight)) { if (StrUtil.isNotBlank(weight)) {
try { try {
js = Integer.parseInt(weight); js = Double.parseDouble(weight);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

1
ordermall/src/main/java/com/yxt/ordermall/api/lpkcustomer/LpkCustomer.java

@ -48,5 +48,6 @@ public class LpkCustomer {
@ApiModelProperty("客户绑定的支行sid") @ApiModelProperty("客户绑定的支行sid")
private String customerBankSid; private String customerBankSid;
@TableField(exist = false)
private String orgPath; private String orgPath;
} }

1
ordermall/src/main/java/com/yxt/ordermall/api/lpkgiftcard/LpkGiftCardQuery.java

@ -18,4 +18,5 @@ public class LpkGiftCardQuery implements Query {
private String brandId; private String brandId;
private String categoryId; private String categoryId;
private String periodValidity; private String periodValidity;
private String orgPath;
} }

5
ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDetailsVo.java

@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
@ -61,4 +62,8 @@ public class LpkGoodsDetailsVo implements Vo {
private String useOrgSid; private String useOrgSid;
private String createOrgSid; private String createOrgSid;
private String userSid; private String userSid;
private String packageSpecs;
private double quantityOfPackage;
private String packUnit;
private BigDecimal packprice;
} }

6
ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsDto.java

@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* @author wangpengfei * @author wangpengfei
* @date 2023/11/21 15:13 * @date 2023/11/21 15:13
@ -47,4 +49,8 @@ public class LpkGoodsDto implements Dto {
private String userSid; private String userSid;
private String signSid;//标识sid 用于两端系统相对应 private String signSid;//标识sid 用于两端系统相对应
private String skuSid; private String skuSid;
private String packageSpecs;
private double quantityOfPackage;
private String packUnit;
private BigDecimal packprice;
} }

85
ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuDetailVo.java

@ -0,0 +1,85 @@
package com.yxt.ordermall.biz.func.basegoodssku;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author wangpengfei
* @date 2024/12/10 13:46
*/
@Data
public class GoodsSkuDetailVo {
private String sid;
private String spuSid;
private String goodsCode;//商品代码
private String barCode;//条形码
private String goodsName;//商品名称
private String subTitle;//副标题
private String goodsPY;//拼音缩写
private String goodsShortName;//商品简称
private String goodsTypeSid;//商品分类sid
private String goodsTypeName;//商品分类sid
private String brandSid;//品牌sid
private String brandName;//品牌sid
private String manufacturerSid;//厂家sid
private String manufacturerName;//厂家sid
private String goodsUnitSid;//商品单位sid
private String goodsUnitName;//商品单位名称
private String taxRate;//税率
private String shelfLife;//保质期天
private String nationalStandardCode;//国标码
private String sortNo;//排序
private String externalCode;//外部编码
private String factoryCode;//厂家货号
private String isListed;//是否上架
private String useOrgSid;//使用组织sid(部门sid)
private String createOrgSid;//创建组织sid(单位sid)
private String goodsLevelKey;//商品等级Key
private String goodsLevelValue;//商品等级value(数据字典,如A、B、C)
private String goodsClassKey;//商品类型key
private String goodsClassValue;//商品类型value(数据字典,如正常商品、赠品、耗材等)
//---------sku detail
private String spuDetailSid;
private String goodsExplain;
private String goodsDescription;
private String generic_spec;
private String special_spec;
private String skuSid;
private String goodsSkuCode;
private String title;//商品标题
private String skuExternalCode;//外部编码
private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合,如0_0_0,1_0_0,相当于SKU这条记录的编码
private String own_spec;//sku的特有规格参数键值对,json格式,反序列化时请使用linkedHashMap,保证有序
private String skuBarCode;//条形码
private String aidBarCode;//辅助条码
private String finalPurchasePrice;//最后采购价
private String safetyStockDays;//安全库存天数
private String isOriginalFactory;//是否原厂 1 是 2否
private String isInventoryAlert;//是否库存警戒 1是 2否
private String InventoryAlertUpperLimit;//库存警戒上线
private String InventoryAlertLowerLimit;//库存警戒下线
private String costPrice;//成本价
private String tagPrice;//吊牌价
private String salesPrice;//销售单价
private String standardPurchasePrice;//标准进价
private String agencyPrice;//代理价
private String discount;//折扣
private String minimumSalesPrice;//最低零售价
private String isLockingSalesPrice;//是否锁定销售价
private String isIntegralExchange;//是否可以积分兑换
private String integralAmount;//积分数量
private String picUrl;//商品的图片,多个图片以‘,’分割
private String weight;//重量
private String volume;//体积(长*宽*高)
private String vLength;//长
private String vWidth;//宽
private String vHeight;//高
private String sPackageSpecs;//包装规格(如1*30包,1*300ml)
private double sQuantityOfPackage;//包装内数量
private String sPackUnit;//包装单价
private BigDecimal sPackPrice;//包装单价
}

40
ordermall/src/main/java/com/yxt/ordermall/biz/func/basegoodssku/GoodsSkuSelectQuery.java

@ -0,0 +1,40 @@
package com.yxt.ordermall.biz.func.basegoodssku;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/3/21
**/
@Data
public class GoodsSkuSelectQuery implements Query {
private String createOrgSid;
//商品编码
private String goodsCode;
//商品名称
private String goodsName;
//条形码
private String barCode;
//规格编码
private String goodsSkuCode;
//规格型号
private String title;
//具体规格
private String ownSpec;
//品牌
private String brandName;
private String brandSid;
//厂家
private String manufacturerName;
private String manufacturerSid;
//分类
private String typeName;
private String typeSid;
//厂家货号
private String manufacturerCode;
}

2
ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsRest.java

@ -100,7 +100,7 @@ public class LpkGoodsRest {
return lpkGoodsService.getAllType(); return lpkGoodsService.getAllType();
} }
@ApiOperation("获取所有的商品类型和品牌") @ApiOperation("获取所有的商品类型和品牌")
@GetMapping("/getGoodsTypeAndBrand") @PostMapping("/getGoodsTypeAndBrand")
public ResultBean getGoodsTypeAndBrand(@RequestBody OrgPathQuery query) { public ResultBean getGoodsTypeAndBrand(@RequestBody OrgPathQuery query) {
return lpkGoodsService.getGoodsTypeAndBrand(query); return lpkGoodsService.getGoodsTypeAndBrand(query);
} }

99
ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java

@ -94,8 +94,9 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
List<LpkGoodsVo> records = new ArrayList<>(); List<LpkGoodsVo> records = new ArrayList<>();
PagerVo vo=new PagerVo(); PagerVo vo=new PagerVo();
BeanUtil.copyProperties(sku.getData(),vo); BeanUtil.copyProperties(sku.getData(),vo);
LpkGoodsVo vv=new LpkGoodsVo();
for (GoodsSkuVo1 record : sku.getData().getRecords()) { for (GoodsSkuVo1 record : sku.getData().getRecords()) {
LpkGoodsVo vv=new LpkGoodsVo();
vv.setCreateTime(new Date()); vv.setCreateTime(new Date());
vv.setCode(record.getGoodsCode()); vv.setCode(record.getGoodsCode());
vv.setPrice(record.getSalesPrice()); vv.setPrice(record.getSalesPrice());
@ -150,8 +151,11 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
String path = dto.getPicUrl().substring(urlPrefix.length()); String path = dto.getPicUrl().substring(urlPrefix.length());
extendDto.setPicUrl(path); extendDto.setPicUrl(path);
} }
extendDto.setPackUnit(dto.getUnitName()); extendDto.setPackUnit(dto.getPackUnit());
extendDto.setSalesPrice(dto.getPrice()); extendDto.setSalesPrice(dto.getPrice());
extendDto.setPackPrice(dto.getPackprice());
extendDto.setQuantityOfPackage(dto.getQuantityOfPackage());
extendDto.setPackageSpecs(dto.getPackageSpecs());
dto1.setSid(dto.getSkuSid()); dto1.setSid(dto.getSkuSid());
dto1.setTitle(dto.getWeight()); dto1.setTitle(dto.getWeight());
dto1.setIndexes(dto.getRemarks()); dto1.setIndexes(dto.getRemarks());
@ -223,6 +227,10 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
lpkGoods.setRemarks(data.getBaseGoodsSkus().get(0).getIndexes()); lpkGoods.setRemarks(data.getBaseGoodsSkus().get(0).getIndexes());
lpkGoods.setUseOrgSid(data.getUseOrgSid()); lpkGoods.setUseOrgSid(data.getUseOrgSid());
lpkGoods.setCreateOrgSid(data.getCreateOrgSid()); lpkGoods.setCreateOrgSid(data.getCreateOrgSid());
lpkGoods.setQuantityOfPackage(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getQuantityOfPackage());
lpkGoods.setPackageSpecs(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPackageSpecs());
lpkGoods.setPackUnit(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPackUnit());
lpkGoods.setPackprice(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPackPrice());
if (StringUtils.isNotBlank(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPicUrl())) { if (StringUtils.isNotBlank(data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPicUrl())) {
lpkGoods.setPicUrl(fileUploadComponent.getUrlPrefix() + data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPicUrl()); lpkGoods.setPicUrl(fileUploadComponent.getUrlPrefix() + data.getBaseGoodsSkus().get(0).getBaseGoodsSkuExtend().getPicUrl());
} }
@ -414,8 +422,9 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
for (BaseGoodsTypeVo datum : listResultBean.getData()) { for (BaseGoodsTypeVo datum : listResultBean.getData()) {
GoodsTypeVo vo1=new GoodsTypeVo(); GoodsTypeVo vo1=new GoodsTypeVo();
vo1.setName(datum.getGoodsTypeName()); vo1.setName(datum.getGoodsTypeName());
// vo1.setId(); vo1.setId(datum.getSid());
vo1.setSid(datum.getSid()); vo1.setSid(datum.getSid());
list.add(vo1);
} }
GoodsTypeVo vo1=new GoodsTypeVo(); GoodsTypeVo vo1=new GoodsTypeVo();
@ -430,6 +439,7 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
BrandVo vo2=new BrandVo(); BrandVo vo2=new BrandVo();
vo2.setBrandName(datum.getBrandName()); vo2.setBrandName(datum.getBrandName());
vo2.setSid(datum.getSid()); vo2.setSid(datum.getSid());
vo2.setId(datum.getSid());
list1.add(vo2); list1.add(vo2);
} }
@ -442,15 +452,58 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
if(StringUtils.isBlank(query.getCustomerSid())){ if(StringUtils.isBlank(query.getCustomerSid())){
return rb.setMsg("参数不全"); return rb.setMsg("参数不全");
} }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date=new Date(); // Date date=new Date();
String p=sdf.format(date); // String p=sdf.format(date);
query.setPeriodValidity(p); // query.setPeriodValidity(p);
List<GiftBagGoodss> giftBagGoodss=baseMapper.getAllGoodsApplets(query); // List<GiftBagGoodss> giftBagGoodss=baseMapper.getAllGoodsApplets(query);
List<GiftBagGoodss> giftBagGoodss=new ArrayList<>();
GoodsSkuSelectQuery skuQuery=new GoodsSkuSelectQuery();
skuQuery.setGoodsName(query.getName());
skuQuery.setBrandSid(query.getBrandId());
skuQuery.setTypeSid(query.getCategoryId());
skuQuery.setCreateOrgSid(query.getOrgPath());
ResultBean<List<GoodsSkuDetailVo>> goodsList = baseGoodsSkuFeign.getGoodsList(skuQuery);
if(!goodsList.getCode().equals("200")){
return goodsList;
}
for (GoodsSkuDetailVo datum : goodsList.getData()) {
LpkGoods lpkGoods = baseMapper.selectOne(new QueryWrapper<LpkGoods>().eq("skuSid", datum.getSkuSid()));
if(lpkGoods.getIsAppletGrounding().equals("1")){
if(lpkGoods.getUseTo().equals("1")){
GiftBagGoodss giftBagGoodss1=new GiftBagGoodss();
giftBagGoodss1.setGoodsSid(datum.getSkuSid());
giftBagGoodss1.setName(datum.getGoodsName());
giftBagGoodss1.setTitle(datum.getTitle());
giftBagGoodss1.setUnitName(datum.getGoodsUnitName());
giftBagGoodss1.setPrice(datum.getSalesPrice());
giftBagGoodss1.setJPrice(datum.getSalesPrice());
// if(StringUtils.isNotBlank(datum.getPicUrl())){
// String urlPrefix = fileUploadComponent.getUrlPrefix();
// giftBagGoodss1.setIconUrl(urlPrefix+datum.getPicUrl());
// }
giftBagGoodss1.setSpecificationUnit(datum.getSPackUnit());
giftBagGoodss1.setRemark(datum.getGoodsExplain());
giftBagGoodss1.setRemarks(datum.getIndexes());
giftBagGoodss1.setWeight(datum.getWeight());
giftBagGoodss1.setPackprice(datum.getSPackPrice());
giftBagGoodss1.setQuantityOfPackage(datum.getSQuantityOfPackage());
giftBagGoodss1.setPackageSpecs(datum.getSPackageSpecs());
giftBagGoodss1.setPackUnit(datum.getSPackUnit());
giftBagGoodss.add(giftBagGoodss1);
}
}
}
ShoppingCartQuery query1=new ShoppingCartQuery(); ShoppingCartQuery query1=new ShoppingCartQuery();
query1.setBrandId(query.getBrandId()); query1.setBrandId(query.getBrandId());
query1.setCustomerSid(query.getCustomerSid()); query1.setCustomerSid(query.getCustomerSid());
List<ShoppingCartVo> l=shoppingCartService.shoppingCartList(query1).getData(); ResultBean<List<ShoppingCartVo>> listResultBean = shoppingCartService.shoppingCartList(query1);
if(!listResultBean.getCode().equals("200")){
return listResultBean;
}
List<ShoppingCartVo> l= listResultBean.getData();
giftBagGoodss.forEach(d->{ giftBagGoodss.forEach(d->{
d.setIconUrl(fileUploadComponent.getUrlPrefix()+d.getIconUrl()); d.setIconUrl(fileUploadComponent.getUrlPrefix()+d.getIconUrl());
// d.setMefenPrice(String.valueOf((int)(Double.valueOf(d.getPrice())* Double.valueOf(d.getWeight())))); // d.setMefenPrice(String.valueOf((int)(Double.valueOf(d.getPrice())* Double.valueOf(d.getWeight()))));
@ -524,34 +577,6 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
int rgb2= robot.getPixelColor(1629, 336).getGreen(); int rgb2= robot.getPixelColor(1629, 336).getGreen();
while (1==1){ while (1==1){
if(rgb!=242){
if(rgb1!=80){
if(rgb2!=201){
System.out.println(1111);
// robot.mouseMove(1522, 562);
// robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
// robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
// robot.delay(100);
// robot.mouseMove(1674, 750);
// robot.delay(100);
// robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
// robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
// robot.delay(100);
// robot.mouseMove(1664, 400);
// robot.delay(2000);
// robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
// robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
// robot.delay(100);
// robot.mouseMove(1780,750);
// robot.delay(2000);
// robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
// robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
}
}
}else{
System.out.println(222);
Thread.sleep(2000);
}
} }

5
ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartMapper.java

@ -14,7 +14,6 @@ import java.util.List;
*/ */
@Mapper @Mapper
public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> { public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> {
List<ShoppingCartVo> ShoppingCartList(@Param("customerSid")String customerSid, // List<ShoppingCartVo> ShoppingCartList(@Param("customerSid")String customerSid, @Param("brandId")String brandId, @Param("periodValidity")String periodValidity);
@Param("brandId")String brandId, List<ShoppingCartVo> ShoppingCartList(@Param("customerSid")String customerSid, @Param("brandId")String brandId);
@Param("periodValidity")String periodValidity);
} }

3
ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartMapper.xml

@ -14,11 +14,10 @@
s.content as remarks, s.content as remarks,
s.name as goodsName s.name as goodsName
from shopping_cart as r from shopping_cart as r
left join lpk_goods s on s.sid=r.goodsSid left join lpk_goods s on s.skuSid=r.goodsSid
<where> <where>
r.customerSid =#{customerSid} and r.affiliation=#{brandId} r.customerSid =#{customerSid} and r.affiliation=#{brandId}
and s.isAppletGrounding=1 and s.useTo=1 and s.isAppletGrounding=1 and s.useTo=1
and date_format (s.periodValidity,'%Y-%m-%d') >= date_format(#{periodValidity},'%Y-%m-%d')
</where> </where>
</select> </select>
</mapper> </mapper>

77
ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java

@ -12,8 +12,10 @@ import com.yxt.ordermall.api.shoppingcart.ShoppingCart;
import com.yxt.ordermall.api.shoppingcart.ShoppingCartDto; import com.yxt.ordermall.api.shoppingcart.ShoppingCartDto;
import com.yxt.ordermall.api.shoppingcart.ShoppingCartQuery; import com.yxt.ordermall.api.shoppingcart.ShoppingCartQuery;
import com.yxt.ordermall.api.shoppingcart.ShoppingCartVo; import com.yxt.ordermall.api.shoppingcart.ShoppingCartVo;
import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo;
import com.yxt.ordermall.biz.lpkcustomer.LpkCustomerService; import com.yxt.ordermall.biz.lpkcustomer.LpkCustomerService;
import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService; import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService;
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.ordermall.mallplus.biz.pms.service.impl.PmsBrandServiceImpl; import com.yxt.ordermall.mallplus.biz.pms.service.impl.PmsBrandServiceImpl;
import com.yxt.ordermall.mallplus.mbg.pms.entity.PmsBrand; import com.yxt.ordermall.mallplus.mbg.pms.entity.PmsBrand;
import com.yxt.ordermall.utils.DoubleUtils; import com.yxt.ordermall.utils.DoubleUtils;
@ -39,6 +41,8 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
private LpkGoodsService lpkGoodsService; private LpkGoodsService lpkGoodsService;
@Autowired @Autowired
PmsBrandServiceImpl pmsBrandService; PmsBrandServiceImpl pmsBrandService;
@Autowired
BaseGoodsSkuFeign baseGoodsSkuFeign;
public ResultBean save(ShoppingCartDto dto) { public ResultBean save(ShoppingCartDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
@ -81,8 +85,10 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date=new Date(); Date date=new Date();
String periodValidity=sdf.format(date); String periodValidity=sdf.format(date);
List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId());
list.forEach(s -> { list.forEach(s -> {
s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getJPrice()) * Double.valueOf(s.getGoodsNumber()))))); s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getJPrice()) * Double.valueOf(s.getGoodsNumber())))));
s.setIconUrl(fileUploadComponent.getUrlPrefix() + s.getIconUrl()); s.setIconUrl(fileUploadComponent.getUrlPrefix() + s.getIconUrl());
}); });
@ -139,12 +145,17 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date=new Date(); Date date=new Date();
String periodValidity=sdf.format(date); String periodValidity=sdf.format(date);
List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId());
double price = 0; double price = 0;
double standbyPrice =0; double standbyPrice =0;
double weight = 0; double weight = 0;
for (ShoppingCartVo vo : list) { for (ShoppingCartVo vo : list) {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(vo.getGoodsSid()); ResultBean<GoodsSkuDetailVo> goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(vo.getGoodsSid());
LpkGoods lpkGoods=new LpkGoods();
if(!goodsBySkuSid.getCode().equals("200")){
lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("skuSid",goodsBySkuSid.getData().getSkuSid()));
}
String stepWeight = lpkGoods.getStepWeight(); String stepWeight = lpkGoods.getStepWeight();
String stepPrice = lpkGoods.getStepPrice(); String stepPrice = lpkGoods.getStepPrice();
String a =DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getWeight())*Double.valueOf(vo.getGoodsNumber()))); String a =DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getWeight())*Double.valueOf(vo.getGoodsNumber())));
@ -184,10 +195,68 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
vo.setStandbyPrice(removeZeros(String.valueOf(aa(standbyPrice)))); vo.setStandbyPrice(removeZeros(String.valueOf(aa(standbyPrice))));
vo.setTotalWeight(removeZeros(String.valueOf(aa(weight)))); vo.setTotalWeight(removeZeros(String.valueOf(aa(weight))));
vo.setAffiliation(query.getBrandId()); vo.setAffiliation(query.getBrandId());
vo = price(vo); // vo = price(vo);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
public ResultBean getGoodsWeight1(ShoppingCartQuery query) {
ResultBean rb = new ResultBean().fail();
if(StringUtils.isBlank(query.getCustomerSid())){
return rb.setMsg("参数不全");
}
if(StringUtils.isBlank(query.getBrandId())){
return rb.setMsg("参数不全");
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date=new Date();
String periodValidity=sdf.format(date);
List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId());
double price = 0;
double standbyPrice =0;
double weight = 0;
for (ShoppingCartVo vo : list) {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(vo.getGoodsSid());
String stepWeight = lpkGoods.getStepWeight();
String stepPrice = lpkGoods.getStepPrice();
String a =DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getWeight())*Double.valueOf(vo.getGoodsNumber())));
BigDecimal weightW = new BigDecimal(a);
if(StringUtils.isNotBlank(stepPrice)){
System.out.println(weightW.compareTo(new BigDecimal(stepWeight)));
if(weightW.compareTo(new BigDecimal(stepWeight)) == -1){
stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getJPrice())*Double.valueOf(vo.getWeight()))); ///份价格
}else{
stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(stepPrice)*Double.valueOf(vo.getWeight()))); ///份价格
}
}else{
stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getJPrice())*Double.valueOf(vo.getWeight())));
}
if ("北京3号白菜".equals(vo.getGoodsName())
|| "玲珑黄白菜".equals(vo.getGoodsName())
|| "V7土豆".equals(vo.getGoodsName())
|| "黄金薯土豆".equals(vo.getGoodsName())) {
price = Double.valueOf(stepPrice)* Double.valueOf(vo.getGoodsNumber()) + price;
standbyPrice=Double.valueOf(vo.getPrice())*Double.valueOf(vo.getGoodsNumber())+standbyPrice;
weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight;
// }
} else {
price = Double.valueOf(vo.getPrice()) * Double.valueOf(vo.getGoodsNumber()) + price;
standbyPrice=Double.valueOf(vo.getPrice())*Double.valueOf(vo.getGoodsNumber())+standbyPrice;
weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight;
}
}
ShoppingCartVo vo = new ShoppingCartVo();
// 1.20斤起订量。
// 2.0-99斤加10%附加额。
// 3.100斤-199斤加5%附加额。
vo.setCustomerSid(query.getCustomerSid());
vo.setTotalPrice(removeZeros(String.valueOf(aa(price))));
vo.setStandbyPrice(removeZeros(String.valueOf(aa(standbyPrice))));
vo.setTotalWeight(removeZeros(String.valueOf(aa(weight))));
vo.setAffiliation(query.getBrandId());
// vo = price(vo);
return rb.success().setData(vo);
}
private ShoppingCartVo price(ShoppingCartVo vo) { private ShoppingCartVo price(ShoppingCartVo vo) {
double weight = Double.valueOf(vo.getTotalWeight()); double weight = Double.valueOf(vo.getTotalWeight());
LpkCustomer lpkCustomer = lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid", vo.getCustomerSid())); LpkCustomer lpkCustomer = lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid", vo.getCustomerSid()));

8
ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeign.java

@ -40,6 +40,10 @@ public interface BaseGoodsSkuFeign {
@ApiOperation("根据code查询商品") @ApiOperation("根据code查询商品")
@GetMapping("/getSkuByCode/{code}/{title}") @GetMapping("/getSkuByCode/{code}/{title}")
public ResultBean<BaseGoodsSku> getSkuByCode(@PathVariable("code") String code,@PathVariable("title") String title); public ResultBean<BaseGoodsSku> getSkuByCode(@PathVariable("code") String code,@PathVariable("title") String title);
@ApiOperation("采购单选择商品")
@PostMapping("/getGoodsList")
public ResultBean<List<GoodsSkuDetailVo>> getGoodsList(@RequestBody GoodsSkuSelectQuery query);
@ApiOperation("采购单选择商品")
@GetMapping("/getGoodsBySkuSid")
public ResultBean<GoodsSkuDetailVo> getGoodsBySkuSid(@RequestParam("skuSid") String skuSid);
} }

10
ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java

@ -45,4 +45,14 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
public ResultBean<BaseGoodsSku> getSkuByCode(String code,String title) { public ResultBean<BaseGoodsSku> getSkuByCode(String code,String title) {
return null; return null;
} }
@Override
public ResultBean<List<GoodsSkuDetailVo>> getGoodsList(GoodsSkuSelectQuery query) {
return null;
}
@Override
public ResultBean<GoodsSkuDetailVo> getGoodsBySkuSid(String skuSid) {
return null;
}
} }

Loading…
Cancel
Save