Browse Source

订单想数据统计开发

anderx 1 year ago
parent
commit
79fbd90ccf

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -2513,8 +2513,8 @@
 
   <select id="selectStatisticsOrderProject" resultType="com.goafanti.order.bo.OutOrderProject">
     SELECT a.order_no as orderNo, a.order_type orderType,a.sales_type as salesType,b.service_type AS serviceType,a.liquidation_status as liquidationStatus,
-           '催款节点' as dunNodeContent,b.project_type as projectType, a.total_amount as totalAmount,a.approval ,a.sign_time as signTime,
-           a.create_time as createTime,b.buyer_name as buyerName,a.contract_no as contractNo, d.bname htlx,
+           b.dun_node_content as dunNodeContent,b.project_type as projectType, a.total_amount as totalAmount,a.approval ,a.sign_time as signTime,
+           a.create_time as createTime,b.buyer_name as buyerName,a.contract_no as contractNo, d.bname htlx,b.order_receivables orderReceivables,
            a.settlement_amount as settlementAmount,b.invoice_amount as invicueAmount, b.cost_amount as costAmount,b.payment_amount as paymentAmount,
            b.finance_name as financeName,b.salesman_name as salesmanName, e.commodity_name as commodityName,e2.service_year as serviceYear,
            e2.service_life as serviceLife,e2.year_sum as yearSum,e.task_distribution_time as taskDistributionTime ,e.commodity_quantity as commodityQuantity,

+ 15 - 15
src/main/java/com/goafanti/order/bo/OutOrderProject.java

@@ -36,7 +36,7 @@ public class OutOrderProject {
     /**
      * 是否会员
      */
-    @Excel(name = "是否会员")
+    @Excel(name = "是否会员",readConverterExp = "0=否,1=是")
     private Integer projectType;
     /**
      * 大客户
@@ -94,19 +94,19 @@ public class OutOrderProject {
     private String contractAmountProportion;
 
     @Excel(name = "应收款")
-    private String shouldAmount;
+    private BigDecimal orderReceivables;
 
     /**
      * 已收款
      */
     @Excel(name = "已收款")
-    private String settlementAmount;
+    private BigDecimal settlementAmount;
 
     @Excel(name = "欠款")
-    private String arrearsAmount;
+    private BigDecimal arrearsAmount;
 
     @Excel(name = "已报销")
-    private String expenseAmount;
+    private BigDecimal expenseAmount;
 
     @Excel(name = "应公出")
     private String shouldPublic;
@@ -322,35 +322,35 @@ public class OutOrderProject {
         this.contractAmountProportion = contractAmountProportion;
     }
 
-    public String getShouldAmount() {
-        return shouldAmount;
+    public BigDecimal getOrderReceivables() {
+        return orderReceivables;
     }
 
-    public void setShouldAmount(String shouldAmount) {
-        this.shouldAmount = shouldAmount;
+    public void setOrderReceivables(BigDecimal orderReceivables) {
+        this.orderReceivables = orderReceivables;
     }
 
-    public String getSettlementAmount() {
+    public BigDecimal getSettlementAmount() {
         return settlementAmount;
     }
 
-    public void setSettlementAmount(String settlementAmount) {
+    public void setSettlementAmount(BigDecimal settlementAmount) {
         this.settlementAmount = settlementAmount;
     }
 
-    public String getArrearsAmount() {
+    public BigDecimal getArrearsAmount() {
         return arrearsAmount;
     }
 
-    public void setArrearsAmount(String arrearsAmount) {
+    public void setArrearsAmount(BigDecimal arrearsAmount) {
         this.arrearsAmount = arrearsAmount;
     }
 
-    public String getExpenseAmount() {
+    public BigDecimal getExpenseAmount() {
         return expenseAmount;
     }
 
-    public void setExpenseAmount(String expenseAmount) {
+    public void setExpenseAmount(BigDecimal expenseAmount) {
         this.expenseAmount = expenseAmount;
     }
 

+ 1 - 1
src/main/java/com/goafanti/order/controller/StatisticsApiController.java

@@ -184,7 +184,7 @@ public class StatisticsApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 销售来源订单列表
+	 * 订单想数据统计
 	 * @param in
 	 * @return
 	 */

+ 15 - 1
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -12,6 +12,7 @@ import groovy.util.logging.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -96,6 +97,19 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 	@Override
 	public Object orderProject(InputOrderProject in) {
 		List<OutOrderProject> outOrderProject = tOrderTaskMapper.selectStatisticsOrderProject(in);
-		return null;
+		for (OutOrderProject e : outOrderProject) {
+			//是否是大客户
+			if (e.getTotalAmount().compareTo(new BigDecimal(10)) >= 0){
+				e.setBigUser(1);
+			}
+			//计算比例
+			BigDecimal orderReceivables=BigDecimal.ZERO;
+			if (e.getOrderReceivables()!=null)orderReceivables=e.getOrderReceivables();
+			BigDecimal settlementAmount=BigDecimal.ZERO;
+			if (e.getSettlementAmount()!=null)settlementAmount=e.getSettlementAmount();
+			BigDecimal divide = settlementAmount.divideToIntegralValue(orderReceivables);
+			System.out.println(divide);
+		}
+		return outOrderProject;
 	}
 }