zoujiajian 1 tahun lalu
induk
melakukan
9f6895607e

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/UserMirrorShopDsJoinOrderDetailView.java

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select o.id,o.user_id,o.money,o.refund_money,o.created_time from user_mirror_shop_fee_order_don o where :yhs_id: and o.status not in ('close','noPayment') :time:) od" +
+@SearchBean(tables = "(select id,user_id,money,refund_money,created_time from user_mirror_shop_fee_order_don uor where :yhs_id: and uor.status not in ('close','noPayment') :time:) od" +
 		" inner join user_mirror_shop_distribute_waiting_send_points dp on dp.order_id = od.id and dp.type = 2")
 public class UserMirrorShopDsJoinOrderDetailView {
 

+ 0 - 1
netflix-service/src/main/java/com/cyksj/service/mirrorshop/impl/CmsUserMirrorShopServiceImpl.java

@@ -143,7 +143,6 @@ public class CmsUserMirrorShopServiceImpl implements CmsUserMirrorShopService {
 		if (shop == null) {
 			throw BusinessRuntimeException.getInstance("您不是小店店铺主");
 		}
-		redisService.del(CACHE_LOGIN_KEY);
 		return user;
 	}
 

+ 1 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/manage/CmsUserMirrorShopDataController.java

@@ -152,10 +152,9 @@ public class CmsUserMirrorShopDataController {
 		SearchResult search;
 		if (type == 1) {
 			search = beanSearcher.search(UserMirrorShopDsOrderDetailView.class, builder.build());
-			return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 		} else {
 			//加盟订单提成
-			search = beanSearcher.search(UserMirrorShopDsOrderDetailView.class, builder.build());
+			search = beanSearcher.search(UserMirrorShopDsJoinOrderDetailView.class, builder.build());
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}