Browse Source

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

develop
release_toaliyun_real
Stormeye.Wu 7 years ago
parent
commit
85658715f4
8 changed files with 21 additions and 10 deletions
  1. +10
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java
  6. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  8. +0
    -5
      pom.xml

+ 10
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java View File

@@ -55,7 +55,16 @@ public class WxCUserBasicInfoController extends BaseController {
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(@ModelAttribute WxCUserBasicInfo wxCUserBasicInfo, Integer pageNum, Integer pageSize) { public ResultData list(@ModelAttribute WxCUserBasicInfo wxCUserBasicInfo, Integer pageNum, Integer pageSize) {
if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCUserBasicInfo();
if (null == wxCUserBasicInfo) {
wxCUserBasicInfo = new WxCUserBasicInfo();
} else {
if (StringUtils.isBlank(wxCUserBasicInfo.getPhone())) {
wxCUserBasicInfo.setPhone(null);
}
if (StringUtils.isBlank(wxCUserBasicInfo.getName())) {
wxCUserBasicInfo.setName(null);
}
}
String tenantId = getTenantId(); String tenantId = getTenantId();
wxCUserBasicInfo.setTenantId(tenantId); wxCUserBasicInfo.setTenantId(tenantId);
PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize);


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java View File

@@ -6,7 +6,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantBUserService;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java View File

@@ -6,7 +6,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUser;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxCUserService; import com.iformall.service.WxCUserService;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;


+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java View File

@@ -105,6 +105,7 @@ public class WxCUserBasicInfo implements Serializable {
@Transient @Transient
private String tagIds; private String tagIds;
@Transient @Transient
@Excel(name="标签",width = 20,orderNum = "9")
private String tagNames; private String tagNames;
@Transient @Transient
private long count; private long count;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java View File

@@ -13,7 +13,7 @@ import com.iformall.enums.EnumCouponStatus;
import com.iformall.enums.EnumCouponValidType; import com.iformall.enums.EnumCouponValidType;
import com.iformall.mapper.CouponInjectMapper; import com.iformall.mapper.CouponInjectMapper;
import com.iformall.service.*; import com.iformall.service.*;
import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java View File

@@ -134,6 +134,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
Cell addrCellTwo = rowtwo.createCell(6); Cell addrCellTwo = rowtwo.createCell(6);
Cell updateDateCellTwo = rowtwo.createCell(7); Cell updateDateCellTwo = rowtwo.createCell(7);
Cell createDateCellTwo = rowtwo.createCell(8); Cell createDateCellTwo = rowtwo.createCell(8);
Cell tagCellTwo = rowtwo.createCell(9);


nameCellTwo.setCellValue("姓名"); nameCellTwo.setCellValue("姓名");
sexCellTwo.setCellValue("性别"); sexCellTwo.setCellValue("性别");
@@ -144,6 +145,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
addrCellTwo.setCellValue("地址"); addrCellTwo.setCellValue("地址");
updateDateCellTwo.setCellValue("上次活跃时间"); updateDateCellTwo.setCellValue("上次活跃时间");
createDateCellTwo.setCellValue("注册时间"); createDateCellTwo.setCellValue("注册时间");
tagCellTwo.setCellValue("标签");


for (int i = 0; i < memberlist.size(); i++) { for (int i = 0; i < memberlist.size(); i++) {
rowtwo = sheetTwo.createRow(i + 1); rowtwo = sheetTwo.createRow(i + 1);
@@ -156,6 +158,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
addrCellTwo = rowtwo.createCell(6); addrCellTwo = rowtwo.createCell(6);
updateDateCellTwo = rowtwo.createCell(7); updateDateCellTwo = rowtwo.createCell(7);
createDateCellTwo = rowtwo.createCell(8); createDateCellTwo = rowtwo.createCell(8);
tagCellTwo = rowtwo.createCell(9);


WxCUserBasicInfo entity = memberlist.get(i); WxCUserBasicInfo entity = memberlist.get(i);


@@ -173,6 +176,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
addrCellTwo.setCellValue(entity.getAddress()); addrCellTwo.setCellValue(entity.getAddress());
updateDateCellTwo.setCellValue(sdf.format(entity.getUpdateDate())); updateDateCellTwo.setCellValue(sdf.format(entity.getUpdateDate()));
createDateCellTwo.setCellValue(sdf.format(entity.getCreateDate())); createDateCellTwo.setCellValue(sdf.format(entity.getCreateDate()));

} }




@@ -244,6 +248,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
Cell addrCellTwo = rowtwo.createCell(6); Cell addrCellTwo = rowtwo.createCell(6);
Cell updateDateCellTwo = rowtwo.createCell(7); Cell updateDateCellTwo = rowtwo.createCell(7);
Cell createDateCellTwo = rowtwo.createCell(8); Cell createDateCellTwo = rowtwo.createCell(8);
Cell tagCellTwo = rowtwo.createCell(9);


nameCellTwo.setCellValue("姓名"); nameCellTwo.setCellValue("姓名");
sexCellTwo.setCellValue("性别"); sexCellTwo.setCellValue("性别");
@@ -254,6 +259,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
addrCellTwo.setCellValue("地址"); addrCellTwo.setCellValue("地址");
updateDateCellTwo.setCellValue("上次活跃时间"); updateDateCellTwo.setCellValue("上次活跃时间");
createDateCellTwo.setCellValue("注册时间"); createDateCellTwo.setCellValue("注册时间");
tagCellTwo.setCellValue("标签");


FileOutputStream fileOut = new FileOutputStream(file); FileOutputStream fileOut = new FileOutputStream(file);
workbook.write(fileOut); workbook.write(fileOut);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java View File

@@ -22,7 +22,7 @@ import com.iformall.service.WxRefundOrderService;
import com.iformall.utils.BeanUtils; import com.iformall.utils.BeanUtils;
import com.iformall.utils.Utility; import com.iformall.utils.Utility;
import com.iformall.utils.XmlUtil; import com.iformall.utils.XmlUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


+ 0
- 5
pom.xml View File

@@ -176,11 +176,6 @@
<!-- <artifactId>thumbnailator</artifactId> --> <!-- <artifactId>thumbnailator</artifactId> -->
<!-- <version>0.4.8</version> --> <!-- <version>0.4.8</version> -->
<!-- </dependency> --> <!-- </dependency> -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>


<!-- https://mvnrepository.com/artifact/commons-io/commons-io --> <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency> <dependency>


Loading…
Cancel
Save