From 4c9136f3a52f8a64ffb965b3d126641e642a9fdc Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 16 May 2019 10:50:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=AD=9B=E9=80=89=E5=99=A8][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=AE=8C=E5=96=84=E4=BC=9A=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/WxAppinfoController.java | 3 +-- .../basic/WxMerchantController.java | 20 ++++++++++++++++++- .../controller/sys/HomeController.java | 6 +++--- .../sys/MallUserInfoController.java | 5 +++++ .../com/iformall/domain/po/MallUserInfo.java | 15 +++++++++++++- .../resources/mapper/MallUserInfoMapper.xml | 6 +++--- .../controller/sys/HomeController.java | 6 +++--- 7 files changed, 48 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 50d7c73ea..2046d7aab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -70,7 +70,6 @@ public class WxAppinfoController extends BaseController { Map map = (Map)resultData.data; String url = map.get("url"); merchant.setQrCode(url); - System.out.println("---"+merchant.getId()); wxMerchantMapper.updateByPrimaryKeySelective(merchant); } } @@ -112,7 +111,7 @@ public class WxAppinfoController extends BaseController { } } - private ResultData exportQrcode(HttpServletRequest request, HttpServletResponse response, + public ResultData exportQrcode(HttpServletRequest request, HttpServletResponse response, String tenantId, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name,boolean upload) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index f7fbe61f7..56ee26083 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.app.WxAppinfoController; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * @author gongbiao @@ -31,6 +33,8 @@ public class WxMerchantController extends BaseController { @Autowired private WxMerchantService wxMerchantService; + @Autowired + private WxAppinfoController wxAppinfoController; @ApiOperation("分页列表接口") @GetMapping("list") @@ -96,7 +100,21 @@ public class WxMerchantController extends BaseController { public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); wxMerchant.setTenantId(getTenantId()); - return wxMerchantService.addMerchant(wxMerchant, getUserId()); + + ResultData resultData = wxMerchantService.addMerchant(wxMerchant, getUserId()); + + if(resultData.code == 200){ + //加载二维码图片 + String pageUrl = "pages/index/index"; + String param = "t:md:"+resultData.data; + ResultData resultQrCode = wxAppinfoController.exportQrcode(null,null,wxMerchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); + Map map = (Map)resultQrCode.data; + String url = map.get("url"); + wxMerchant.setQrCode(url); + wxMerchantService.updateMerchant(wxMerchant); + } + + return resultData; } @ApiOperation("更新商户接口") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 4ce729833..e62a8a786 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -167,7 +167,7 @@ public class HomeController extends BaseController { Map map = new HashMap(); map.put("username", info.getUsername()); - map.put("withWechat", info.getWithWechatFormat()); + map.put("withWechat", info.getWithWechat()); data.data = map; } catch (Exception e) { logger.error(e.getMessage()); @@ -260,7 +260,7 @@ public class HomeController extends BaseController { Map map = new HashMap(); map.put("username", info.getUsername()); - map.put("withWechat", info.getWithWechatFormat()); + map.put("withWechat", info.getWithWechat()); data.data = map; } catch(Exception e){ @@ -360,7 +360,7 @@ public class HomeController extends BaseController { Map map = new HashMap(); map.put("username", info.getUsername()); - map.put("withWechat", info.getWithWechatFormat()); + map.put("withWechat", info.getWithWechat()); return new ResultData(map); } catch (MallinkException e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index ffd0a3aaa..5a62f1a43 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -71,6 +71,11 @@ public class MallUserInfoController extends BaseController { @SystemControllerLog(description = "用户管理-列表") public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); + + if(userInfo.getWithWechatNotFormat() != null){ + userInfo.setWithWechatForQuery(userInfo.getWithWechatNotFormat()); + } + userInfo.setTenantId(getTenantId()); userInfo.setSortColumns(MallUserInfo.Field.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 3655934cb..c91a13c55 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -75,6 +75,9 @@ public class MallUserInfo extends BaseEntity { @Transient private Integer withWechat; + @Transient + private Integer withWechatForQuery; + @Transient private Long roleId; @@ -100,9 +103,19 @@ public class MallUserInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") private String email; + public Integer getWithWechatForQuery() { + return withWechatForQuery; + } + public void setWithWechatForQuery(Integer withWechatForQuery) { + this.withWechatForQuery = withWechatForQuery; + } + + public Integer getWithWechatNotFormat() { + return this.withWechat; + } - public Integer getWithWechatFormat() { + public Integer getWithWechat() { if(StringUtils.isNotBlank(this.webOpenId)) { this.withWechat = EnumUserWechat.HAD.getCode(); } else { diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 1da604209..4c01c9935 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -84,11 +84,11 @@ and `email` = #{email} - - + + and `web_open_id` is not null - + and `web_open_id` is null diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index e0ed5a8b6..47e3799e8 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -166,7 +166,7 @@ public class HomeController extends BaseController { Map map = new HashMap(); map.put("username", info.getUsername()); - map.put("withWechat", info.getWithWechatFormat()); + map.put("withWechat", info.getWithWechat()); data.data = map; } catch (Exception e) { logger.error(e.getMessage()); @@ -259,7 +259,7 @@ public class HomeController extends BaseController { Map map = new HashMap(); map.put("username", info.getUsername()); - map.put("withWechat", info.getWithWechatFormat()); + map.put("withWechat", info.getWithWechat()); data.data = map; } catch(Exception e){ @@ -359,7 +359,7 @@ public class HomeController extends BaseController { Map map = new HashMap(); map.put("username", info.getUsername()); - map.put("withWechat", info.getWithWechatFormat()); + map.put("withWechat", info.getWithWechat()); return new ResultData(map); } catch (MallinkException e) {