Просмотр исходного кода

[筛选器][修改][完善会员列表]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
4c9136f3a5
7 измененных файлов: 48 добавлений и 13 удалений
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +19
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  3. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  4. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  5. +14
    -1
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  6. +3
    -3
      mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml
  7. +3
    -3
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Просмотреть файл

@@ -70,7 +70,6 @@ public class WxAppinfoController extends BaseController {
Map<String,String> 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) {


+ 19
- 1
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<String,String> map = (Map)resultQrCode.data;
String url = map.get("url");
wxMerchant.setQrCode(url);
wxMerchantService.updateMerchant(wxMerchant);
}

return resultData;
}

@ApiOperation("更新商户接口")


+ 3
- 3
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) {


+ 5
- 0
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<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize);


+ 14
- 1
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 {


+ 3
- 3
mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml Просмотреть файл

@@ -84,11 +84,11 @@
<if test=" null != email ">
and `email` = #{email}
</if>
<if test="null != withWechat ">
<if test="0 == withWechat ">
<if test="null != withWechatForQuery ">
<if test="0 == withWechatForQuery ">
and `web_open_id` is not null
</if>
<if test="1 == withWechat ">
<if test="1 == withWechatForQuery ">
and `web_open_id` is null
</if>
</if>


+ 3
- 3
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) {


Загрузка…
Отмена
Сохранить