product_platform/yxt-yythmall-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1/24

Browse Source
This commit is contained in:
wangpengfei
2024-01-24 11:33:21 +08:00
parent 021de0cf55
commit 53c1a05d3e
8 changed files with 69 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrder.java
View File

@@ -20,12 +20,14 @@ public class VegeCellarReserveOrder {
private String isEnable;
private String affiliation;
private String customerSid;
private String reserveDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date reserveDate;
private String storeSid;
private String userName;
private String userPhone;
private String userAddress;
private String reserveCode;
private String storeName;
private String state;
}

23
src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java
View File

@@ -34,18 +34,19 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
LpkStoreService lpkStoreService;
public ResultBean<CustomerStoreVo> getStoreBySid(String customerSid) {
ResultBean rb=new ResultBean().fail();
CustomerStoreVo vo=baseMapper.getStoreBySid(customerSid);
CustomerStoreVo vo=new CustomerStoreVo();
vo=baseMapper.getStoreBySid(customerSid);
if(null==vo){
LpkStoreVo list= lpkStoreService.getAllStoreByQuery(new LpkStoreQuery()).getData().get(0);
CustomerStoreVo vo1=new CustomerStoreVo();
vo1.setAddress(list.getAddress());
vo1.setStoreSid(list.getSid());
vo1.setBusinessHours(list.getBusinessHours());
vo1.setStoreName(list.getName());
vo1=getStart(vo1);
return rb.success().setData(vo1);
}
// if(null==vo){
// LpkStoreVo list= lpkStoreService.getAllStoreByQuery(new LpkStoreQuery()).getData().get(0);
// CustomerStoreVo vo1=new CustomerStoreVo();
// vo1.setAddress(list.getAddress());
// vo1.setStoreSid(list.getSid());
// vo1.setBusinessHours(list.getBusinessHours());
// vo1.setStoreName(list.getName());
// vo1=getStart(vo1);
// return rb.success().setData(vo1);
// }
vo=getStart(vo);
return rb.success().setData(vo);
}

8
src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
View File

@@ -70,6 +70,9 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
ResultBean rb = new ResultBean();
NewcomerRecoRecord newcomerRecoRecord = new NewcomerRecoRecord();
List<RecommendNewUserBag> bags=recommendNewUserBagService.list();
if(bags.size()==0){
return rb.success().setData(newcomerRecoRecord);
}
dto.setGiftBagSid(bags.get(0).getSid());
dto.setGiftName(bags.get(0).getName());
BeanUtil.copyProperties(dto, newcomerRecoRecord, "id", "sid");
@@ -92,7 +95,10 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
newcomerRecoRecord.setRecommendedSid(dto.getCustomerSid());
newcomerRecoRecord.setAssistanceDate(new Date());
baseMapper.updateById(newcomerRecoRecord);
List<RecommendNewUserBagDetails>list=recommendNewUserBagDetailsService.list(new QueryWrapper<RecommendNewUserBagDetails>().eq("giftbagSid",dto.getGiftBagSid()));
List<RecommendNewUserBagDetails>list=recommendNewUserBagDetailsService.list(new QueryWrapper<RecommendNewUserBagDetails>().eq("giftbagSid",newcomerRecoRecord.getGiftBagSid()));
if(list.size()==0){
return rb.success();
}
// List<AppletGiftBagGoods>list=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",dto.getGiftBagSid()));
VegetableCellarDto dto1=new VegetableCellarDto();
dto1.setCustomerSid(customer.getSid());

19
src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagService.java
View File

