diff --git a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrder.java b/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrder.java index b1f7e61..54e5d71 100644 --- a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrder.java +++ b/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrder.java @@ -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; } 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 7e05bfc..c213185 100644 --- a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java +++ b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java @@ -34,18 +34,19 @@ public class CustomerStoreService extends MybatisBaseService 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); } diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java index 8b61bc3..2edfe87 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java @@ -70,6 +70,9 @@ public class NewcomerRecoRecordService extends MybatisBaseService 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 MybatisBaseServicelist=recommendNewUserBagDetailsService.list(new QueryWrapper().eq("giftbagSid",dto.getGiftBagSid())); + Listlist=recommendNewUserBagDetailsService.list(new QueryWrapper().eq("giftbagSid",newcomerRecoRecord.getGiftBagSid())); + if(list.size()==0){ + return rb.success(); + } // Listlist=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",dto.getGiftBagSid())); VegetableCellarDto dto1=new VegetableCellarDto(); dto1.setCustomerSid(customer.getSid()); diff --git a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagService.java b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagService.java index bc93e02..762bfd7 100644 --- a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagService.java +++ b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagService.java @@ -246,25 +246,6 @@ public class RecommendNewUserBagService extends MybatisBaseService().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 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 s=baseMapper.giftBagGoodsList(); diff --git a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.java b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.java index 0dd1785..3e4cca1 100644 --- a/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.java @@ -21,14 +21,14 @@ public interface RecommendNewUserBagDetailsMapper extends BaseMapper 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 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 getGoodsByBagSidB(String sid); List getRecordsByBagSid(@Param("sid") String sid); diff --git a/src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java b/src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java index 8d693e8..79f86bd 100644 --- a/src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java +++ b/src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java @@ -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 vegeCellarReserveOrders=vegeCellarReserveOrderService.list(new QueryWrapper().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); + } } 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 8611228..a13e2d8 100644 --- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java +++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java @@ -69,7 +69,7 @@ public class ShoppingCartService extends MybatisBaseService 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().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 0) { + // 去掉多余的0 + num = num.replaceAll("0+?$", ""); + // 如果最后一位是. 则去掉 + num = num.replaceAll("[.]$", ""); + } + return num; + } }