Merge branch 'master-order' into dev

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.entity.OrderActiveDetail;
 import com.xxfc.platform.order.mapper.OrderActiveDetailMapper;
@@ -14,10 +15,14 @@ import com.xxfc.platform.order.pojo.vo.OrderActivityVo;
 import com.xxfc.platform.order.rest.BaseOrderController;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -55,4 +60,21 @@ public class OrderActivityDetailBiz extends BaseBiz<OrderActiveDetailMapper, Ord
 		return ObjectRestResponse.succ(pageDataVO);
 	}
 
+	public ObjectRestResponse orderDetail(String no) {
+		AppUserDTO appUserDTO = getAppUser();
+		if (appUserDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
+		if (StringUtils.isBlank(no)) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		Map<String, Object> param = new HashMap<>();
+		param.put("oneNo", no);
+		param.put("userId", appUserDTO.getUserid());
+		List<OrderActivityVo> list = mapper.getAllActivityOrder(param);
+		if (list != null && list.size() > 0) {
+			return ObjectRestResponse.succ(list.get(0));
+		}
+		return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "订单不存在");
+	}
 }

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

@@ -44,4 +44,9 @@ public class OrderActivityController extends BaseController<OrderActivityDetailB
 		return baseBiz.getAll(dto);
 	}
 
+	@GetMapping(value = "/detail")
+	public ObjectRestResponse orderDetail(String no) {
+		return baseBiz.orderDetail(no);
+	}
+
 }