--no commit message

app/order/src/main/java/com/zrqx/order/fg/mapper/FgOrderMapper.java

@@ -295,7 +295,7 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 			+ "</script>")
 	List<Order> queryAllWaitPayAndTimeout(@Param("date")String date);
 	@Select("<script>"
-			+"SELECT count(*) from  ord_orderinfo info INNER JOIN ord_order der on info.orderid=der.id where goodsid={oid} and der.status=6"
+			+"SELECT count(*) from  ord_orderinfo info INNER JOIN ord_order der on info.orderid=der.id where info.goodsid=#{oid} and der.status=6"
 			+"</script>")
-	Integer BuyGoodsCount(String oid);
+	Integer BuyGoodsCount(@Param("oid")String oid);
 }

app/order/src/main/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java

@@ -1036,7 +1036,7 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
 	@Override
 	public Integer buyCount(String oid) {
 		Integer count=fgOrderMapper.BuyGoodsCount(oid);
-		return null;
+		return count;
 	}
 	
 	

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/bargaining/FgCourseBargainingListVO.java

@@ -21,9 +21,9 @@ public class FgCourseBargainingListVO {
 	private Integer stock;
 	@ApiModelProperty("已购")
 	private Integer purchased;
-	@ApiModelProperty("定价 元")
+	@ApiModelProperty("砍价 元")
 	private BigDecimal price;
-	@ApiModelProperty("砍价")
+	@ApiModelProperty("售价")
 	private BigDecimal realPrice;
 	@ApiModelProperty("封面")
 	private String cover;

app/resource/src/main/java/com/zrqx/resource/fg/controller/BoostActivity/FgBoostActivityController.java

@@ -67,19 +67,7 @@ public class FgBoostActivityController {
 	@ApiOperation(value = "助力活动资源", notes = "助力活动资源1:0.01 ,2:49.9")
 	@GetMapping(value = "/get")
 	public CallBack<FgCourseBargainingListVO> get(Integer type) {
-		FgCourseBargainingListVO vo = new FgCourseBargainingListVO();
-		CourseLibrary courseLibrary = service.selectByPrimaryKey("9931dd5889c811eaaea80050569033dc");
-		//获取购买数量
-		CallBack<Integer> buyCount = fgOrderClient.buyCount(courseLibrary.getId());
-		//获取库存 1(0.01) 2(49.9)
-		Integer num=fgBargainingSerivce.getStockNum(type);
-		vo.setId(courseLibrary.getId());
-		vo.setName(courseLibrary.getName());
-		vo.setCover(courseLibrary.getCover());
-		vo.setPurchased(buyCount.getData());
-		vo.setRealPrice(new BigDecimal(0.01));
-		vo.setPrice(courseLibrary.getPrice());
-		vo.setStock(num);
+		FgCourseBargainingListVO vo = fgBargainingSerivce.get(type);
 		return CallBack.success(vo);
 	}
 	@ApiOperation(value = "获取助力活动人数", notes = "获取助力活动人数")

app/resource/src/main/java/com/zrqx/resource/fg/service/bargaining/FgBargainingSerivceImpl.java

@@ -11,13 +11,19 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.zrqx.core.client.order.fg.FgOrderClient;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.resource.commons.form.fg.bargaining.BargainingForm;
 import com.zrqx.resource.commons.model.bargaining.Bargaining;
+import com.zrqx.resource.commons.model.courcelibrary.CourseLibrary;
+import com.zrqx.resource.commons.vo.fg.bargaining.FgCourseBargainingListVO;
 import com.zrqx.resource.fg.mapper.bargaining.FgBargainingMapper;
+import com.zrqx.resource.fg.mapper.courselibrary.FgCourseLibraryMapper;
+import com.zrqx.resource.fg.service.courselibrary.FgCourseLibraryService;
 
 /**
  * 分享库
@@ -28,9 +34,10 @@ public class FgBargainingSerivceImpl extends BaseServiceImpl<Bargaining, String>
 
 	@Autowired
 	private FgBargainingMapper mapper;
-
 	@Autowired
-	private Redis redis;
+	private FgCourseLibraryMapper fgCourseLibraryMapper;
+	@Autowired
+	private FgOrderClient fgOrderClient;
 
 	@Override
 	public BaseMapper<Bargaining> getMapper() {
@@ -128,7 +135,25 @@ public class FgBargainingSerivceImpl extends BaseServiceImpl<Bargaining, String>
 	@Override
 	public Integer getPeopleNumber() {
 		Integer stockNum = mapper.getPeopleNumber();
-		return null;
+		return stockNum;
+	}
+
+	@Override
+	public FgCourseBargainingListVO get(Integer type) {
+		FgCourseBargainingListVO vo = new FgCourseBargainingListVO();
+		CourseLibrary courseLibrary = fgCourseLibraryMapper.selectByPrimaryKey("9931dd5889c811eaaea80050569033dc");
+		//获取购买数量
+		CallBack<Integer> buyCount = fgOrderClient.buyCount(courseLibrary.getId());
+		//获取库存 1(0.01) 2(49.9)
+		Integer num=this.getStockNum(type);
+		vo.setId(courseLibrary.getId());
+		vo.setName(courseLibrary.getName());
+		vo.setCover(courseLibrary.getCover());
+		vo.setPurchased(buyCount.getData());
+		vo.setRealPrice(new BigDecimal(0.01));
+		vo.setPrice(courseLibrary.getRealPrice());
+		vo.setStock(num);
+		return vo;
 	}
 
 

app/resource/src/main/java/com/zrqx/resource/fg/service/bargaining/FgBargainingService.java

@@ -4,6 +4,7 @@ package com.zrqx.resource.fg.service.bargaining;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.resource.commons.form.fg.bargaining.BargainingForm;
 import com.zrqx.resource.commons.model.bargaining.Bargaining;
+import com.zrqx.resource.commons.vo.fg.bargaining.FgCourseBargainingListVO;
 
 /**
  * 分享库
@@ -30,5 +31,13 @@ public interface FgBargainingService extends BaseService<Bargaining,String>{
 	 * @date: 2020年9月10日 上午9:30:45
 	 */
 	Integer getPeopleNumber();
+	/**
+	 * 获取助力活动资源
+	 * @param type
+	 * @return
+	 * @author rjc
+	 * @date: 2020年9月10日 上午11:10:23
+	 */
+	FgCourseBargainingListVO get(Integer type);
 	
 }