huangzhiguo 1 år sedan
förälder
incheckning
64e9d06bff

+ 2 - 2
src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -141,10 +141,10 @@ public class ClubPortraitService {
                         secondHand++;
                     }
                     // 返佣订单
-                    if ("1".equals(order.getRebateFlag()) &&
+                    /*if ("1".equals(order.getRebateFlag()) &&
                             (!"2".equals(order.getRefundType()) || StringUtils.isEmpty(order.getRefundType())) && !"4".equals(order.getStatus())) {
                         rebate++;
-                    }
+                    }*/
                     // 部分退款
                     /*if ("1".equals(order.getRefundType()) && !"4".equals(order.getStatus())) {
                         partialRefund++;

+ 0 - 1
src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -4,7 +4,6 @@
 
     <sql id="shopOrderColumns">
         co.rebateFee as rebateFee,
-        ifnull(co.couponAmount, 0) as couponAmount,
 			co.userBeans as userBeans,
 			a.shopOrderID AS shopOrderID,
 			a.shopStatus AS status,