阶梯价格修改,
This commit is contained in:
@@ -85,6 +85,11 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResultBean recommendedAssistance(NewcomerRecoRecordDto dto) {
|
||||
ResultBean rb = new ResultBean().fail();
|
||||
//如果被推荐人有被推荐记录但没购买 就直接跳出
|
||||
NewcomerRecoRecord newcomer=baseMapper.selectOne(new QueryWrapper<NewcomerRecoRecord>().eq("recommendedSid",dto.getCustomerSid()));
|
||||
if(newcomer!=null){
|
||||
return rb.success();
|
||||
}
|
||||
LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",dto.getCustomerSid()));
|
||||
if(null==customer){
|
||||
return rb.setMsg("参数不全");
|
||||
@@ -100,23 +105,23 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
|
||||
return rb.success();
|
||||
}
|
||||
baseMapper.updateById(newcomerRecoRecord);
|
||||
// List<AppletGiftBagGoods>list=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",dto.getGiftBagSid()));
|
||||
VegetableCellarDto dto1=new VegetableCellarDto();
|
||||
dto1.setCustomerSid(customer.getSid());
|
||||
List<vegeVo> vos=new ArrayList<>();
|
||||
for (RecommendNewUserBagDetails appletGiftBagGoods : list) {
|
||||
LpkGoods a=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",appletGiftBagGoods.getGoodsSid()));
|
||||
vegeVo vo=new vegeVo();
|
||||
vo.setGoodsSid(appletGiftBagGoods.getGoodsSid());
|
||||
vo.setGoodsNumber(appletGiftBagGoods.getGoodsNumber());
|
||||
vo.setBrandId(String.valueOf(a.getBrandId()));
|
||||
vos.add(vo);
|
||||
}
|
||||
dto1.setVos(vos);
|
||||
vegetableCellarService.save1Goods(dto1);
|
||||
//改变新人状态
|
||||
customer.setIsNewUser("0");
|
||||
lpkCustomerService.updateById(customer);
|
||||
//// List<AppletGiftBagGoods>list=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",dto.getGiftBagSid()));
|
||||
// VegetableCellarDto dto1=new VegetableCellarDto();
|
||||
// dto1.setCustomerSid(customer.getSid());
|
||||
// List<vegeVo> vos=new ArrayList<>();
|
||||
// for (RecommendNewUserBagDetails appletGiftBagGoods : list) {
|
||||
// LpkGoods a=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",appletGiftBagGoods.getGoodsSid()));
|
||||
// vegeVo vo=new vegeVo();
|
||||
// vo.setGoodsSid(appletGiftBagGoods.getGoodsSid());
|
||||
// vo.setGoodsNumber(appletGiftBagGoods.getGoodsNumber());
|
||||
// vo.setBrandId(String.valueOf(a.getBrandId()));
|
||||
// vos.add(vo);
|
||||
// }
|
||||
// dto1.setVos(vos);
|
||||
// vegetableCellarService.save1Goods(dto1);
|
||||
// //改变新人状态
|
||||
// customer.setIsNewUser("0");
|
||||
// lpkCustomerService.updateById(customer);
|
||||
return rb.success().setData("助力成功");
|
||||
}
|
||||
public ResultBean recordList(String customerSid) {
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
s.price as jPrice,
|
||||
s.picUrl as iconUrl,
|
||||
s.specificationUnit,
|
||||
s.content as remarks
|
||||
s.content as remarks,
|
||||
s.name as goodsName
|
||||
from shopping_cart as r
|
||||
left join lpk_goods s on s.sid=r.goodsSid
|
||||
<where>
|
||||
|
||||
@@ -25,6 +25,7 @@ import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo;
|
||||
import com.yxt.yythmall.biz.empcard.EmpCardService;
|
||||
import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService;
|
||||
import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
|
||||
import com.yxt.yythmall.utils.DoubleUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -114,23 +115,31 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
|
||||
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)){
|
||||
if (new BigDecimal(stepPrice).compareTo(BigDecimal.ZERO) == 0) {
|
||||
stepPrice = vo.getJPrice();
|
||||
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()))); ///份价格
|
||||
}
|
||||
// if (new BigDecimal(stepPrice).compareTo(BigDecimal.ZERO) == 0) {
|
||||
// stepPrice = vo.getJPrice();
|
||||
// }
|
||||
}else{
|
||||
stepPrice = vo.getJPrice();
|
||||
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())) {
|
||||
BigDecimal weightW = new BigDecimal(vo.getWeight());
|
||||
if (weightW.compareTo(new BigDecimal(stepWeight)) >= 0) {
|
||||
price = Double.valueOf(stepPrice) * Double.valueOf(vo.getGoodsNumber()) + price;
|
||||
weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + price;
|
||||
}
|
||||
// BigDecimal weightW = new BigDecimal(vo.getWeight());
|
||||
// if (weightW.compareTo(new BigDecimal(stepWeight)) == -1) {
|
||||
price = Double.valueOf(stepPrice)* Double.valueOf(vo.getGoodsNumber()) + price;
|
||||
weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight;
|
||||
// }
|
||||
} else {
|
||||
price = Double.valueOf(vo.getPrice()) * Double.valueOf(vo.getGoodsNumber()) + price;
|
||||
weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight;
|
||||
@@ -150,7 +159,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
|
||||
}
|
||||
|
||||
private ShoppingCartVo price(ShoppingCartVo vo) {
|
||||
int weight = Integer.parseInt(vo.getTotalWeight());
|
||||
double weight = Double.valueOf(vo.getTotalWeight());
|
||||
LpkCustomer lpkCustomer = lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid", vo.getCustomerSid()));
|
||||
vo.setRemarks("已减免附加额");
|
||||
if (weight <= 99) {
|
||||
|
||||
@@ -89,14 +89,14 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
|
||||
baseMapper.updateById(vegetableCellar);
|
||||
}
|
||||
}
|
||||
// NewcomerRecoRecord n=newcomerRecoRecordService.getOne(new QueryWrapper<NewcomerRecoRecord>().eq("recommendedSid",ordOrder.getUserSid()).eq("state","1"));
|
||||
NewcomerRecoRecord n=newcomerRecoRecordService.getOne(new QueryWrapper<NewcomerRecoRecord>().eq("recommendedSid",ordOrder.getUserSid()).eq("state","1"));
|
||||
LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",ordOrder.getUserSid()));
|
||||
// if(n!=null){
|
||||
// aa(n.getGiftBagSid(),n.getRecommendSid());
|
||||
// customer.setIsNewUser("0");
|
||||
// n.setState("2");
|
||||
// newcomerRecoRecordService.updateById(n);
|
||||
// }
|
||||
if(n!=null){
|
||||
aa(n.getGiftBagSid(),n.getRecommendSid());
|
||||
customer.setIsNewUser("0");
|
||||
n.setState("2");
|
||||
newcomerRecoRecordService.updateById(n);
|
||||
}
|
||||
customer.setIsPurchase("0");
|
||||
lpkCustomerService.updateById(customer);
|
||||
ordOrder.setPayStatus(4);
|
||||
|
||||
Reference in New Issue
Block a user