订单信息bug
This commit is contained in:
@@ -92,6 +92,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
||||
private CourseCatalogueDao courseCatalogueDao;
|
||||
@Autowired
|
||||
private PayZfbOrderService payZfbOrderService;
|
||||
@Autowired
|
||||
private BookBuyConfigDao bookBuyConfigDao;
|
||||
|
||||
protected Logger logger = LoggerFactory.getLogger(BuyOrderServiceImpl.class);
|
||||
|
||||
@@ -481,6 +483,10 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
||||
}
|
||||
b.setProductList(buyOrderProducts);
|
||||
b.setTimestamp(b.getCreateTime().getTime()/1000);
|
||||
//充值订单填充充值商品信息
|
||||
if(b.getProductId()!=null&&Integer.valueOf(b.getProductId())>0){
|
||||
b.setBookBuyConfigEntity(bookBuyConfigDao.selectById(Integer.valueOf(b.getProductId())));
|
||||
}
|
||||
//获取包裹信息
|
||||
List<Integer> collect = buyOrderProductService.list(new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, b.getOrderId()).gt(BuyOrderProduct::getExpressOrderId, 0))
|
||||
.stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList());
|
||||
|
||||
@@ -7,6 +7,7 @@ import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.peanut.modules.book.controller.BookBuyConfigController;
|
||||
import com.peanut.modules.book.vo.response.ConsigneeVo;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -200,4 +201,9 @@ public class BuyOrder implements Serializable {
|
||||
|
||||
@TableField(exist = false)
|
||||
private String appName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private BookBuyConfigEntity bookBuyConfigEntity;
|
||||
@TableField(exist = false)
|
||||
private VipBuyConfigEntity vipBuyConfigEntity;
|
||||
}
|
||||
|
||||
@@ -2,9 +2,11 @@ package com.peanut.modules.medical.controller;
|
||||
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@@ -18,4 +20,5 @@ public class CourseController {
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.peanut.modules.medical.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity;
|
||||
|
||||
public interface CourseCatalogueChapterVideoService extends IService<CourseCatalogueChapterVideoEntity> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.peanut.modules.medical.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao;
|
||||
import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity;
|
||||
import com.peanut.modules.medical.service.CourseCatalogueChapterVideoService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service("medicineCourseCatalogueChapterVideoService")
|
||||
public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCatalogueChapterVideoDao, CourseCatalogueChapterVideoEntity> implements CourseCatalogueChapterVideoService {
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user