This commit is contained in:
2024-01-24 12:40:24 +08:00
parent 53c1a05d3e
commit e9390eb5f1
2 changed files with 8 additions and 3 deletions

View File

@@ -34,8 +34,8 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
LpkStoreService lpkStoreService; LpkStoreService lpkStoreService;
public ResultBean<CustomerStoreVo> getStoreBySid(String customerSid) { public ResultBean<CustomerStoreVo> getStoreBySid(String customerSid) {
ResultBean rb=new ResultBean().fail(); ResultBean rb=new ResultBean().fail();
CustomerStoreVo vo=new CustomerStoreVo();
vo=baseMapper.getStoreBySid(customerSid); CustomerStoreVo vo=baseMapper.getStoreBySid(customerSid);
// if(null==vo){ // if(null==vo){
// LpkStoreVo list= lpkStoreService.getAllStoreByQuery(new LpkStoreQuery()).getData().get(0); // LpkStoreVo list= lpkStoreService.getAllStoreByQuery(new LpkStoreQuery()).getData().get(0);
@@ -47,6 +47,11 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
// vo1=getStart(vo1); // vo1=getStart(vo1);
// return rb.success().setData(vo1); // return rb.success().setData(vo1);
// } // }
if(null==vo){
CustomerStoreVo vo1=new CustomerStoreVo();
vo1=getStart(vo1);
return rb.success().setData(vo1);
}
vo=getStart(vo); vo=getStart(vo);
return rb.success().setData(vo); return rb.success().setData(vo);
} }

View File

@@ -123,7 +123,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
vo.setRemarks("已减免附加额"); vo.setRemarks("已减免附加额");
if(weight<=99){ if(weight<=99){
if(weight<20){ if(weight<20){
vo.setRemarks("不足20斤,请继续选菜"); vo.setRemarks("不足20斤");
}else{ }else{
double a =1.1; double a =1.1;
double d=Double.valueOf(vo.getTotalPrice()); double d=Double.valueOf(vo.getTotalPrice());