|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumAssignTagsTrigger; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -43,8 +44,6 @@ import static com.iformall.domain.po.WxCouponOrder.Field.CreateDate_DESC; |
|
|
|
public class WxCUserBasicInfoController extends BaseController { |
|
|
|
private final Logger logger = LoggerFactory.getLogger(this.getClass()); |
|
|
|
|
|
|
|
private String importMemPrev = "importmem/"; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCUserBasicInfoService wxCUserBasicInfoService; |
|
|
|
|
|
|
|
@@ -280,7 +279,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
//得到当前用户ID |
|
|
|
final MallUserInfo user = getUser(); |
|
|
|
String userId = "" + user.getId(); |
|
|
|
String importKey = importMemPrev + userId; |
|
|
|
String importKey = Constant.importMemPrev + userId; |
|
|
|
final String tenantId = getTenantId(); |
|
|
|
|
|
|
|
//查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入 |
|
|
|
@@ -295,7 +294,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
stringRedisTemplate.opsForHash().putIfAbsent(importKey, "processCount", ""); |
|
|
|
stringRedisTemplate.opsForHash().putIfAbsent(importKey, "failCount", ""); |
|
|
|
|
|
|
|
String fpath = "./upload/"; |
|
|
|
String fpath = Constant.fileDirectory; |
|
|
|
File targetFile = new File(fpath); |
|
|
|
if (!targetFile.exists()) { |
|
|
|
targetFile.mkdirs(); |
|
|
|
@@ -357,7 +356,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
|
|
|
|
@GetMapping("/queryTemplateCount") |
|
|
|
public ResultData queryTemplateCount() { |
|
|
|
String importKey = importMemPrev + getUser().getId(); |
|
|
|
String importKey = Constant.importMemPrev + getUser().getId(); |
|
|
|
Map entries = stringRedisTemplate.opsForHash().entries(importKey); |
|
|
|
logger.info(JSONArray.toJSONString(entries) + ">>>>>>>>>>>>>>>>>>>>>1"); |
|
|
|
if (entries.size() < 4) { |
|
|
|
|