--no commit message

app/resource/src/main/java/com/zrqx/resource/commons/model/bargaining/Bargaining.java

+package com.zrqx.resource.commons.model.bargaining;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.zrqx.resource.commons.model.ebook.Book;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "Bargaining",description = "助理活动")
+@Data
+@Table(name = "res_bargaining")
+public class Bargaining {
+	@ApiModelProperty("id")
+	@Id
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	private String id;
+	@ApiModelProperty("分享人id")
+	private String shareMemberId;
+	@ApiModelProperty("助力人id ")
+	private String helpMemberId;
+	@ApiModelProperty("助力人名称")
+	private String helpMemberName;
+	@ApiModelProperty("助力人头像")
+	private String helpMemberImg;
+	@ApiModelProperty("助力创建时间")
+	private Date createDate;
+	@ApiModelProperty("1: 99  2:50")
+	private Integer type;
+	@ApiModelProperty("价钱")
+	private BigDecimal price;
+	
+
+}

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/courselibrary/FgCourseLibraryVO.java

@@ -72,4 +72,6 @@ public class FgCourseLibraryVO {
 	
 	@ApiModelProperty("用户最近一次浏览时长")
 	private Integer timeSpeed;
+	@ApiModelProperty("兑换类型 1：1分 2：50元 ")
+	private Integer typeExchang;
 }

app/resource/src/main/java/com/zrqx/resource/fg/controller/courselibrary/FgCourseLibraryController.java

@@ -19,13 +19,16 @@ import com.zrqx.core.client.form.sysuser.FgQueryCommentForm;
 import com.zrqx.core.client.order.fg.FgOrderClient;
 import com.zrqx.core.client.sysuser.fg.FgSysuserClient;
 import com.zrqx.core.client.vo.sysuser.FgCommentNumAndScoreVo;
+import com.zrqx.core.commons.form.LoginMemberInfo;
 import com.zrqx.core.commons.model.member.Member;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.AllResourceTypeEnum;
+import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.resource.commons.model.courcelibrary.CourseLibrary;
+import com.zrqx.resource.commons.model.exchange.Exchange;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
 import com.zrqx.resource.commons.vo.fg.courselibrary.FgCourseLibraryListVO;
 import com.zrqx.resource.commons.vo.fg.courselibrary.FgCourseLibraryVO;
@@ -34,13 +37,16 @@ import com.zrqx.resource.commons.vo.fg.recommend.RecommendResourcePageVo;
 import com.zrqx.resource.commons.vo.fg.resource.FgRelationResourceListVo;
 import com.zrqx.resource.fg.manage.resourcelibrary.FgResourceManage;
 import com.zrqx.resource.fg.mapper.FgResourceRelationMapper;
+import com.zrqx.resource.fg.mapper.exchange.FgExchangeMapper;
 import com.zrqx.resource.fg.service.FgResourceRelationService;
 import com.zrqx.resource.fg.service.courselibrary.FgCourseLibraryService;
+import com.zrqx.resource.fg.service.exchange.FgExchangeService;
 import com.zrqx.resource.fg.service.marketing.FgPromotionService;
 import com.zrqx.resource.fg.service.record.FgRecordService;
 import com.zrqx.resource.fg.service.videolibrary.FgVideoLookLibraryService;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.entity.Example.Criteria;
