Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TransactionRecordController.java

@@ -33,6 +33,15 @@ public class TransactionRecordController {
     public List<TransactionRecord> getPriceList(String id) {
         return transactionRecordService.getPriceList(id);
     }
+    /**
+     * 获取成交价列表
+     * @param id
+     * @return
+     */
+    @GetMapping("/getSalePriceList")
+    public List<TransactionRecord> getSalePriceList(String id) {
+        return transactionRecordService.getSalePriceList(id);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITransactionRecordService.java

@@ -20,4 +20,10 @@ public interface ITransactionRecordService extends IService<TransactionRecord> {
      * @param
      */
     List<TransactionRecord> getPriceList(String id);
+
+    /**
+     * 获取成交价列表销售
+     * @param
+     */
+    List<TransactionRecord> getSalePriceList(String id);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TransactionRecordServiceImpl.java

@@ -2,13 +2,16 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseOrder;
+import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
 import com.yh.saas.plugin.yiliangyiyun.entity.TransactionRecord;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TransactionRecordMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IPurchaseOrderService;
+import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
 import com.yh.saas.plugin.yiliangyiyun.service.ITransactionRecordService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -24,6 +27,8 @@ import java.util.List;
 public class TransactionRecordServiceImpl extends ServiceImpl<TransactionRecordMapper, TransactionRecord> implements ITransactionRecordService {
     @Autowired
     private IPurchaseOrderService purchaseOrderService;
+    @Autowired
+    private ISaleOrderService saleOrderService;
     /**
      * 获取成交价列表
      * @param id
@@ -38,6 +43,37 @@ public class TransactionRecordServiceImpl extends ServiceImpl<TransactionRecordM
                 .eq("record_flag", "0")
                 .eq("delete_flag", "0")
                 .groupBy("transaction_price"));
+//        if (!CollectionUtils.isEmpty(transactionRecordList)){
+//            for (TransactionRecord transactionRecord:transactionRecordList){
+//                List<TransactionRecord> transactionRecordList1=this.selectList(new EntityWrapper<TransactionRecord>()
+//                        .eq("transaction_price",transactionRecord.getTransactionPrice())
+//                        .eq("delete_flag", "0"));
+//                if (!CollectionUtils.isEmpty(transactionRecordList1)){
+//                    for (TransactionRecord transactionRecord1:transactionRecordList1){
+//                        List<PurchaseOrder> purchaseOrderList=purchaseOrderService.selectList(new EntityWrapper<PurchaseOrder>()
+//                                .eq("id",transactionRecord1.getOrderId())
+//                                .eq("delete_flag", "0"));
+//                    }
+//                }
+//            }
+//        }
+        return transactionRecordList;
+    }
+
+    /**
+     * 获取成交价列表销售
+     * @param id
+     * @return
+     */
+    @Override
+    public List<TransactionRecord> getSalePriceList(String id) {
+        SaleOrder saleOrder = saleOrderService.selectById(id);
+        //查询成交记录
+        List<TransactionRecord> transactionRecordList = this.selectList(new EntityWrapper<TransactionRecord>()
+                .eq("order_id", saleOrder.getId())
+                .eq("record_flag", "0")
+                .eq("delete_flag", "0")
+                .groupBy("transaction_price"));
         return transactionRecordList;
     }
 }