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

Merge tag 'refs/tags/jenkins-back-end-126' into release

develop
release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
5af5ac58eb
7 измененных файлов: 63 добавлений и 53 удалений
  1. +3
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java
  2. +20
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java
  3. +5
    -0
      mallinkAdmin/src/main/resources/application-prod.yml
  4. +30
    -29
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  5. +4
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
  6. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml

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

@@ -91,7 +91,9 @@ public class CouponInjectController extends BaseController {
CouponInject couponInject = couponInjectService.getById(id);
if (couponInject != null) {
List<Long> tagids = JSON.parseArray(couponInject.getTags(), Long.class);
couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids));
if (!tagids.isEmpty()) {
couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids));
}
}
return new ResultData(Result.SUCCESS, "查询成功", couponInject);
}


+ 20
- 18
mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java Просмотреть файл

@@ -143,25 +143,27 @@ public class WxCUserBasicInfoController extends BaseController {
WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId());
if (StringUtils.isNotBlank(uTag.getTags())) {
List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class);
WxTags wxTags = new WxTags();
wxTags.setIds(ids);
PageInfo<WxTags> page = wxTagsService.listAsPage(wxTags, 1, 5000);
String tagNames = "";
String tagIds = "";
List<Long> tagIdList = new ArrayList<>();
for (WxTags wt : page.getList()) {
tagNames += wt.getName() + "/";
tagIds += wt.getId() + ",";
tagIdList.add(wt.getId());
if (!ids.isEmpty()) {
WxTags wxTags = new WxTags();
wxTags.setIds(ids);
PageInfo<WxTags> page = wxTagsService.listAsPage(wxTags, 1, 5000);
String tagNames = "";
String tagIds = "";
List<Long> tagIdList = new ArrayList<>();
for (WxTags wt : page.getList()) {
tagNames += wt.getName() + "/";
tagIds += wt.getId() + ",";
tagIdList.add(wt.getId());
}
if (StringUtils.isNotBlank(tagNames)) {
info.setTagNames(tagNames.substring(0, tagNames.length() - 1));
}
if (StringUtils.isNoneBlank(tagIds)) {
info.setTagIds(tagIds.substring(0, tagIds.length() - 1));
}
long count = wxCUserTagsService.findCountByTag(getTenantId(), tagIdList);
info.setCount(count);
}
if (StringUtils.isNotBlank(tagNames)) {
info.setTagNames(tagNames.substring(0, tagNames.length() - 1));
}
if (StringUtils.isNoneBlank(tagIds)) {
info.setTagIds(tagIds.substring(0, tagIds.length() - 1));
}
long count = wxCUserTagsService.findCountByTag(getTenantId(), tagIdList);
info.setCount(count);
}
}
} else {


+ 5
- 0
mallinkAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -33,6 +33,11 @@ spring:
max-wait: -1
min-idle: 0


fileUpload:
path: /home/test/images
server: http://202.165.179.86:8081/images
logging:
level:
tk.mybatis: debug

+ 30
- 29
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Просмотреть файл

@@ -1,13 +1,10 @@
package com.iformall.service.impl;

import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult;
import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl;
import cn.afterturn.easypoi.handler.inter.IExcelDataHandler;
import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
@@ -40,14 +37,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import javax.persistence.Transient;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
import java.io.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;

@Service
public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
@@ -207,25 +205,27 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
if (entity != null) {
if (entity.getTagId() != null) {
WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId());
if (StringUtils.isNotBlank(uTag.getTags())) {
if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) {
List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class);
WxTags wxTagsQ = new WxTags();
wxTagsQ.setIds(ids);
List<WxTags> tagList = wxTagsMapper.findList(wxTagsQ);
String tagNames = "";
String tagIds = "";
List<Long> tagIdList = new ArrayList<>();
for (WxTags wt : tagList) {
tagNames += wt.getName() + "/";
tagIds += wt.getId() + ",";
tagIdList.add(wt.getId());
}
if (StringUtils.isNotBlank(tagNames)) {
entity.setTagNames(tagNames.substring(0, tagNames.length() - 1));
tagCellTwo.setCellValue(entity.getTagNames());
}
if (StringUtils.isNoneBlank(tagIds)) {
entity.setTagIds(tagIds.substring(0, tagIds.length() - 1));
if (!ids.isEmpty()) {
WxTags wxTagsQ = new WxTags();
wxTagsQ.setIds(ids);
List<WxTags> tagList = wxTagsMapper.findList(wxTagsQ);
String tagNames = "";
String tagIds = "";
List<Long> tagIdList = new ArrayList<>();
for (WxTags wt : tagList) {
tagNames += wt.getName() + "/";
tagIds += wt.getId() + ",";
tagIdList.add(wt.getId());
}
if (StringUtils.isNotBlank(tagNames)) {
entity.setTagNames(tagNames.substring(0, tagNames.length() - 1));
tagCellTwo.setCellValue(entity.getTagNames());
}
if (StringUtils.isNoneBlank(tagIds)) {
entity.setTagIds(tagIds.substring(0, tagIds.length() - 1));
}
}
}
}
@@ -490,17 +490,18 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
List<CUserBaseInfoT> failList = datalist.getFailList();
logger.info("验证通过的数量:" + successList.size());
logger.info("验证未通过的数量:" + failList.size());
for(CUserBaseInfoT uBase: successList) {
for (CUserBaseInfoT uBase : successList) {
if (StringUtils.isBlank(uBase.getPhone())) {
logger.error("手机号为空", uBase.toString());
continue;
}
WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, tenantId);
if (userBase == null) {
continue;
}

Date curDate = new Date();
if (StringUtils.isBlank(userBase.getPhone())) {
logger.error("手机号为空", userBase.toString());
continue;
}

WxCUserBasicInfo oldUserBase = null;
WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo();
userBaseQ.setTenantId(tenantId);


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java Просмотреть файл

@@ -61,10 +61,11 @@ public class WxCampaignServiceImpl implements WxCampaignService {
wxCampaignMapper.updateByPrimaryKeySelective(record);
}
record = wxCampaignMapper.selectByPrimaryKey(record);
if (record.getStatus() == 0)
addOrUpdateBatch(JSONArray.parseArray(record.getCouponIds(),String.class),record);
else
if (record.getStatus() == 0) {
addOrUpdateBatch(JSONArray.parseArray(record.getCouponIds(),String.class), record);
} else {
delBatch(record);
}
}

public void delBatch(WxCampaign record) {


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java Просмотреть файл

@@ -72,7 +72,6 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
wxMsgConfig = list.get(0);
wxMsgConfig.setRemains(wxMsgConfig.getRemains() - wxMsgCallbacks.size());
wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig);

for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) {
wxMsgCallback.setTenantId(wxMsgConfig.getTenantId());
wxMsgCallback.setSign(sign);


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

@@ -50,7 +50,7 @@
</if>
<if test=" null != bid ">
and `bid` like concat('%', #{bid},'%')
and `bid` = #{bid}
</if>


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