Merge branch 'master-tiande' into dev-tiande

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderActivityInfoDetailBiz.java

@@ -58,6 +58,15 @@ public class OrderActivityInfoDetailBiz extends BaseBiz<OrderActivityDetailMappe
     }
 
 
+    public OrderActivityInfoVo getInfo(ActivityOrderFindDTO activityOrderFindDTO){
+        List<OrderActivityInfoVo> list = mapper.selectList(activityOrderFindDTO);
+        if (list.size() > 0){
+            return list.get(0);
+        }
+        return  null;
+    }
+
+
 
     public PageDataVO<OrderActivityInfoVo> selectList(ActivityOrderFindDTO activityOrderFindDTO) {
         PageDataVO<OrderActivityInfoVo> dataVO = new PageDataVO<>();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderActivityController.java

@@ -5,8 +5,10 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderActivityDetailBiz;
+import com.xxfc.platform.order.biz.OrderActivityInfoDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderActiveDetail;
+import com.xxfc.platform.order.pojo.dto.ActivityOrderFindDTO;
 import com.xxfc.platform.order.pojo.dto.OrderActiveDto;
 import com.xxfc.platform.order.pojo.dto.OrderActivityDto;
 import com.xxfc.platform.order.pojo.order.ActivityOrderBO;
@@ -27,6 +29,10 @@ public class OrderActivityController extends BaseController<OrderActivityDetailB
 	@Autowired
 	OrderActivityService orderActivityService;
 
+	@Autowired
+	OrderActivityInfoDetailBiz activityInfoDetailBiz;
+
+
 	@RequestMapping(value = "add", method = RequestMethod.POST)
 	@ResponseBody
 	@ApiOperation(value = "确认活动订单")
@@ -50,7 +56,9 @@ public class OrderActivityController extends BaseController<OrderActivityDetailB
 
 	@GetMapping(value = "/detail")
 	public ObjectRestResponse orderDetail(String no) {
-		return baseBiz.orderDetail(no, userFeign.userDetailByToken(request.getHeader("Authorization")).getData());
+		ActivityOrderFindDTO activityOrderFindDTO = new ActivityOrderFindDTO();
+		activityOrderFindDTO.setOrderNo(no);
+		return ObjectRestResponse.succ(activityInfoDetailBiz.getInfo(activityOrderFindDTO));
 	}
 
 }