|
@@ -62,6 +62,8 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
|
@Resource
|
|
|
private TaskMapper taskMapper;
|
|
|
@Resource
|
|
|
+ private ProductMapper productMapper;
|
|
|
+ @Resource
|
|
|
private ActionLogMapper actionLogMapper;
|
|
|
@Resource
|
|
|
private BusinessItemProductMapper bipMapper;
|
|
@@ -110,6 +112,29 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
|
businessOpportunity.setTaskList(tasks);
|
|
|
List<BusinessItemProduct> businessItemProducts = bipMapper.selectList(new QueryWrapper<BusinessItemProduct>().eq("business_id", bo.getId()));
|
|
|
if (businessItemProducts.size() > 0) {
|
|
|
+
|
|
|
+ List<Integer> productIds = businessItemProducts.stream()
|
|
|
+ .map(BusinessItemProduct::getProductId)
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ List<Product> products = productMapper.selectList(new QueryWrapper<Product>().in("id", productIds));
|
|
|
+ List<SysDict> sysDicts = sysDictMapper.selectList(new QueryWrapper<SysDict>().eq("code", "ProductType").or().eq("code", "ProductUnit"));
|
|
|
+ for (BusinessItemProduct businessItemProduct : businessItemProducts) {
|
|
|
+ for (Product product : products) {
|
|
|
+ if(businessItemProduct.getProductId().equals(product.getId())){
|
|
|
+ businessItemProduct.setProductName(product.getProductName());
|
|
|
+ for (SysDict sysDict : sysDicts) {
|
|
|
+ if (product.getType().equals(sysDict.getId())){
|
|
|
+ businessItemProduct.setProductType(sysDict.getName());
|
|
|
+ }
|
|
|
+ if (product.getUnit().equals(sysDict.getId())){
|
|
|
+ businessItemProduct.setUnit(sysDict.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
BigDecimal finalPrice = new BigDecimal(0);
|
|
|
BigDecimal discountedPrice = new BigDecimal(0);
|
|
|
for (BusinessItemProduct businessItemProduct : businessItemProducts) {
|