修改

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.TransactionRecord;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.ListView;
 import com.yh.saas.plugin.yiliangyiyun.service.ITransactionRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -30,7 +32,7 @@ public class TransactionRecordController {
      * @return
      */
     @GetMapping("/getPriceList")
-    public List<TransactionRecord> getPriceList(String id) {
+    public List<ListView>  getPriceList(String id) {
         return transactionRecordService.getPriceList(id);
     }
     /**
@@ -39,7 +41,7 @@ public class TransactionRecordController {
      * @return
      */
     @GetMapping("/getSalePriceList")
-    public List<TransactionRecord> getSalePriceList(String id) {
+    public List<ListView> getSalePriceList(String id) {
         return transactionRecordService.getSalePriceList(id);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/ListView.java

@@ -0,0 +1,13 @@
+package com.yh.saas.plugin.yiliangyiyun.entity.view;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ListView {
+
+    private Float key;
+    private Float value;
+
+}

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

@@ -2,8 +2,10 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.TransactionRecord;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.ListView;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,11 +21,11 @@ public interface ITransactionRecordService extends IService<TransactionRecord> {
      * 获取成交价列表
      * @param
      */
-    List<TransactionRecord> getPriceList(String id);
+    List<ListView>  getPriceList(String id);
 
     /**
      * 获取成交价列表销售
      * @param
      */
-    List<TransactionRecord> getSalePriceList(String id);
+    List<ListView> getSalePriceList(String id);
 }

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

@@ -206,8 +206,14 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                         .eq(IdentityAuthenticationInfo.QueryFiles.COMMON_ID, commonId)
                         .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         if(identityAuthenticationInfo!=null){
+            //判断粮商是否存在
+            IdentityAuthenticationInfo identityAuthenticationInfo1 =
+                    this.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+                            .eq(IdentityAuthenticationInfo.QueryFiles.COMMON_ID, commonId)
+                            .eq("authentication_status_key","7")
+                            .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
             //身份审核中
-            if ("1".equals(identityAuthenticationInfo.getAuthenticationStatusKey())){
+            if (identityAuthenticationInfo1==null){
                 throw new AppServiceException(ExceptionDefinition.IDENTITY_IS_BEING_AUDITED);
             }
         }

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

@@ -4,6 +4,7 @@ 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.entity.view.ListView;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TransactionRecordMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IPurchaseOrderService;
 import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
@@ -13,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -35,7 +39,8 @@ public class TransactionRecordServiceImpl extends ServiceImpl<TransactionRecordM
      * @return
      */
     @Override
-    public List<TransactionRecord> getPriceList(String id) {
+    public List<ListView> getPriceList(String id) {
+        List<ListView> priceList = new ArrayList<>();
         PurchaseOrder purchaseOrder = purchaseOrderService.selectById(id);
         //查询成交记录
         List<TransactionRecord> transactionRecordList = this.selectList(new EntityWrapper<TransactionRecord>()
@@ -43,21 +48,39 @@ 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;
+        if (!CollectionUtils.isEmpty(transactionRecordList)) {
+            for (TransactionRecord transactionRecord : transactionRecordList) {
+                List<TransactionRecord> transactionRecordList1 = this.selectList(new EntityWrapper<TransactionRecord>()
+                        .eq("order_id", purchaseOrder.getId())
+                        .eq("transaction_price", transactionRecord.getTransactionPrice())
+                        .eq("record_flag", "0")
+                        .eq("delete_flag", "0"));
+                ListView listView =  new ListView();
+                Float turnover = 0f;
+                Float turnoverClose = 0f;
+                if (!CollectionUtils.isEmpty(transactionRecordList1)) {
+                    for (TransactionRecord transactionRecord1 : transactionRecordList1) {
+                        turnover = turnover + transactionRecord1.getTurnover();
+
+                    }
+                }
+                List<TransactionRecord> transactionRecordList2 = this.selectList(new EntityWrapper<TransactionRecord>()
+                        .eq("order_id", purchaseOrder.getId())
+                        .eq("transaction_price", transactionRecord.getTransactionPrice())
+                        .eq("record_flag", "1")
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(transactionRecordList1)) {
+                    for (TransactionRecord transactionRecord1 : transactionRecordList2) {
+                        turnoverClose = turnoverClose + transactionRecord1.getTurnover();
+                    }
+                    Float price = turnover - turnoverClose;
+                    listView.setKey(transactionRecord.getTransactionPrice());
+                    listView.setValue(price);
+                    priceList.add(listView);
+                }
+            }
+        }
+        return priceList;
     }
 
     /**
@@ -66,7 +89,8 @@ public class TransactionRecordServiceImpl extends ServiceImpl<TransactionRecordM
      * @return
      */
     @Override
-    public List<TransactionRecord> getSalePriceList(String id) {
+    public List<ListView> getSalePriceList(String id) {
+        List<ListView> priceList = new ArrayList<>();
         SaleOrder saleOrder = saleOrderService.selectById(id);
         //查询成交记录
         List<TransactionRecord> transactionRecordList = this.selectList(new EntityWrapper<TransactionRecord>()
@@ -74,6 +98,38 @@ public class TransactionRecordServiceImpl extends ServiceImpl<TransactionRecordM
                 .eq("record_flag", "0")
                 .eq("delete_flag", "0")
                 .groupBy("transaction_price"));
-        return transactionRecordList;
+        if (!CollectionUtils.isEmpty(transactionRecordList)) {
+            for (TransactionRecord transactionRecord : transactionRecordList) {
+                List<TransactionRecord> transactionRecordList1 = this.selectList(new EntityWrapper<TransactionRecord>()
+                        .eq("order_id", saleOrder.getId())
+                        .eq("transaction_price", transactionRecord.getTransactionPrice())
+                        .eq("record_flag", "0")
+                        .eq("delete_flag", "0"));
+                ListView listView =  new ListView();
+                Float turnover = 0f;
+                Float turnoverClose = 0f;
+                if (!CollectionUtils.isEmpty(transactionRecordList1)) {
+                    for (TransactionRecord transactionRecord1 : transactionRecordList1) {
+                        turnover = turnover + transactionRecord1.getTurnover();
+
+                    }
+                }
+                List<TransactionRecord> transactionRecordList2 = this.selectList(new EntityWrapper<TransactionRecord>()
+                        .eq("order_id", saleOrder.getId())
+                        .eq("transaction_price", transactionRecord.getTransactionPrice())
+                        .eq("record_flag", "1")
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(transactionRecordList1)) {
+                    for (TransactionRecord transactionRecord1 : transactionRecordList2) {
+                        turnoverClose = turnoverClose + transactionRecord1.getTurnover();
+                    }
+                    Float price = turnover - turnoverClose;
+                    listView.setKey(transactionRecord.getTransactionPrice());
+                    listView.setValue(price);
+                    priceList.add(listView);
+                }
+            }
+        }
+        return priceList;
     }
 }