@@ -74,7 +80,8 @@ public class FgCourseLibraryController {
 	private FgOrderClient fgOrderClient;
 	@Autowired
 	private FgResourceManage fgResourceManage;
-	
+	@Autowired
+	private FgExchangeService fgExchangeService;
 	@Autowired
 	private Redis redis;
 
@@ -95,6 +102,22 @@ public class FgCourseLibraryController {
 		if(vo.getPriceOption().intValue() == 0) {//若是免费则置为已购买
 			vo.setIsbuy(1);
 		}
+		if(redis.isExistMember()){
+			//用戶登录
+			LoginMemberInfo member = redis.getMember();
+			if(oid.equals("9931dd5889c811eaaea80050569033dc")) {
+				Example example  = fgExchangeService.createExample();
+				example.createCriteria().andEqualTo("memberid", member.getId());
+				List<Exchange> changeList = fgExchangeService.selectByExample(example);
+				//有兑换过兑换码
+				if(changeList.size()>0) {
+					vo.setTypeExchang(changeList.get(0).getTypeExchang());
+				}
+			}
+		}
+		
+		
+		
 		// 获取评分与评论数
 		FgQueryCommentForm fgQueryCommentForm = new FgQueryCommentForm();
 		fgQueryCommentForm.setResourceId(oid);

app/resource/src/main/java/com/zrqx/resource/fg/controller/exchange/ExchangeController.java

-package com.zrqx.resource.fg.controller.exchange;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.zrqx.core.commons.form.LoginMemberInfo;
-import com.zrqx.core.commons.redis.Redis;
-import com.zrqx.core.enums.resource.EbookPromptMessageEnum;
-import com.zrqx.core.util.response.CallBack;
-import com.zrqx.resource.commons.form.fg.exchange.ExchangeForm;
-import com.zrqx.resource.fg.service.ebook.FgBookService;
-import com.zrqx.resource.fg.service.exchange.FgExchangeService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 兑换管理-controller
- * @author Conan
- * @date 2018年7月13日上午10:02:31
- */
-@RestController
-@RequestMapping("/fg/exchange")
-@Api(description="前台-兑换管理")
-public class ExchangeController {
-	
-	@Autowired
-	private FgExchangeService fgExchangeService;
-	
-	@Autowired
-	private Redis redis;
-	
-	@ApiOperation(value = "兑换码兑现", notes = "兑换码兑现")
-	@GetMapping(value = "/save")
-	public CallBack<Boolean> ExchangeSave(ExchangeForm form) {
-		
-		fgExchangeService.updateorsave(form);
-		return CallBack.success(null);
-	}
-
-}

app/resource/src/main/java/com/zrqx/resource/fg/mapper/bargaining/FgBargainingMapper.java

+package com.zrqx.resource.fg.mapper.bargaining;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.resource.commons.model.bargaining.Bargaining;
+/**
+ * 兑换表
+ */
+public interface FgBargainingMapper extends BaseMapper <Bargaining>{
+	
+}

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

+package com.zrqx.resource.fg.service.bargaining;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.client.form.order.GoodsForm;
+import com.zrqx.core.client.form.order.OrderInfo;
+import com.zrqx.core.client.member.fg.OrganClient;
+import com.zrqx.core.client.order.fg.FgOrderClient;
+import com.zrqx.core.commons.form.LoginMemberInfo;
+import com.zrqx.core.commons.redis.Redis;
+import com.zrqx.core.enums.BooleanStatusEnum;
+import com.zrqx.core.enums.GoodsTypeEnum;
+import com.zrqx.core.enums.resource.LibraryStatusEnum;
+import com.zrqx.core.enums.resource.ReadOrShoppingCartTypeEnum;
+import com.zrqx.core.enums.resource.article.ReadTextPowerEnum;
+import com.zrqx.core.enums.resource.image.ImagePromptMessageEnum;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.resource.commons.form.fg.exchange.ExchangeForm;
+import com.zrqx.resource.commons.model.bargaining.Bargaining;
+import com.zrqx.resource.commons.model.exchange.Exchange;
+import com.zrqx.resource.commons.model.imagelibrary.ImageLibrary;
+import com.zrqx.resource.commons.model.imagelibrary.ImageLibraryDiyType;
+import com.zrqx.resource.commons.vo.fg.imagelibrary.FgImageLibraryVO;
+import com.zrqx.resource.fg.manage.memberconllection.FgMemberConllectionManage;
+import com.zrqx.resource.fg.mapper.bargaining.FgBargainingMapper;
+import com.zrqx.resource.fg.mapper.exchange.FgExchangeMapper;
+import com.zrqx.resource.fg.mapper.imagelibrary.FgImageLibraryDiyTypeRelationMapper;
+import com.zrqx.resource.fg.mapper.imagelibrary.FgImageLibraryMapper;
+import com.zrqx.resource.fg.mapper.record.FgRecordMapper;
+import com.zrqx.resource.fg.service.ebook.FgEbookServiceImpl;
+
+import tk.mybatis.mapper.entity.Example;
+
+/**
+ * 分享库
+ */
+@Service
+public class FgBargainingSerivceImpl extends
+		BaseServiceImpl<Bargaining, String> implements FgFgBargainingService {
+	private static final Logger logger = LoggerFactory.getLogger(Bargaining.class);
+	
+	@Autowired
+	private FgBargainingMapper mapper;
+
+
+	@Autowired
+	private Redis redis;
+
+	
+	@Override
+	public BaseMapper<Bargaining> getMapper() {
+		return mapper;
+	}
+
+
+	
+
+	
+	
+
+}

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

+package com.zrqx.resource.fg.service.bargaining;
+
+import java.util.List;
+
+import com.zrqx.core.client.form.order.OrderInfo;
+import com.zrqx.core.service.BaseService;
+import com.zrqx.resource.commons.form.fg.exchange.ExchangeForm;
+import com.zrqx.resource.commons.model.bargaining.Bargaining;
+import com.zrqx.resource.commons.model.exchange.Exchange;
+import com.zrqx.resource.commons.model.imagelibrary.ImageLibrary;
+import com.zrqx.resource.commons.vo.fg.imagelibrary.FgImageLibraryVO;
+
+/**
+ * 分享库
+ */
+public interface FgFgBargainingService extends BaseService<Bargaining,String>{
+	
+	
+	
+}

app/resource/src/main/java/com/zrqx/resource/fg/service/exchange/FgExchangeSerivceImpl.java

@@ -74,26 +74,28 @@ public class FgExchangeSerivceImpl extends
 			Integer istype= change.get(0).getIstype();
 			//等于1 已兑换 0 未兑换
 			if(istype == 1) {
-				throw new BaseException(2,"该兑换码已经被兑换过，请重新输入");
+				 throw new BaseException("该兑换码已经被兑换过，请重新输入");
 			}else {
 				//查询用户是否兑换过奖励
 				example  = this.createExample();
 				example.createCriteria().andEqualTo("memberid", member.getId());
 				List<Exchange> changeList = mapper.selectByExample(example);
-				//兑换过不能在兑换其它经理
+				//兑换过不能在兑换其它
 				if(changeList.size()>0) {
-				throw new BaseException(2,"您已经兑换过奖励，不能在兑换");
+				throw new BaseException("您已经兑换过奖励，不能在兑换");
 				}
 				//没兑换过任何奖励则,奖励变更
 				Exchange exchange = new Exchange();
 				exchange.setId(change.get(0).getId());
 				exchange.setMemberid(member.getId().toString());
 				exchange.setExchangeTime(new Date());
+				//已兌換
+				exchange.setIstype(1);
 				mapper.updateByPrimaryKeySelective(exchange);
 				
 			}
 		}
-		return false;
+		return true;
 	}