Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/base/dao/LoveProjectDAO.java

@@ -1,6 +1,8 @@
 package com.jpsoft.employment.modules.base.dao;
 
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.jpsoft.employment.modules.base.entity.LoveProject;
 import java.util.Map;
@@ -15,5 +17,5 @@ public interface LoveProjectDAO {
 	int delete(String id);
 	List<LoveProject> list();
 	List<LoveProject> search(Map<String, Object> searchParams, List<Sort> sortList);
-	int countByType(String type);
+	int countByType(@Param(value="type") String type);
 }

common/src/main/resources/mapper/base/WishInfoUserRecord.xml

@@ -143,6 +143,7 @@
 	<select id="countByWish" parameterType="string" resultType="int">
 		SELECT COUNT(*) FROM base_wish_info_user_record
 		WHERE del_flag = 0
+		AND status_= 1
 		AND wish_info_id = #{0}
 	</select>
 	<select id="countByWishAndStatus" parameterType="string" resultType="int">

web/src/main/java/com/jpsoft/employment/modules/base/api/ChartApi.java

@@ -51,7 +51,7 @@ public class ChartApi {
         Map<String,Object> map = new HashMap<>();
 
         Integer countWishRecord = wishInfoUserRecordService.countByUser(null);
-        Integer countLoveProject = loveProjectService.countByType(null);
+        Integer countLoveProject = loveProjectService.countByType("1");
         Integer countAssist = 0;
 
         map.put("countWishRecord",countWishRecord);

web/src/main/java/com/jpsoft/employment/modules/base/api/RegUserApi.java

@@ -190,6 +190,47 @@ public class RegUserApi {
         return messageResult;
     }
 
+    @PostMapping("unLogin")
+    @ApiOperation(value = "登出")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="openId", value="openId", required=true, paramType="query"),
+    })
+    public MessageResult unLogin(String openId) {
+        MessageResult messageResult = new MessageResult<>();
+
+        try {
+            if (StrUtil.isBlank(openId)) {
+                throw new Exception("微信标识不存在");
+            }
+
+            if (StringUtils.isNotEmpty(openId)) {
+                RegUser regUser = regUserService.getByOpenId(openId);
+
+                if (regUser != null) {
+                    regUser.setOpenId("");
+                    regUser.setUpdateBy(regUser.getId());
+                    regUser.setUpdateTime(new Date());
+                    regUserService.update(regUser);
+
+                    messageResult.setResult(true);
+                    messageResult.setCode(200);
+                    messageResult.setData(regUser);
+                }
+                else {
+                    throw new CustomException("openid不存在");
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            logger.error(ex.getMessage());
+            messageResult.setCode(400);
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
 //    @PostMapping("uploadPicture")
 //    @ApiOperation(value="上传图片")
 //    @ApiImplicitParams({