submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -2948,7 +2948,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (ObjectUtils.isNotNull(bo.getEndTime())){
             params.put("endtime", DateUtils.timestampToDateFormat(bo.getEndTime(),"yyyy/MM/dd"));
         }
-        params.put("saleid", "0");
+        if (ObjectUtils.isNotNull(bo.getCustomerId())){
+            params.put("saleid", bo.getCustomerId().toString());
+        }else {
+            params.put("saleid", "0");
+        }
         String respone = "";
         try {
             respone = HttpUtils.postFormBody(SHARED_STATISTICS, params);
@@ -3141,13 +3145,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 rateVo = JSONObject.parseObject(JSONObject.toJSONString(data), TopConversionRateVo.class);
                 if (CollectionUtils.isNotEmpty(rateVo.get_Data())){
                     rateVo.get_Data().forEach(item -> {
-                        item.setTbDealRate(item.getTbDealRate().multiply(new BigDecimal("100.00")));
-                        item.setHbDealRate(item.getHbDealRate().multiply(new BigDecimal("100.00")));
-                        item.setZbDealRateStr(item.getZbDealRate().multiply(new BigDecimal("100.00")) + "%");
-                        item.setTbPriceRate(item.getTbPriceRate().multiply(new BigDecimal("100.00")));
-                        item.setHbPriceRate(item.getHbPriceRate().multiply(new BigDecimal("100.00")));
-                        item.setZbPriceRateStr(item.getZbPriceRate().multiply(new BigDecimal("100.00")) + "%");
-                        item.setConverDealRate(item.getConverDealRate().multiply(new BigDecimal("100.00")));
+                        item.setTbDealRate(item.getTbDealRate().multiply(new BigDecimal("100")));
+                        item.setHbDealRate(item.getHbDealRate().multiply(new BigDecimal("100")));
+                        item.setZbDealRateStr(item.getZbDealRate().multiply(new BigDecimal("100")) + "%");
+                        item.setTbPriceRate(item.getTbPriceRate().multiply(new BigDecimal("100")));
+                        item.setHbPriceRate(item.getHbPriceRate().multiply(new BigDecimal("100")));
+                        item.setZbPriceRateStr(item.getZbPriceRate().multiply(new BigDecimal("100")) + "%");
+                        item.setConverDealRate(item.getConverDealRate().multiply(new BigDecimal("100")));
                     });
                 }
                 tableDataInfo.setRows(rateVo.get_Data());
@@ -3756,7 +3760,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
         params.put("stamp", nowTime.toString());
         params.put("sign", sign);
-//        params.put("type", bo.getType().toString());
+        params.put("type", bo.getType().toString());
+        params.put("sort", "1");
         params.put("page", bo.getPageNum().toString());
         params.put("pagesize", bo.getPageSize().toString());
         if (ObjectUtils.isNotNull(bo.getStartTime())){
@@ -3790,13 +3795,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 rateVo = JSONObject.parseObject(JSONObject.toJSONString(data), TopConversionRateVo.class);
                 if (CollectionUtils.isNotEmpty(rateVo.get_Data())){
                     rateVo.get_Data().forEach(item -> {
-                        item.setTbDealRate(item.getTbDealRate().multiply(new BigDecimal("100.00")));
-                        item.setHbDealRate(item.getHbDealRate().multiply(new BigDecimal("100.00")));
-                        item.setZbDealRateStr(item.getZbDealRate().multiply(new BigDecimal("100.00")) + "%");
-                        item.setTbPriceRate(item.getTbPriceRate().multiply(new BigDecimal("100.00")));
-                        item.setHbPriceRate(item.getHbPriceRate().multiply(new BigDecimal("100.00")));
-                        item.setZbPriceRateStr(item.getZbPriceRate().multiply(new BigDecimal("100.00")) + "%");
-                        item.setConverDealRate(item.getConverDealRate().multiply(new BigDecimal("100.00")));
+                        item.setTbDealRate(item.getTbDealRate().multiply(new BigDecimal("100")));
+                        item.setHbDealRate(item.getHbDealRate().multiply(new BigDecimal("100")));
+                        item.setZbDealRateStr(item.getZbDealRate().multiply(new BigDecimal("100")) + "%");
+                        item.setTbPriceRate(item.getTbPriceRate().multiply(new BigDecimal("100")));
+                        item.setHbPriceRate(item.getHbPriceRate().multiply(new BigDecimal("100")));
+                        item.setZbPriceRateStr(item.getZbPriceRate().multiply(new BigDecimal("100")) + "%");
+                        item.setConverDealRate(item.getConverDealRate().multiply(new BigDecimal("100")));
                     });
                 }
                 tableDataInfo.setRows(rateVo.get_Data());

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderStatisticsBo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author yangdamao