1

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -47,6 +47,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -258,6 +259,24 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("否")) {
                 record.setUploadState("3");
             }
+            //是否调整
+            if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0){
+                BigDecimal decimal = new BigDecimal(record.getUploadMoney()).subtract(new BigDecimal(record.getFreight())).subtract(new BigDecimal(record.getStayDetermineMoney())).subtract(new BigDecimal(record.getEstimateRebate()));
+                int i = decimal.compareTo(BigDecimal.ZERO);
+                if (i == -1){//小于
+                    record.setIsAdjustment("否");
+                    record.setAdjustmentMoney("0");
+                }else if (i == 0){//等于
+                    record.setIsAdjustment("是");
+                    record.setAdjustmentMoney("0");
+                }else if (i == 1){//大于
+                    record.setIsAdjustment("是");
+                    record.setAdjustmentMoney(decimal.toString());
+                }
+            }else {
+                record.setIsAdjustment("否");
+                record.setAdjustmentMoney("0");
+            }
         }
         PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;