Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

 package com.github.wxiaoqi.security.admin.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 会员等级表
@@ -76,5 +79,8 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "赠送免费天数")
 	private Integer number;
 
+	@Column(name = "big_icon")
+	@ApiModelProperty(value = "大图标")
+	private String bigIcon;
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -83,6 +83,7 @@ public class AppUserDTO {
 	private String memberName;
 	//图标
 	private String icon;
+	private String bigIcon;
 	private Integer memberNo;
 	private Long cardLeave;
 	private Integer isBind;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -4,10 +4,8 @@ import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDataFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberSaveDTO;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper;
 import com.github.wxiaoqi.security.admin.vo.BaseUserMemberExportVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserMemberLevelBiz.java

@@ -2,9 +2,9 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -51,4 +51,11 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
        }
        return levelAndDiscountMap;
     }
+
+    public void updateMemberBaseInfo(BaseUserMemberLevel baseUserMemberLevel) {
+        int affectRows = mapper.updateByPrimaryKeySelective(baseUserMemberLevel);
+        if (affectRows==0){
+            throw new BaseException("更新会员等级失败");
+        }
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -153,6 +153,7 @@ public class AppUserController extends CommonBaseController{
                 if (memberLevel!=null){
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
+                    userDTO.setBigIcon(memberLevel.getBigIcon());
                 }
             }
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java

@@ -74,4 +74,8 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
         return ObjectRestResponse.succ();
     }
 
+    @PutMapping("/update")
+    public void updateMemberBaseInfo(@RequestBody BaseUserMemberLevel baseUserMemberLevel){
+        getBaseBiz().updateMemberBaseInfo(baseUserMemberLevel);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -184,7 +184,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         criteria.andEqualTo("isShow", 1);
         //位置
         criteria.andIn("location", Arrays.asList(location, 0));
-        criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
+    //    criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
 
         List<SummitActivity> summitActivities = mapper.selectByExample(example);
 

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SummitActivityController.java

@@ -55,7 +55,7 @@ public class SummitActivityController {
     @GetMapping("/list")
     public ObjectRestResponse<PageDataVO<SummitActivityVo>> findSummitActivityWithPage(@RequestParam(value = "page", defaultValue = "1", required = false) Integer page,
                                                                                       @RequestParam(value = "limit", defaultValue = "6", required = false) Integer limit,
-                                                                                      @RequestParam(value = "location", defaultValue = "0", required = false) Integer location,
+                                                                                      @RequestParam(value = "location", defaultValue = "1", required = false) Integer location,
                                                                                        @RequestParam(value = "title",required = false) String title) {
         PageDataVO<SummitActivityVo> pageDataVO = summitActivityBiz.findSummitActivityWithPage(page, limit,location,title);
         return ObjectRestResponse.succ(pageDataVO);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/WeixinService.java

@@ -76,6 +76,7 @@ public class WeixinService {
         try {
             HttpSession session = request.getSession();
             String frontSessionValue1 = (String) session.getAttribute(frontSessionKey);
+            log.info("---session获取===="+frontSessionValue1+"---sessionId==="+session.getId());
             if (StringUtils.isBlank(frontSessionValue1)) {
                 return  null;
             }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UserInfoController.java

@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.UserAgentUtil;
 import com.xxfc.platform.universal.biz.WeixinService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("info")
 @IgnoreUserToken
+@Slf4j
 public class UserInfoController {
 
 
@@ -31,11 +33,12 @@ public class UserInfoController {
 
 
     @RequestMapping(value = "getOpenId", method = RequestMethod.GET) //匹配的是href中的download请求
-    public ObjectRestResponse sendSms(HttpServletRequest request) throws Exception {
+    public ObjectRestResponse getOpenId(HttpServletRequest request) throws Exception {
         boolean isWx = UserAgentUtil.isWexinBrowser(request);
         if (isWx) {
             //session里面获取用户信息
             String openId=weixinService.getSession(request);
+            log.info("---进入方法getOpenId----openId===="+openId);
             if (StringUtils.isBlank(openId)){
                 JSONObject json = new JSONObject();
                 json.put("sendUrl",sendUrl);