diff --git a/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java b/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java index 1818a9a..a601422 100644 --- a/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java +++ b/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecordDto.java @@ -26,4 +26,5 @@ public class NewcomerRecoRecordDto implements Dto { private Date assistanceDate;//助力时间 private String state; private String giftName;//礼包名 + private String customerSid;//礼包名 } diff --git a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java index b1db54e..3c95c2d 100644 --- a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java +++ b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java @@ -23,13 +23,13 @@ public class OrdOrder { private Date payTime; private int cardNumber; private int source; - private String totalTee; + private String totalTee;//实际价格 private String openId; private String userSid; private String name; private int timeRemarks; private String returnUrl; - private String vegeCellarType; +// private String receivablePrice;//应收价格 } diff --git a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java index d8ec4c5..fda92c8 100644 --- a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java +++ b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java @@ -23,15 +23,17 @@ public class OrdOrderDto implements Dto { private int payStatus; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payTime; - private int cardNumber; - private int source; - private String totalTee; - private String openId; - private String userSid; + private int cardNumber;//卡的张数 + private int source;//来源：0、云菜窖 + private String totalTee;//金额 + private String openId;//微信唯一标识openid + private String userSid;//用户sid private String name; private int timeRemarks; private String returnUrl; private String customerSid; - private String vegeCellarType; //菜窖类型 0 百姓菜窖 1 精品菜窖 2 企业菜窖 + private String brandId; +// private String receivablePrice; + private List ordOrderDetailsVoList; } diff --git a/src/main/java/com/yxt/yythmall/api/ordorderdetails/OrdOrderDetailVo.java b/src/main/java/com/yxt/yythmall/api/ordorderdetails/OrdOrderDetailVo.java index 6da2d9e..061ad4d 100644 --- a/src/main/java/com/yxt/yythmall/api/ordorderdetails/OrdOrderDetailVo.java +++ b/src/main/java/com/yxt/yythmall/api/ordorderdetails/OrdOrderDetailVo.java @@ -18,10 +18,10 @@ public class OrdOrderDetailVo implements Vo { private Date createTime; private String remarks; private String orderSid; - private String goodsSid; - private String goodsName; - private int partNumber; - private double numofPart; - private double priceUnit; - private double pricePart; + private String goodsSid;//商品Sid + private String goodsName;//商品名称 + private int partNumber;//份数 + private double numofPart;//每份数量 + private double priceUnit;//商品单价 + private double pricePart;//每份价格 } diff --git a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java b/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java index 38208a2..e17c88a 100644 --- a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java +++ b/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java @@ -29,6 +29,7 @@ public class ShoppingCartVo implements Vo { private String unitName; private String iconUrl; private String specificationUnit; +// private String text; } diff --git a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecords.java b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecords.java index 76abe00..dd54f47 100644 --- a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecords.java +++ b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecords.java @@ -24,6 +24,8 @@ public class TransferRecords { private String affiliation;//所属菜窖 private String state;// private String recipientSid;//领取人 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date recipientTime;//领取人 } diff --git a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsDto.java b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsDto.java index 39fd331..ed11111 100644 --- a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsDto.java +++ b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsDto.java @@ -18,6 +18,7 @@ public class TransferRecordsDto implements Dto { private String state;// private String recipientSid;//领取人 private String orderSid; + private String remarks; private List vos; } diff --git a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java index ea5a9e6..1659d21 100644 --- a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java +++ b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java @@ -27,4 +27,6 @@ public class TransferRecordsVo implements Vo { private String goodss; private String createTime; private String remarks; + private String fxNick; + private String lqNick; } diff --git a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java index cc40a4c..7e05bfc 100644 --- a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java +++ b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java @@ -43,8 +43,6 @@ public class CustomerStoreService extends MybatisBaseService().eq("sid",dto.getCustomerSid())); + if(!customer.getIsNewUser().equals("1")){ + return rb.setMsg("您不是新人"); + } NewcomerRecoRecord newcomerRecoRecord = baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); newcomerRecoRecord.setRecommendedSid(dto.getRecommendedSid()); newcomerRecoRecord.setAssistanceDate(new Date()); @@ -80,6 +87,9 @@ public class NewcomerRecoRecordService extends MybatisBaseService { private static final String OrderUrl="https://supervise.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid="; + private static final String or="https://supervise.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid="; @Autowired OrdOrderDetailService ordOrderDetailsService; @Autowired LpkCustomerService lpkCustomerService; + @Autowired + ShoppingCartService shoppingCartService; + @Autowired + LpkGoodsService lpkGoodsService; @Transactional(rollbackFor = Exception.class) @@ -115,9 +127,28 @@ 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<>(); + 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()))); + ordOrderDetailVos.add(vo1); + strings.add(vo.getSid()); + } + dto.setOrdOrderDetailsVoList(ordOrderDetailVos); Mapmap =new HashMap<>(); LpkCustomerVo vo= lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); Map sendBody=buildMessageBody( vo.getSid(), vo.getWxMpOpenid(),dto.getTotalTee(),dto.getOrdOrderDetailsVoList(),or); @@ -139,7 +170,6 @@ public class OrdOrderService extends MybatisBaseService1){ order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品"); }else{ @@ -160,6 +190,9 @@ public class OrdOrderService extends MybatisBaseService1){ result.setGoods(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品"); }else{ @@ -213,5 +246,23 @@ public class OrdOrderService extends MybatisBaseService=20 && weight<=100){ +// dto.setReceivablePrice(dto.getTotalTee()); +// double a =1.1; +// dto.setTotalTee(String.valueOf(Double.valueOf(dto.getTotalTee())*a)); +// }else if(weight>=101 && weight<=200){ +// dto.setReceivablePrice(dto.getTotalTee()); +// double a =1.05; +// dto.setTotalTee(String.valueOf(Double.valueOf(dto.getTotalTee())*a)); +// }else { +// dto.setReceivablePrice(dto.getTotalTee()); +// } +// return dto; +// } } diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java index 83fb0ce..e31aa8b 100644 --- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java +++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java @@ -13,16 +13,21 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.yythmall.api.empcardbuildrecord.EmpCardBuildRecord; import com.yxt.yythmall.api.empcardbuildrecord.EmpCardBuildRecordQuery; import com.yxt.yythmall.api.empcardbuildrecord.EmpCardBuildRecordVo; +import com.yxt.yythmall.api.lpkcustomer.LpkCustomer; import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery; +import com.yxt.yythmall.api.ordorder.OrdOrderDto; +import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetailVo; import com.yxt.yythmall.api.shoppingcart.ShoppingCart; import com.yxt.yythmall.api.shoppingcart.ShoppingCartDto; import com.yxt.yythmall.api.shoppingcart.ShoppingCartQuery; import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo; import com.yxt.yythmall.biz.empcard.EmpCardService; +import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -34,6 +39,8 @@ import java.util.List; public class ShoppingCartService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; + @Autowired + LpkCustomerService lpkCustomerService; public ResultBean save(ShoppingCartDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -100,8 +107,77 @@ public class ShoppingCartService extends MybatisBaseService().eq("sid",vo.getCustomerSid())); + vo.setRemarks("已减免附加费"); + if(weight<=100){ + if(weight==20){ + if(lpkCustomer.getIsPurchase().equals("1")){ + double a =0.5; + double t=Double.valueOf(vo.getTotalPrice())*a; + BigDecimal bg = new BigDecimal(t); + vo.setTotalPrice(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())); + vo.setRemarks("已享受新人专享5折优惠"); + }else{ + double a =1.1; + double d=Double.valueOf(vo.getTotalPrice()); + double t=Double.valueOf(vo.getTotalPrice())*a; + BigDecimal bg = new BigDecimal(t); + vo.setTotalPrice(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())); + double f=Double.valueOf(vo.getTotalPrice())-d; + BigDecimal bgd = new BigDecimal(f); + String c =String.valueOf(bgd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + vo.setRemarks("包含附加费"+removeZeros(c)+"元"); + } + }else{ + double a =1.1; + double d=Double.valueOf(vo.getTotalPrice()); + double t=Double.valueOf(vo.getTotalPrice())*a; + BigDecimal bg = new BigDecimal(t); + vo.setTotalPrice(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())); +// String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d); + double f=Double.valueOf(vo.getTotalPrice())-d; + BigDecimal bgd = new BigDecimal(f); + String c =String.valueOf(bgd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + vo.setRemarks("包含附加费"+removeZeros(c)+"元"); + } + }else if(weight>=101 && weight<=200){ + double a =1.05; + double d=Double.valueOf(vo.getTotalPrice()); + double t=Double.valueOf(vo.getTotalPrice())*a; + BigDecimal bg = new BigDecimal(t); + vo.setTotalPrice(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())); +// String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d); + double f=Double.valueOf(vo.getTotalPrice())-d; + BigDecimal bgd = new BigDecimal(f); + String c =String.valueOf(bgd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + vo.setRemarks("包含附加费"+removeZeros(c)+"元"); + } + return vo; + } + /** + * 去除多余.0 + * @param num + * @return + */ + public static String removeZeros(String num) { + if (num.indexOf(".") > 0) { + // 去掉多余的0 + num = num.replaceAll("0+?$", ""); + // 如果最后一位是. 则去掉 + num = num.replaceAll("[.]$", ""); + } + return num; + } } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml index 39bc128..b0c805a 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml @@ -6,38 +6,53 @@ \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java index 25e47e4..f00ba7f 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java @@ -10,6 +10,7 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import com.yxt.yythmall.api.customerstore.CustomerStoreDto; import com.yxt.yythmall.api.lpkgiftcard.GoodsVo; import com.yxt.yythmall.api.lpkgoods.LpkGoods; @@ -90,14 +91,28 @@ public class TransferRecordsService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + /** + * 去除多余.0 + * @param num + * @return + */ + public static String removeZeros(String num) { + if (num.indexOf(".") > 0) { + // 去掉多余的0 + num = num.replaceAll("0+?$", ""); + // 如果最后一位是. 则去掉 + num = num.replaceAll("[.]$", ""); + } + return num; } - } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsMapper.java b/src/main/java/com/yxt/yythmall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsMapper.java index fe00462..ce1c248 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsMapper.java @@ -23,6 +23,6 @@ public interface TransferRecordsGoodsDetailsMapper extends BaseMapper selByOrderSid(String orderSid); List selInOrderSid(@Param("orderSids") List orderSids); - @Select("select *,goodsNumber as goodsNumber from lpk_reserve_order_goods where orderSid=#{orderSid}") + @Select("select *,goodsNumber as goodsNumber from transfer_records_goods_details where orderSid=#{orderSid}") List selByOrderSids(String orderSid); } diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml index 5610a0b..5e08ff6 100644 --- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml @@ -259,6 +259,7 @@ o.customerSid=#{query.customerSid} and state=#{query.state} + order by o.reserveDate desc