Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

# Conflicts:
#	src/main/java/com/huiju/estateagents/common/CommConstant.java

合并

src/main/java/com/huiju/estateagents/base/ResponseBean.java

@@ -45,17 +45,17 @@ public class ResponseBean<T> implements Serializable {
     }
     
     public void addError(String message) {
-        this.code = 1;
+        this.code = ResponseBean.ERROR_AUTH_FAIL;
         this.message = message;
     }
     
     public void addSuccess(String message) {
-        this.code = 0;
+        this.code = ResponseBean.CODE_SUCCESS;
         this.message = message;
     }
     
     public void addSuccess(T data) {
-        this.code = 0;
+        this.code = ResponseBean.CODE_SUCCESS;
         this.message = "成功";
         this.data = data;
     }

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -48,6 +48,13 @@ public class CommConstant {
      */
     public final static String FAVOR_PROJECT = "project";
 
+
+    /**
+     * 兑换商品
+     */
+    public final static String POINTS_CHANGE_GOODS = "goods";
+
+
     /**
      * 小程序默认首页
      */
@@ -55,8 +62,16 @@ public class CommConstant {
 
     public final static String MINIAPP_DEFAULT_AVATAR = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/default_avatar.jpg";
 
+
+    /**
+     * 未领取
+     */
+    public static final Integer STATUS_UNACCALIMED = 0;
+
     /**
      * 点赞资讯
      */
     public final static String FAVOR_NEWS = "news";
+
+
 }

src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaGoods;
 import com.huiju.estateagents.service.ITaGoodsService;
 import org.slf4j.Logger;
@@ -18,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.lang.invoke.ConstantCallSite;
+
 /**
  * <p>
     * 商品表  前端控制器
@@ -146,4 +151,74 @@ public class TaGoodsController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
+    public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam("buildingId") Integer buildingId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("building_id", buildingId);
+            queryWrapper.orderByDesc("order_no");
+            queryWrapper.orderByDesc("create_date");
+            
+            IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/goods/{id}",method= RequestMethod.GET)
+    public ResponseBean wxGoodsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaGoodsService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsGet -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 兑换商品接口
+     * @param id
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.GET)
+    public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            //兑换商品
+            String state = iTaGoodsService.exchangeGoods(id,openid);
+            responseBean.addSuccess(null);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsGet -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java

@@ -0,0 +1,177 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.service.ITaPointsExchangeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 积分兑换记录  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class TaPointsExchangeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPointsExchangeController.class);
+
+    @Autowired
+    public ITaPointsExchangeService iTaPointsExchangeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taPointsExchange",method= RequestMethod.GET)
+    public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPointsExchange 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPointsExchange",method= RequestMethod.POST)
+    public ResponseBean taPointsExchangeAdd(@RequestBody TaPointsExchange taPointsExchange){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPointsExchangeService.save(taPointsExchange)){
+                responseBean.addSuccess(taPointsExchange);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taPointsExchange/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPointsExchangeDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPointsExchangeService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPointsExchange 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPointsExchange/{id}",method= RequestMethod.PUT)
+    public ResponseBean taPointsExchangeUpdate(@PathVariable Integer id,
+                                        @RequestBody TaPointsExchange taPointsExchange){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPointsExchangeService.updateById(taPointsExchange)){
+                responseBean.addSuccess(taPointsExchange);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taPointsExchange/{id}",method= RequestMethod.GET)
+    public ResponseBean taPointsExchangeGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPointsExchangeService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPointsExchange",method= RequestMethod.GET)
+    public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam("buildingId") Integer buildingId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.orderByDesc("create_date");
+            
+            IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/entity/TaPointsExchange.java

@@ -0,0 +1,104 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 积分兑换记录 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPointsExchange implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录ID
+     */
+    @TableId(value = "rec_id", type = IdType.AUTO)
+    private Integer recId;
+
+    /**
+     * 兑换人
+     */
+    private String personId;
+
+    /**
+     * 兑换人姓名
+     */
+    private String personName;
+
+    /**
+     * 兑换人手机
+     */
+    private String phone;
+
+    /**
+     * 兑换人头像
+     */
+    private String avatar;
+
+    /**
+     * 兑换物品
+     */
+    private String targetId;
+
+    /**
+     * 物品名称
+     */
+    private String targetName;
+
+    /**
+     * 物品图片
+     */
+    private String image;
+
+    /**
+     * 消耗积分
+     */
+    private Integer points;
+
+    /**
+     * 领取地址
+     */
+    private String address;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expiredDate;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaPointsRecords.java

@@ -53,7 +53,7 @@ public class TaPointsRecords implements Serializable {
     /**
      * 变动类型
      */
-    private Integer changeType;
+    private String changeType;
 
     /**
      * 变动参数

src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPointsExchange;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 积分兑换记录  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Mapper
+public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaGoodsService.java

@@ -12,5 +12,12 @@ import com.huiju.estateagents.entity.TaGoods;
  * @since 2019-07-25
  */
 public interface ITaGoodsService extends IService<TaGoods> {
-
+	
+	/**
+	 * 兑换商品
+	 * @param id
+	 * @param openid
+	 * @return
+	 */
+	String exchangeGoods(Integer id, String openid);
 }

src/main/java/com/huiju/estateagents/service/ITaPointsExchangeService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPointsExchange;
+
+/**
+ * <p>
+ * 积分兑换记录  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java

@@ -1,10 +1,23 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaGoods;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.entity.TaPointsRecords;
 import com.huiju.estateagents.mapper.TaGoodsMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
 import com.huiju.estateagents.service.ITaGoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -15,6 +28,98 @@ import org.springframework.stereotype.Service;
  * @since 2019-07-25
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> implements ITaGoodsService {
-
+	
+	@Autowired
+	private TaPersonMapper taPersonMapper;
+	
+	@Autowired
+	private TaGoodsMapper taGoodsMapper;
+	
+	@Autowired
+	private TaPointsRecordsMapper taPointsRecordsMapper;
+	
+	@Autowired
+	private TaPointsExchangeMapper taPointsExchangeMapper;
+	
+	/**
+	 * 兑换商品
+	 *
+	 * @param id
+	 * @param openid
+	 * @return
+	 */
+	@Override
+	public String exchangeGoods(Integer id, String openid) {
+		//插入积分消耗流水,要查看积分是否足够兑换
+		TaPerson taPerson = taPersonMapper.getPersonByOpenId(openid).get(0);
+		TaGoods taGoods = taGoodsMapper.selectById(id);
+		//判断积分是否足够
+		if (taPerson.getPoints() < taGoods.getPointPrice()){
+			return "积分不足，请先获取积分";
+		}
+		//判断商品是否够兑换
+		if (taGoods.getTotalNum() < 1){
+			return "此商品无库存";
+		}
+		//插入积分消费流水表
+		insertTaPointRecords(taPerson,taGoods);
+		//插入积分兑换记录
+		insertTaPointsExchange(taPerson,taGoods);
+		//扣除积分重新更新persion表
+		Integer remainingPoints = taPerson.getPoints() - taGoods.getPointPrice();
+		taPerson.setPoints(remainingPoints);
+		taPersonMapper.updateById(taPerson);
+		//商品数减少
+		taGoods.setTotalNum(taGoods.getTotalNum() -1);
+		taGoodsMapper.updateById(taGoods);
+		return "success";
+	}
+	
+	/**
+	 * 插入积分兑换记录
+	 * @param taPerson
+	 * @param taGoods
+	 */
+	private void insertTaPointsExchange(TaPerson taPerson, TaGoods taGoods) {
+		TaPointsExchange taPointsExchange = new TaPointsExchange();
+		taPointsExchange.setPersonId(taPerson.getPersonId());
+		taPointsExchange.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
+		taPointsExchange.setPhone(taPerson.getPhone());
+		taPointsExchange.setAvatar(taPerson.getAvatarurl());
+		taPointsExchange.setTargetId(taGoods.getGoodsId().toString());
+		taPointsExchange.setTargetName(taGoods.getGoodsName());
+		taPointsExchange.setImage(taGoods.getImgUrl());
+		taPointsExchange.setPoints(taGoods.getPointPrice());
+		taPointsExchange.setAddress(taGoods.getAddress());
+		//0 未领取 1 已领取
+		taPointsExchange.setStatus(CommConstant.STATUS_UNACCALIMED);
+		taPointsExchange.setCreateDate(LocalDateTime.now());
+		taPointsExchange.setOrgId(taGoods.getOrgId());
+		taPointsExchange.setBuildingId(taGoods.getBuildingId());
+		taPointsExchangeMapper.insert(taPointsExchange);
+	}
+	
+	/**
+	 * 插入积分消费流水表
+	 * @param taPerson
+	 * @param taGoods
+	 */
+	private void insertTaPointRecords(TaPerson taPerson,TaGoods taGoods) {
+		TaPointsRecords taPointsRecords = new TaPointsRecords();
+		taPointsRecords.setPersonId(taPerson.getPersonId());
+		taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
+		taPointsRecords.setPersonType(taPerson.getPersonType());
+		taPointsRecords.setPointsAmount(-taGoods.getPointPrice());
+		taPointsRecords.setChangeType(CommConstant.POINTS_CHANGE_GOODS);
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("goods_id",taGoods.getGoodsId());
+		taPointsRecords.setChangeParams(jsonObject.toJSONString());
+		taPointsRecords.setCreateDate(LocalDateTime.now());
+		taPointsRecords.setOrgId(taGoods.getOrgId());
+		taPointsRecords.setBuildingId(taGoods.getBuildingId());
+		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+		taPointsRecordsMapper.insert(taPointsRecords);
+	}
 }

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -115,12 +115,16 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
+        wrapper.set("person_type",CommConstant.PERSON_ESTATE_AGENT);
 //        wrapper.set(null == tel || "".equals(tel), "tel", phone);
         wrapper.eq("mini_openid", miniOpenid);
+        wrapper.eq("person_type",null);
         taPersonMapper.update(new TaPerson(), wrapper);
 
         person.setPhone(phone);
-        if (null == tel || "".equals(tel)) person.setTel(phone);
+        if (null == tel || "".equals(tel)){
+            person.setTel(phone);
+        }
 
         return person;
     }

src/main/java/com/huiju/estateagents/service/impl/TaPointsExchangeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
+import com.huiju.estateagents.service.ITaPointsExchangeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 积分兑换记录  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMapper, TaPointsExchange> implements ITaPointsExchangeService {
+
+}

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaPointsExchangeMapper">
+
+</mapper>