Explorar el Código

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu hace 5 años
padre
commit
91f4ad0c07
Se han modificado 2 ficheros con 16 adiciones y 2 borrados
  1. +6
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java
  2. +10
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java

+ 6
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java Ver fichero

@@ -9,6 +9,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -28,13 +30,16 @@ public class WxCuserFloatingLayerController extends BaseController {
@Autowired @Autowired
WxCuserFloatingLayerService wxCuserFloatingLayerService; WxCuserFloatingLayerService wxCuserFloatingLayerService;


// @AuthIgnore
@AuthIgnore
@ApiOperation("获取浮层") @ApiOperation("获取浮层")
@GetMapping("/getFloatingLayer") @GetMapping("/getFloatingLayer")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "openId", value = "openId", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "openId", value = "openId", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)}) @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)})
public ResultData getAppIcon(String openId, String appId) { public ResultData getAppIcon(String openId, String appId) {
if (StringUtils.isBlank(openId)) {
return new ResultData(Result.UNLOGIN, "用户openId不能为空", null);
}
WxFloatingLayer wxFloatingLayer = wxCuserFloatingLayerService.getFloatingLayer(openId, appId); WxFloatingLayer wxFloatingLayer = wxCuserFloatingLayerService.getFloatingLayer(openId, appId);
return new ResultData(Result.SUCCESS, "查询成功", wxFloatingLayer); return new ResultData(Result.SUCCESS, "查询成功", wxFloatingLayer);
} }


+ 10
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java Ver fichero

@@ -119,7 +119,16 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
} }
String pwd = sb.toString(); String pwd = sb.toString();
if (!pwList.stream().anyMatch(oPwd->oPwd.equals(pwd))) { if (!pwList.stream().anyMatch(oPwd->oPwd.equals(pwd))) {
pwList.add(pwd);
//判断是否已经在数据库里面是否存在了
WxCouponPassword pwQ1 = new WxCouponPassword();
pwQ1.updateTenantInfo(tenantEntity);
pwQ1.setPassword(pwd);
List<WxCouponPassword> palist = wxCouponPasswordMapper.findList(pwQ1);
if (null != palist && palist.size() > 0 ) {
continue;
}else {
pwList.add(pwd);
}
} else { } else {
continue; continue;
} }


Cargando…
Cancelar
Guardar