机构画像

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -131,7 +131,7 @@ public class ClubPortraitService {
                     // 普通订单
                     if (("0".equals(order.getSecondHandOrderFlag()) || StringUtils.isEmpty(order.getSecondHandOrderFlag()))
                             && (!"1".equals(order.getRebateFlag()) || "".equals(order.getRebateFlag()) || StringUtils.isEmpty(order.getRebateFlag()))
-                            && ((!"2".equals(order.getRefundType())) || "".equals(order.getRefundType()) || StringUtils.isEmpty(order.getRefundType()))
+                            && (!"2".equals(order.getRefundType()) || "".equals(order.getRefundType()) || StringUtils.isEmpty(order.getRefundType()))
                             && !"4".equals(order.getStatus())) {
                         ordinary++;
                     }
@@ -187,14 +187,14 @@ public class ClubPortraitService {
                     orderPortrait.setName("返佣订单 【 0 %】 【" + rebate + "个】");
                 }
                 orderPortraits.add(orderPortrait);
-                orderPortrait = new OrderPortrait();
+                /*orderPortrait = new OrderPortrait();
                 orderPortrait.setValue(partialRefund);
                 if (partialRefund != 0) {
                     orderPortrait.setName("部分退款订单 【" + instance.format((float) partialRefund / (float) length * 100) + "%】 【" + partialRefund + "个】");
                 } else {
                     orderPortrait.setName("部分退款订单 【 0 %】 【" + partialRefund + "个】");
                 }
-                orderPortraits.add(orderPortrait);
+                orderPortraits.add(orderPortrait);*/
                 /*orderPortrait = new OrderPortrait();
                 orderPortrait.setValue(fullRefund);
                 if (fullRefund != 0) {