diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoodss.java b/ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoodss.java index f3391f0..d3b6333 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoodss.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoodss.java @@ -43,34 +43,34 @@ public class GiftBagGoodss { - public String getSubtotal() { - double dj = 0.0; - if (StrUtil.isNotBlank(price)) { - try { - dj = Double.parseDouble(price); - } catch (Exception e) { - e.printStackTrace(); - } - } - double js = 1; - if (StrUtil.isNotBlank(weight)) { - try { - js = Double.parseDouble(weight); - } catch (Exception e) { - e.printStackTrace(); - } - } - int fs = 1; - if (StrUtil.isNotBlank(goodsNumber)) { - try { - fs = Integer.parseInt(goodsNumber); - } catch (Exception e) { - e.printStackTrace(); - } - } - double mfjg = dj * js * fs; - int m=(int)mfjg; -// return NumberUtil.decimalFormatMoney(mfjg); - return String.valueOf(m); - } +// public String getSubtotal() { +// double dj = 0.0; +// if (StrUtil.isNotBlank(price)) { +// try { +// dj = Double.parseDouble(price); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// double js = 1; +// if (StrUtil.isNotBlank(weight)) { +// try { +// js = Double.parseDouble(weight); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// int fs = 1; +// if (StrUtil.isNotBlank(goodsNumber)) { +// try { +// fs = Integer.parseInt(goodsNumber); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// double mfjg = dj * js * fs; +// int m=(int)mfjg; +//// return NumberUtil.decimalFormatMoney(mfjg); +// return String.valueOf(m); +// } } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java index f20dee1..00ba366 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/lpkgoods/LpkGoodsVo.java @@ -30,6 +30,7 @@ public class LpkGoodsVo implements Vo { private String picUrl; private String appContent; private String specificationUnit; + private String packUnit; private double number; private String isAppletGrounding; //1 上架 2 下架 private String content; diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java index 274ba42..29cdc1f 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java @@ -237,32 +237,61 @@ public class LpkGoodsService extends MybatisBaseService goodsDetails(String sid,String customerSid) { + public ResultBean goodsDetails(String sid,String customerSid) { ResultBean rb = ResultBean.fireFail(); LpkGoodsDetailsVo vo = new LpkGoodsDetailsVo(); - LpkGoodsVo lpkGoods = baseMapper.getGoodsDetails(sid); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(sid); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } + LpkGoodsVo lpkGoods = new LpkGoodsVo(); + lpkGoods.setSid(goodsBySkuSid.getData().getSkuSid()); +// LpkGoodsVo lpkGoods = baseMapper.getGoodsDetails(sid); + lpkGoods.setWeight(goodsBySkuSid.getData().getTitle()); +// lpkGoods.setCreateTime(goodsBySkuSid.getData()); + lpkGoods.setCode(goodsBySkuSid.getData().getGoodsCode()); + lpkGoods.setBarcode(goodsBySkuSid.getData().getBarCode()); + lpkGoods.setName(goodsBySkuSid.getData().getGoodsName()); + lpkGoods.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); +// lpkGoods.setTypeCode(""); + lpkGoods.setPrice(goodsBySkuSid.getData().getSalesPrice()); +// lpkGoods.setPicUrl(); + lpkGoods.setRemarks(goodsBySkuSid.getData().getIndexes()); + lpkGoods.setAppContent(goodsBySkuSid.getData().getGoodsExplain()); + lpkGoods.setPackUnit(goodsBySkuSid.getData().getSPackUnit()); +// lpkGoods.setNumber(); +// lpkGoods.setIsAppletGrounding(); + lpkGoods.setBrandId(goodsBySkuSid.getData().getBrandSid()); + lpkGoods.setCategoryId(goodsBySkuSid.getData().getGoodsTypeSid()); +// lpkGoods.setPeriodValidity(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (null != lpkGoods) { BeanUtil.copyProperties(lpkGoods, vo); - if (StringUtils.isNotBlank(lpkGoods.getPicUrl())) { - vo.setPicUrl(fileUploadComponent.getUrlPrefix() + lpkGoods.getPicUrl()); + if (StringUtils.isNotBlank(goodsBySkuSid.getData().getPicUrl())) { + vo.setPicUrl(fileUploadComponent.getUrlPrefix() + goodsBySkuSid.getData().getPicUrl()); } - vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); +// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); } - vo.setBrandId(lpkGoods.getBrandId()); +// vo.setBrandId(lpkGoods.getBrandId()); LpkCustomer lpkCustomer =lpkCustomerService.getOne(new QueryWrapper().eq("sid",customerSid)); - PmsBrand pmsBrand= IPmsBrandService.getById(lpkGoods.getBrandId()); +// PmsBrand pmsBrand= IPmsBrandService.getById(lpkGoods.getBrandId()); ShoppingCart shoppingCart=shoppingCartService.getOne(new QueryWrapper().eq("customerSid",lpkCustomer.getSid()) .eq("goodsSid",lpkGoods.getSid()).eq("affiliation",lpkGoods.getBrandId())); - vo.setPrice(removeZeros(lpkGoods.getPrice())); - vo.setDgxy(pmsBrand.getDgxy()); - vo.setQdxy(pmsBrand.getQdxy()); - vo.setQssl(pmsBrand.getQssl()); - vo.setCategoryId(lpkGoods.getCategoryId()); +// vo.setPrice(removeZeros(lpkGoods.getPrice())); +// vo.setDgxy(pmsBrand.getDgxy()); +// vo.setQdxy(pmsBrand.getQdxy()); +// vo.setQssl(pmsBrand.getQssl()); +// vo.setCategoryId(lpkGoods.getCategoryId()); String goodsNum = shoppingCart==null?"0":shoppingCart.getGoodsNumber(); vo.setGoodsNumber(goodsNum); - vo.setMefenPrice(removeZeros(String.valueOf(Double.valueOf(lpkGoods.getWeight())*Double.valueOf(lpkGoods.getPrice())))); - vo.setPeriodValidity(lpkGoods.getPeriodValidity()); + vo.setMefenPrice(goodsBySkuSid.getData().getSPackPrice().toString()); + vo.setPackageSpecs(goodsBySkuSid.getData().getSPackageSpecs()); + vo.setPackUnit(goodsBySkuSid.getData().getSPackUnit()); + vo.setPackprice(goodsBySkuSid.getData().getSPackPrice()); + vo.setQuantityOfPackage(goodsBySkuSid.getData().getSQuantityOfPackage()); +// vo.setPeriodValidity(lpkGoods.getPeriodValidity()); return rb.success().setData(vo); } @@ -461,7 +490,7 @@ public class LpkGoodsService extends MybatisBaseService> goodsList = baseGoodsSkuFeign.getGoodsList(skuQuery); if(!goodsList.getCode().equals("200")){ @@ -485,12 +514,12 @@ public class LpkGoodsService extends MybatisBaseService l= listResultBean.getData(); giftBagGoodss.forEach(d->{ d.setIconUrl(fileUploadComponent.getUrlPrefix()+d.getIconUrl()); -// d.setMefenPrice(String.valueOf((int)(Double.valueOf(d.getPrice())* Double.valueOf(d.getWeight())))); }); if(l.size()==0){ giftBagGoodss.forEach(d->{ d.setPrice(removeZeros(d.getPrice())); d.setJPrice(removeZeros(d.getJPrice())); -// d.setIconUrl(fileUploadComponent.getUrlPrefix()+d.getIconUrl()); - d.setMefenPrice(removeZeros(String.valueOf((DoubleUtils.mul(Double.valueOf(d.getPrice()), Double.valueOf(d.getWeight())))))); +// d.setMefenPrice(removeZeros(String.valueOf((DoubleUtils.mul(Double.valueOf(d.getPrice()), Double.valueOf(d.getWeight())))))); }); }else{ @@ -524,9 +551,7 @@ public class LpkGoodsService extends MybatisBaseService().eq("sid", vo.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(vo.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } vo1.setGoodsSid(vo.getGoodsSid()); vo1.setGoodsName(vo.getGoodsName()); vo1.setPartNumber(Integer.parseInt(vo.getGoodsNumber())); vo1.setNumofPart(Double.valueOf(vo.getWeight())); - vo1.setPriceUnit(Double.valueOf(goods.getPrice())); - vo1.setPricePart((Double.valueOf(goods.getPrice()) * Double.valueOf(goods.getWeight()))); + vo1.setPriceUnit(Double.valueOf(goodsBySkuSid.getData().getSalesPrice())); + vo1.setPricePart(goodsBySkuSid.getData().getSPackPrice().doubleValue()); totalAmount = Double.valueOf(vo1.getPricePart()) * Double.valueOf(vo1.getPartNumber()) + totalAmount; ordOrderDetailVos.add(vo1); strings.add(vo.getSid()); @@ -283,7 +291,125 @@ public class OrdOrderService extends MybatisBaseService ordOrderDetailVos = new ArrayList<>(); +// +// ShoppingCartQuery query = new ShoppingCartQuery(); +// +// query.setCustomerSid(dto.getCustomerSid()); +// query.setBrandId(dto.getBrandId()); +// List vos = shoppingCartService.shoppingCartList(query).getData(); +// List strings = new ArrayList<>(); +// double totalAmount = 0; +// for (ShoppingCartVo vo : vos) { +// OrdOrderDetailVo vo1 = new OrdOrderDetailVo(); +// LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper().eq("sid", vo.getGoodsSid())); +// vo1.setGoodsSid(vo.getGoodsSid()); +// vo1.setGoodsName(vo.getGoodsName()); +// vo1.setPartNumber(Integer.parseInt(vo.getGoodsNumber())); +// vo1.setNumofPart(Double.valueOf(vo.getWeight())); +// vo1.setPriceUnit(Double.valueOf(goods.getPrice())); +// vo1.setPricePart((Double.valueOf(goods.getPrice()) * Double.valueOf(goods.getWeight()))); +// totalAmount = Double.valueOf(vo1.getPricePart()) * Double.valueOf(vo1.getPartNumber()) + totalAmount; +// ordOrderDetailVos.add(vo1); +// strings.add(vo.getSid()); +// } +// dto.setOrdOrderDetailsVoList(ordOrderDetailVos); +// Map map = new HashMap<>(); +// LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); +// Map sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), or); +// ResponseEntity postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); +// +// ResultBean rb1 = postForEntity.getBody(); +// LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); +// if (!rb1.getCode().equals("200")) { +// return rb1; +// } +// OrdOrder order = new OrdOrder(); +// BeanUtil.copyProperties(dto, order, "id", "sid"); +// order.setCreateTime(new Date()); +// order.setMainSid(rb2.get("mainSid").toString()); +// order.setOutTradeNo(rb2.get("outTradeNo").toString()); +// order.setPayStatus(2); +// order.setPayTime(new Date()); +// order.setCardNumber(dto.getCardNumber()); +// order.setSource(0); +// order.setUserSid(vo.getSid()); +// order.setOpenId(vo.getWxMpOpenid()); +// order.setTotalTee(dto.getTotalTee());//实付金额 +// order.setMeet(removeZeros(String.valueOf(totalAmount)));//应付金额 +// if (dto.getOrdOrderDetailsVoList().size() > 1) { +// order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString() + "等" + (dto.getOrdOrderDetailsVoList().size()) + "件商品"); +// } else { +// order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString() + "商品"); +// } +//// order.setName("商品"); +// order.setTimeRemarks(10); +// order.setReturnUrl(or); +// baseMapper.insert(order); +// +// +// List ordOrders = new ArrayList<>(); +// dto.getOrdOrderDetailsVoList().forEach(s -> { +// OrdOrderDetail ordOrderDetails = new OrdOrderDetail(); +// BeanUtil.copyProperties(s, ordOrderDetails, "id", "sid"); +// ordOrderDetails.setOrderSid(order.getSid()); +// ordOrders.add(ordOrderDetails); +// +// }); +// ordOrderDetailsService.saveBatch(ordOrders); +// //生成订单 删除购物车 +// String[] sids = strings.toArray(new String[0]); +// shoppingCartService.delBySids(sids); +// if (dto.getOrdOrderDetailsVoList().size() > 1) { +// result.setGoods(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString() + "等" + (dto.getOrdOrderDetailsVoList().size()) + "件商品"); +// } else { +// result.setGoods(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString() + "商品"); +// } +// +// result.setPrice(dto.getTotalTee()); +//// result.setOrderId(rbData.getOutTradeNo()); +// result.setOrderId(rb2.get("outTradeNo").toString()); +// result.setRemainder(String.valueOf(10 * 60)); +// +// PayUrl payUrl = new PayUrl(); +// payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay"); +// PayParams aVoid = new PayParams(); +// aVoid.setMainSid(rb2.get("mainSid").toString()); +// payUrl.setParams(aVoid); +// +// OrderUrl orderUrl = new OrderUrl(); +// OrderParams orderParams = new OrderParams(); +// orderParams.setMainSid(""); +// orderUrl.setParams(orderParams); +// +// TradeNoUrl tradeNoUrl = new TradeNoUrl(); +// tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery"); +// TradeParams tradeParams = new TradeParams(); +// tradeParams.setMainSid(rb2.get("mainSid").toString()); +// tradeNoUrl.setParams(tradeParams); +// +//// result.setOrder_url(orderUrl); +// result.setPay_url(payUrl); +// result.setTrade_no_url(tradeNoUrl); +// String[] a = new String[]{"pay"}; +// result.setBus(a); +// //新人限购礼包 该状态 +// LpkCustomer customer = lpkCustomerService.getOne(new QueryWrapper().eq("sid", dto.getCustomerSid())); +// customer.setIsPurchase("0"); +// lpkCustomerService.updateById(customer); +// return rb.success().setData(result); +// } @Transactional(rollbackFor = Exception.class) public ResultBean createNewUserBagOrder(OrdOrderDto dto) { ResultBean rb = ResultBean.fireFail(); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java index e67e598..2a577a8 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java @@ -150,41 +150,19 @@ public class ShoppingCartService extends MybatisBaseService goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(vo.getGoodsSid()); + String skuSid=vo.getGoodsSid(); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(skuSid); LpkGoods lpkGoods=new LpkGoods(); if(!goodsBySkuSid.getCode().equals("200")){ lpkGoods = lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",goodsBySkuSid.getData().getSkuSid())); } - 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; - } + 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斤起订量。 diff --git a/ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeign.java b/ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeign.java index c138651..ae9f5de 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeign.java +++ b/ordermall/src/main/java/com/yxt/ordermall/feign/base/basegoodssku/BaseGoodsSkuFeign.java @@ -44,6 +44,6 @@ public interface BaseGoodsSkuFeign { @PostMapping("/getGoodsList") public ResultBean> getGoodsList(@RequestBody GoodsSkuSelectQuery query); @ApiOperation("采购单选择商品") - @GetMapping("/getGoodsBySkuSid") - public ResultBean getGoodsBySkuSid(@RequestParam("skuSid") String skuSid); + @GetMapping("/getGoodsBySkuSid/{skuSid}") + public ResultBean getGoodsBySkuSid(@PathVariable("skuSid") String skuSid); }