@@ -246,25 +246,6 @@ public class RecommendNewUserBagService extends MybatisBaseService<RecommendNewU
String c= d.setScale(2,BigDecimal.ROUND_HALF_UP).toString();
return String.valueOf(c);
}
public ResultBean recommendRecord(String sid ) {
ResultBean rb=new ResultBean().fail();
RecommendNewUserBagVo vo=new RecommendNewUserBagVo();
RecommendNewUserBag bag=baseMapper.selectOne(new QueryWrapper<RecommendNewUserBag>().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31"));
vo.setRemarks(bag.getRemarks());
vo.setIconUrl(fileUploadComponent.getUrlPrefix() +bag.getIconUrl());
RecommendRecord recommendRecord=new RecommendRecord();
recommendRecord.setContent("梧桐居助力您获得7斤白菜");
RecommendRecord recommendRecord1=new RecommendRecord();
recommendRecord1.setContent("龙助力您获得7斤白菜");
RecommendRecord recommendRecord2=new RecommendRecord();
recommendRecord2.setContent("美人助力您获得15斤土豆");
List<RecommendRecord> list=new ArrayList<>();
list.add(recommendRecord);
list.add(recommendRecord1);
list.add(recommendRecord2);
vo.setRecordList(list);
return rb.success().setData(vo);
}
public ResultBean newUserQuota() {
ResultBean rb=new ResultBean().fail();
List<RecommendNewUserBagVo> s=baseMapper.giftBagGoodsList();

6
src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.java
View File

@@ -21,14 +21,14 @@ public interface RecommendNewUserBagDetailsMapper extends BaseMapper<RecommendNe
int deleteGoodsByBagSid(@Param("sid") String sid);
@Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl,goods.price,goods.unitName,goods.remarks " +
" from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
" from recommend_newuser_bag_details bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<RecommendNewUserBagDetailsVo> getGoodsByBagSid(String sid);
@Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " +
" ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
" ,goods.weight, goods.specificationUnit from recommend_newuser_bag_details bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<GiftBagGoods> getGoodsByBagSidA(String sid);
@Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " +
" ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
" ,goods.weight, goods.specificationUnit from recommend_newuser_bag_details bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<GiftBagGoods> getGoodsByBagSidB(String sid);
List<RecommendNewUserBagDetails> getRecordsByBagSid(@Param("sid") String sid);

26
src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java
View File

@@ -8,11 +8,15 @@ import com.yxt.yythmall.api.empcardgift.EmpCardGiftVo;
import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBag;
import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCard;
import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderVo;
import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails;
import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrder;
import com.yxt.yythmall.biz.empcard.EmpCardMapper;
import com.yxt.yythmall.biz.empcardgift.EmpCardGiftMapper;
import com.yxt.yythmall.biz.lpkgiftbag.LpkGiftBagService;
import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardMapper;
import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService;
import com.yxt.yythmall.biz.vegecallerreservedetail.VegeCellarReserveDetailsService;
import com.yxt.yythmall.biz.vegecallerreserveorder.VegeCellarReserveOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.RestController;
@@ -38,6 +42,10 @@ public class scheduledRest {
EmpCardMapper empCardMapper;
@Autowired
EmpCardGiftMapper empCardGiftMapper;
@Autowired
VegeCellarReserveOrderService vegeCellarReserveOrderService;
@Autowired
VegeCellarReserveDetailsService vegeCellarReserveDetailsService;
@Scheduled(cron = "0 0 1 * * ? ")
// @Scheduled(cron = "0 * * * * ? ")
public void updateIsItInvalid() {
@@ -176,4 +184,22 @@ public class scheduledRest {
}
}
}
/**
* 修改我的菜窖提货状态
*/
@Scheduled(cron = "0 0 1 * * ? ")
// @Scheduled(cron = "0 * * * * ? ")
public void updateReserveState() {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
List<VegeCellarReserveOrder> vegeCellarReserveOrders=vegeCellarReserveOrderService.list(new QueryWrapper<VegeCellarReserveOrder>().eq("state","0"));
for (VegeCellarReserveOrder vegeCellarReserveOrder : vegeCellarReserveOrders) {
//1>2 1 、1<2 -1 、1=2 0
int c = DateUtil.parse(sdf.format(vegeCellarReserveOrder.getReserveDate())).compareTo(DateUtil.parse(sdf.format(new Date())));
if(String.valueOf(c).equals("-1")){
vegeCellarReserveOrder.setState("1");
}
}
vegeCellarReserveOrderService.updateBatchById(vegeCellarReserveOrders);
}
}

8
src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
View File

@@ -69,7 +69,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
ShoppingCart entity=new ShoppingCart();
List<ShoppingCartVo> list= baseMapper.ShoppingCartList(query.getCustomerSid(),query.getBrandId());
list.forEach(s->{
s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getPrice())* Double.valueOf(s.getGoodsNumber())))));
s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getJPrice())* Double.valueOf(s.getGoodsNumber())))));
s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl());
});
@@ -120,7 +120,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
private ShoppingCartVo price(ShoppingCartVo vo){
int weight=Integer.parseInt(vo.getTotalWeight());
LpkCustomer lpkCustomer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",vo.getCustomerSid()));
vo.setRemarks("已减免附加费");
vo.setRemarks("已减免附加额");
if(weight<=99){
if(weight<20){
vo.setRemarks("不足20斤，请继续选菜");
@@ -134,7 +134,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
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)+"元");
vo.setRemarks("含附加额"+removeZeros(c)+"元");
}
// if(weight==20){
// if(lpkCustomer.getIsPurchase().equals("1")){
@@ -177,7 +177,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
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)+"元");
vo.setRemarks("含附加额"+removeZeros(c)+"元");
}
return vo;
}

15
src/main/java/com/yxt/yythmall/utils/DoubleUtils.java
View File

@@ -76,5 +76,18 @@ public class DoubleUtils {
return bd1.divide
(bd2,scale,BigDecimal.ROUND_HALF_UP).doubleValue();
}
/**
* 去除多余.0
* @param num
* @return
*/
public static String removeZeros(String num) {
if (num.indexOf(".") > 0) {
// 去掉多余的0
num = num.replaceAll("0+?$", "");
// 如果最后一位是. 则去掉
num = num.replaceAll("[.]$", "");
}
return num;
}
}