zoujiajian 1 سال پیش
والد
کامیت
a39490f96a

+ 2 - 1
netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonBackView.java

@@ -25,7 +25,8 @@ import java.util.List;
 @Setter
 @SearchBean(tables = "order_don o left join goods_don g on g.id = o.goods_id" +
 		" left join order_don_transport odt on odt.order_id = o.id" +
-		" left join goods_don_sku sku on sku.id = o.sku_id",
+		" left join goods_don_sku sku on sku.id = o.sku_id" +
+		" :tb:",
 		where = ":condition:"
 )
 public class OrderDonBackView {

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -194,7 +194,7 @@ public class CmsOrderController {
 				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
 			}
 			if (otherOrderType == 6) {
-				//5.加盟订单
+				//6.加盟订单
 				builder.put("tb", String.format(" inner join user_mirror_shop_order_relate umr on umr.order_id = o.id"));
 			}
 		}
@@ -390,7 +390,7 @@ public class CmsOrderController {
 				builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
 			}
 			if (otherOrderType == 6) {
-				//5.加盟订单
+				//6.加盟订单
 				builder.put("tb", String.format(" inner join user_mirror_shop_order_relate umr on umr.order_id = o.id"));
 			}
 		}