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

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

develop
release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
72308725ad
16 измененных файлов: 675 добавлений и 85 удалений
  1. +99
    -0
      mallinkAdmin/pom.xml
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java
  3. +99
    -0
      mallinkBApi/pom.xml
  4. +99
    -0
      mallinkCApi/pom.xml
  5. +99
    -0
      mallinkMQConsumer/pom.xml
  6. +99
    -0
      mallinkSchedule/pom.xml
  7. +7
    -8
      mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java
  8. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java
  9. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  10. +27
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  11. +8
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  12. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  13. +28
    -57
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  14. +2
    -3
      mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml
  15. +5
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
  16. +99
    -0
      mallinkWebSocketServer/pom.xml

+ 99
- 0
mallinkAdmin/pom.xml Просмотреть файл

@@ -60,6 +60,105 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
cn.afterturn,
ch.qos.logback,
com.alibaba,
com.amazonaws,
com.mchange,
com.fasterxml.jackson.core,
com.fasterxml.jackson.dataformat,
com.fasterxml.jackson.datatype,
com.fasterxml.jackson.module,
com.github.axet,
com.github.binarywang,
com.github.jsqlparser,
com.github.pagehelper,
com.github.ulisesbocchio,
com.github.virtuald,
com.google.code.gson,
com.google.guava,
com.google.protobuf,
com.google.zxing,
com.jayway.jsonpath,
com.jhlabs,
com.puppycrawl.tools,
com.rabbitmq,
com.squareup.okhttp3,
com.squareup.okio,
com.sun,
com.sun.mail,
com.thoughtworks.xstream,
com.zaxxer,
commons-beanutils,
commons-cli,
commons-codec,
commons-collections,
commons-io,
commons-logging,
io.lettuce,
io.netty,
io.projectreactor,
io.springfox,
io.swagger,
io.undertow,
javax.activation,
javax.mail,
javax.persistence,
javax.xml.bind,
joda-time,
junit,
mysql,
net.bytebuddy,
net.minidev,
net.sf.saxon,
ognl,
org.antlr,
org.apache.commons,
org.apache.httpcomponents,
org.apache.logging.log4j,
org.apache.poi,
org.apache.poi.wso2,
org.apache.rocketmq,
org.apache.shiro,
org.apache.tomcat.embed,
org.apache.xmlbeans,
org.aspectj,
org.assertj,
org.bouncycastle,
org.checkerframework,
org.crazycake,
org.dom4j,
org.flowable,
org.hibernate.validator,
org.jasypt,
org.javassist,
org.jboss.spec.javax.annotation,
org.jboss.xnio,
org.jdom,
org.mockito,
org.mybatis,
org.mybatis.generator,
org.mybatis.spring.boot,
org.ow2.asm,
org.projectlombok,
org.quartz-scheduler,
org.rocketmq.spring.boot,
org.springframework,
org.springframework.amqp,
org.springframework.boot,
org.springframework.data,
org.springframework.retry,
org.springframework.ws,
org.yaml,
redis.clients,
software.amazon.ion,
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</configuration>
</plugin>
</plugins>


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

@@ -95,6 +95,8 @@ public class WxBillAllController extends BaseController {
return new ResultData(result);
}



@ApiOperation("导出欠缴商户列表")
@GetMapping("/exportOweMerchantlist")
@SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出")


+ 99
- 0
mallinkBApi/pom.xml Просмотреть файл

@@ -30,6 +30,105 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
cn.afterturn,
ch.qos.logback,
com.alibaba,
com.amazonaws,
com.mchange,
com.fasterxml.jackson.core,
com.fasterxml.jackson.dataformat,
com.fasterxml.jackson.datatype,
com.fasterxml.jackson.module,
com.github.axet,
com.github.binarywang,
com.github.jsqlparser,
com.github.pagehelper,
com.github.ulisesbocchio,
com.github.virtuald,
com.google.code.gson,
com.google.guava,
com.google.protobuf,
com.google.zxing,
com.jayway.jsonpath,
com.jhlabs,
com.puppycrawl.tools,
com.rabbitmq,
com.squareup.okhttp3,
com.squareup.okio,
com.sun,
com.sun.mail,
com.thoughtworks.xstream,
com.zaxxer,
commons-beanutils,
commons-cli,
commons-codec,
commons-collections,
commons-io,
commons-logging,
io.lettuce,
io.netty,
io.projectreactor,
io.springfox,
io.swagger,
io.undertow,
javax.activation,
javax.mail,
javax.persistence,
javax.xml.bind,
joda-time,
junit,
mysql,
net.bytebuddy,
net.minidev,
net.sf.saxon,
ognl,
org.antlr,
org.apache.commons,
org.apache.httpcomponents,
org.apache.logging.log4j,
org.apache.poi,
org.apache.poi.wso2,
org.apache.rocketmq,
org.apache.shiro,
org.apache.tomcat.embed,
org.apache.xmlbeans,
org.aspectj,
org.assertj,
org.bouncycastle,
org.checkerframework,
org.crazycake,
org.dom4j,
org.flowable,
org.hibernate.validator,
org.jasypt,
org.javassist,
org.jboss.spec.javax.annotation,
org.jboss.xnio,
org.jdom,
org.mockito,
org.mybatis,
org.mybatis.generator,
org.mybatis.spring.boot,
org.ow2.asm,
org.projectlombok,
org.quartz-scheduler,
org.rocketmq.spring.boot,
org.springframework,
org.springframework.amqp,
org.springframework.boot,
org.springframework.data,
org.springframework.retry,
org.springframework.ws,
org.yaml,
redis.clients,
software.amazon.ion,
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</configuration>
</plugin>
</plugins>


+ 99
- 0
mallinkCApi/pom.xml Просмотреть файл

@@ -30,6 +30,105 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
cn.afterturn,
ch.qos.logback,
com.alibaba,
com.amazonaws,
com.mchange,
com.fasterxml.jackson.core,
com.fasterxml.jackson.dataformat,
com.fasterxml.jackson.datatype,
com.fasterxml.jackson.module,
com.github.axet,
com.github.binarywang,
com.github.jsqlparser,
com.github.pagehelper,
com.github.ulisesbocchio,
com.github.virtuald,
com.google.code.gson,
com.google.guava,
com.google.protobuf,
com.google.zxing,
com.jayway.jsonpath,
com.jhlabs,
com.puppycrawl.tools,
com.rabbitmq,
com.squareup.okhttp3,
com.squareup.okio,
com.sun,
com.sun.mail,
com.thoughtworks.xstream,
com.zaxxer,
commons-beanutils,
commons-cli,
commons-codec,
commons-collections,
commons-io,
commons-logging,
io.lettuce,
io.netty,
io.projectreactor,
io.springfox,
io.swagger,
io.undertow,
javax.activation,
javax.mail,
javax.persistence,
javax.xml.bind,
joda-time,
junit,
mysql,
net.bytebuddy,
net.minidev,
net.sf.saxon,
ognl,
org.antlr,
org.apache.commons,
org.apache.httpcomponents,
org.apache.logging.log4j,
org.apache.poi,
org.apache.poi.wso2,
org.apache.rocketmq,
org.apache.shiro,
org.apache.tomcat.embed,
org.apache.xmlbeans,
org.aspectj,
org.assertj,
org.bouncycastle,
org.checkerframework,
org.crazycake,
org.dom4j,
org.flowable,
org.hibernate.validator,
org.jasypt,
org.javassist,
org.jboss.spec.javax.annotation,
org.jboss.xnio,
org.jdom,
org.mockito,
org.mybatis,
org.mybatis.generator,
org.mybatis.spring.boot,
org.ow2.asm,
org.projectlombok,
org.quartz-scheduler,
org.rocketmq.spring.boot,
org.springframework,
org.springframework.amqp,
org.springframework.boot,
org.springframework.data,
org.springframework.retry,
org.springframework.ws,
org.yaml,
redis.clients,
software.amazon.ion,
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</configuration>
</plugin>
</plugins>


+ 99
- 0
mallinkMQConsumer/pom.xml Просмотреть файл

@@ -27,6 +27,105 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
cn.afterturn,
ch.qos.logback,
com.alibaba,
com.amazonaws,
com.mchange,
com.fasterxml.jackson.core,
com.fasterxml.jackson.dataformat,
com.fasterxml.jackson.datatype,
com.fasterxml.jackson.module,
com.github.axet,
com.github.binarywang,
com.github.jsqlparser,
com.github.pagehelper,
com.github.ulisesbocchio,
com.github.virtuald,
com.google.code.gson,
com.google.guava,
com.google.protobuf,
com.google.zxing,
com.jayway.jsonpath,
com.jhlabs,
com.puppycrawl.tools,
com.rabbitmq,
com.squareup.okhttp3,
com.squareup.okio,
com.sun,
com.sun.mail,
com.thoughtworks.xstream,
com.zaxxer,
commons-beanutils,
commons-cli,
commons-codec,
commons-collections,
commons-io,
commons-logging,
io.lettuce,
io.netty,
io.projectreactor,
io.springfox,
io.swagger,
io.undertow,
javax.activation,
javax.mail,
javax.persistence,
javax.xml.bind,
joda-time,
junit,
mysql,
net.bytebuddy,
net.minidev,
net.sf.saxon,
ognl,
org.antlr,
org.apache.commons,
org.apache.httpcomponents,
org.apache.logging.log4j,
org.apache.poi,
org.apache.poi.wso2,
org.apache.rocketmq,
org.apache.shiro,
org.apache.tomcat.embed,
org.apache.xmlbeans,
org.aspectj,
org.assertj,
org.bouncycastle,
org.checkerframework,
org.crazycake,
org.dom4j,
org.flowable,
org.hibernate.validator,
org.jasypt,
org.javassist,
org.jboss.spec.javax.annotation,
org.jboss.xnio,
org.jdom,
org.mockito,
org.mybatis,
org.mybatis.generator,
org.mybatis.spring.boot,
org.ow2.asm,
org.projectlombok,
org.quartz-scheduler,
org.rocketmq.spring.boot,
org.springframework,
org.springframework.amqp,
org.springframework.boot,
org.springframework.data,
org.springframework.retry,
org.springframework.ws,
org.yaml,
redis.clients,
software.amazon.ion,
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</configuration>
</plugin>
</plugins>


+ 99
- 0
mallinkSchedule/pom.xml Просмотреть файл

@@ -27,6 +27,105 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
cn.afterturn,
ch.qos.logback,
com.alibaba,
com.amazonaws,
com.mchange,
com.fasterxml.jackson.core,
com.fasterxml.jackson.dataformat,
com.fasterxml.jackson.datatype,
com.fasterxml.jackson.module,
com.github.axet,
com.github.binarywang,
com.github.jsqlparser,
com.github.pagehelper,
com.github.ulisesbocchio,
com.github.virtuald,
com.google.code.gson,
com.google.guava,
com.google.protobuf,
com.google.zxing,
com.jayway.jsonpath,
com.jhlabs,
com.puppycrawl.tools,
com.rabbitmq,
com.squareup.okhttp3,
com.squareup.okio,
com.sun,
com.sun.mail,
com.thoughtworks.xstream,
com.zaxxer,
commons-beanutils,
commons-cli,
commons-codec,
commons-collections,
commons-io,
commons-logging,
io.lettuce,
io.netty,
io.projectreactor,
io.springfox,
io.swagger,
io.undertow,
javax.activation,
javax.mail,
javax.persistence,
javax.xml.bind,
joda-time,
junit,
mysql,
net.bytebuddy,
net.minidev,
net.sf.saxon,
ognl,
org.antlr,
org.apache.commons,
org.apache.httpcomponents,
org.apache.logging.log4j,
org.apache.poi,
org.apache.poi.wso2,
org.apache.rocketmq,
org.apache.shiro,
org.apache.tomcat.embed,
org.apache.xmlbeans,
org.aspectj,
org.assertj,
org.bouncycastle,
org.checkerframework,
org.crazycake,
org.dom4j,
org.flowable,
org.hibernate.validator,
org.jasypt,
org.javassist,
org.jboss.spec.javax.annotation,
org.jboss.xnio,
org.jdom,
org.mockito,
org.mybatis,
org.mybatis.generator,
org.mybatis.spring.boot,
org.ow2.asm,
org.projectlombok,
org.quartz-scheduler,
org.rocketmq.spring.boot,
org.springframework,
org.springframework.amqp,
org.springframework.boot,
org.springframework.data,
org.springframework.retry,
org.springframework.ws,
org.yaml,
redis.clients,
software.amazon.ion,
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</configuration>
</plugin>
</plugins>


+ 7
- 8
mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java Просмотреть файл

@@ -4,11 +4,10 @@ package com.iformall.enums;
* Created by luozukai
* 流程key
*/
public enum EnumFlowKey {

CONTRACT("contract_flow", "合同审批流程"),
BILL("end_bill_flow", "账单审批流程"),
END_CONTRACT("end_contract_flow", "终止合同审批流程"),
public enum EnumFlowKey{
CONTRACT(1, "contract_flow"), //合同审批
BILL(2, "end_bill_flow"),//账单审批
END_CONTRACT(3, "end_contract_flow")//终止合同审批
;

public static EnumFlowKey getEnum(Integer code) {
@@ -20,15 +19,15 @@ public enum EnumFlowKey {
return null;
}

private String code;
private Integer code;
private String message;

EnumFlowKey(String code, String message) {
EnumFlowKey(Integer code, String message) {
this.code = code;
this.message = message;
}

public String getCode() {
public Integer getCode() {
return code;
}



+ 0
- 2
mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java Просмотреть файл

@@ -11,6 +11,4 @@ public interface WxFlowRecordMapper extends CommonMapper<WxFlowRecord, Long> {
void updateCurrStatus(WxFlowRecord record);

List<WxFlowRecord> myHandelList(WxFlowRecord flowRecord);

Integer myHandelListTotal(WxFlowRecord flowRecord);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java Просмотреть файл

@@ -52,4 +52,6 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Long>
void updateInvalidContract(WxRentContract record);

List<WxRentContract> selectRentContractByMerchantId(WxRentContract wxRentContract);

List<WxRentContract> selectRentContractByShopId(WxRentContract record);
}

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

@@ -741,11 +741,32 @@ public class WxBillAllServiceImpl implements WxBillAllService {
@Override
public Map<String, Object> getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) {
PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getOweBillAsPage(record));
List<Map<String, Object>> list = pageInfo.getList();
for (Map<String, Object> map:list) {
map.put("rentOwe",subZeroAndDot(map.get("rentOwe").toString()));
map.put("propertyOwe",subZeroAndDot(map.get("propertyOwe").toString()));
map.put("depositOwe",subZeroAndDot(map.get("depositOwe").toString()));
map.put("otherOwe",subZeroAndDot(map.get("otherOwe").toString()));
map.put("totalOwe",subZeroAndDot(map.get("totalOwe").toString()));
}
pageInfo.setList(list);
Map<String, Object> result = new HashMap<>();
result.put("pageInfo", pageInfo);
return result;
}

/**
* 使用java正则表达式去掉多余的.与0
* @param s
* @return
*/
public static String subZeroAndDot(String s){
if(s.indexOf(".") > 0){
s = s.replaceAll("0+?$", "");//去掉多余的0
s = s.replaceAll("[.]$", "");//如最后一位是.则去掉
}
return s;
}

@Override
public void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response) {
@@ -754,15 +775,16 @@ public class WxBillAllServiceImpl implements WxBillAllService {
for (Map<String, Object> map:data) {
OweMerchantVo oweMerchantVo = new OweMerchantVo();
oweMerchantVo.setBuilding((Long)map.get("building"));
oweMerchantVo.setDepositOwe((BigDecimal) map.get("depositOwe"));
oweMerchantVo.setFloor((Long)map.get("floor"));
oweMerchantVo.setLinkPerson((String)map.get("manager"));
oweMerchantVo.setName((String)map.get("merchantName"));
oweMerchantVo.setLinkPhone((String)map.get("managerPhone"));
oweMerchantVo.setOtherOwe((BigDecimal) map.get("otherOwe"));
oweMerchantVo.setPropertyOwe((BigDecimal) map.get("propertyOwe"));
oweMerchantVo.setRentOwe((BigDecimal) map.get("rentOwe"));
oweMerchantVo.setTotalOwe((BigDecimal) map.get("totalOwe"));

oweMerchantVo.setDepositOwe(new BigDecimal(subZeroAndDot(map.get("depositOwe").toString())));
oweMerchantVo.setOtherOwe(new BigDecimal(subZeroAndDot(map.get("otherOwe").toString())));
oweMerchantVo.setPropertyOwe(new BigDecimal(subZeroAndDot(map.get("propertyOwe").toString())));
oweMerchantVo.setRentOwe(new BigDecimal(subZeroAndDot(map.get("rentOwe").toString())));
oweMerchantVo.setTotalOwe(new BigDecimal(subZeroAndDot(map.get("totalOwe").toString())));
list.add(oweMerchantVo);
}
String name = "欠缴商户列表";


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

@@ -20,6 +20,7 @@ import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.common.engine.api.FlowableIllegalArgumentException;
import org.flowable.engine.*;
import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance;
@@ -96,14 +97,7 @@ public class WxFlowServiceImpl implements WxFlowService {
* @return
*/
public static String getFlowKeyByType(int flowType){
if(1 == flowType){
return EnumFlowKey.CONTRACT.getCode();
}else if(2 == flowType){
return EnumFlowKey.BILL.getCode();
}else if(3 == flowType){
return EnumFlowKey.END_CONTRACT.getCode();
}
return null;
return EnumFlowKey.getEnum(flowType).getMessage();
}

/**
@@ -588,7 +582,12 @@ public class WxFlowServiceImpl implements WxFlowService {
return new ResultData();
}
String processInstanceId = resultList.get(0).getProcessInstanceId();
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
ProcessInstance pi = null;
try {
pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
}catch (FlowableIllegalArgumentException e){
logger.error("getTaskStatusList query inst error",e);
}
if(pi == null){
return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在");
}


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

@@ -145,7 +145,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
WxBillProperty wxBillRent = new WxBillProperty();
wxBillRent.setPropertyContractId(id);
wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
List<WxBillProperty> resultList = wxBillPropertyMapper.findList(wxBillRent);
result.put("previewBillRentList",resultList);



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

@@ -23,6 +23,7 @@ import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
@@ -185,7 +186,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setRentContractId(id);
wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
List<WxBillRent> resultList = wxBillRentMapper.findList(wxBillRent);
result.put("previewBillRentList",resultList);

@@ -622,6 +622,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
record.setTenantId(wxRentContract.getTenantId());
record.setStatus(EnumRentContractStatus.INVALID.getCode());
wxRentContractMapper.updateInvalidContract(record);
List<WxRentContract> rentContractList = wxRentContractMapper.selectRentContractByShopId(record);
for (WxRentContract updateContract : rentContractList) {
updateInvalidStatus(updateContract);
}
}
} else {
WxRentContract record = new WxRentContract();
@@ -629,8 +633,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
record.setRentShopType(wxRentContract.getRentShopType());
record.setStatus(EnumRentContractStatus.INVALID.getCode());
wxRentContractMapper.updateRentInvalidStatus(record);
List<WxRentContract> rentContractList = wxRentContractMapper.select(record);
for (WxRentContract updateContract : rentContractList) {
updateInvalidStatus(updateContract);
}
}
updateInvalidStatus(wxRentContract);
}

@Override
@@ -660,26 +668,19 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return new ResultData(Result.SUCCESS, "操作成功");
}

public void updateInvalidStatus(WxRentContract wxRentContract) {
WxRentContract record = new WxRentContract();
record.setTenantId(wxRentContract.getTenantId());
record.setStatus(EnumRentContractStatus.INVALID.getCode());
public void updateInvalidStatus(WxRentContract record) {
Long id = record.getId();
//审核流程中止
List<Long> collect = wxRentContractMapper.select(record).stream()
.map(r -> r.getId()).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(collect)) {
for (Long id : collect) {
try {
logger.info("合同id:{},开始停止...", id);
//结束审批流 by luozukai
List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1))
.processVariableValueEquals("businessId", id).list();
if (!CollectionUtils.isEmpty(tasks)) {
for (Task task : tasks) {
logger.info("合同id:{},taskid:{}", id, task.getId());
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废");
}
}
try {
logger.info("合同id:{},开始停止...", id);
//结束审批流 by luozukai
List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1))
.processVariableValueEquals("businessId", id).list();
if (!CollectionUtils.isEmpty(tasks)) {
for (Task task : tasks) {
logger.info("合同id:{},taskid:{}", id, task.getId());
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废");

// 修改合同审核状态
WxRentContract rentContract = record;
rentContract.setId(id);
@@ -687,15 +688,19 @@ public class WxRentContractServiceImpl implements WxRentContractService {
updateApplyStatus(rentContract);

// 保存审批历史入
MallUserInfo mallUserInfo = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
WxFlowRecord updateRecord = new WxFlowRecord();
updateRecord.setBusinessId(id);
updateRecord.setStatus(EnumFlowRecordStatus.CANCLE.getCode());
updateRecord.setBusinessType(1);
updateRecord.setUserId(mallUserInfo.getId());
updateRecord.setProcessInstanceId(task.getProcessInstanceId());
wxFlowRecordService.saveOrUpdate(updateRecord);
} catch (Exception e) {
logger.error("deleteProcessInstance error", e);
}
}

} catch (Exception e) {
logger.error("deleteProcessInstance error", e);
}
}

@@ -1240,40 +1245,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int allCount = wxRentContractMapper.selectCount(wxRentContract);
resultData.put("allCount", allCount);

//审核流程中止
List<Long> collect = wxRentContractMapper.getRentInvalidList(wxRentContract).stream()
.map(r -> r.getId()).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(collect)) {
for (Long id:collect) {
try {
logger.info("合同id:{},开始停止...",id);
//结束审批流 by luozukai
List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1))
.processVariableValueEquals("businessId",id).list();
if (!CollectionUtils.isEmpty(tasks)) {
for (Task task:tasks) {
logger.info("合同id:{},taskid:{}",id,task.getId());
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废");
}
}
// 修改合同审核状态
WxRentContract rentContract = new WxRentContract();
rentContract.setId(id);
rentContract.setApplyStatus(EnumRentContractAppStatus.CANCLE.getCode());
updateApplyStatus(rentContract);

// 保存审批历史入
WxFlowRecord updateRecord = new WxFlowRecord();
updateRecord.setBusinessId(id);
updateRecord.setStatus(EnumFlowRecordStatus.CANCLE.getCode());
updateRecord.setBusinessType(1);
wxFlowRecordService.saveOrUpdate(updateRecord);
}catch (Exception e){
logger.error("deleteProcessInstance error",e);
}
}
}

//待签约
wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode());
int waitSignCount = wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract);


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

@@ -67,7 +67,7 @@

<select id="myHandelList" parameterType="com.iformall.domain.po.WxFlowRecord" resultMap="BaseResultMap">
select f.* from wx_flow_record f
where f.user_id = #{userId} and f.status not in(1,4)
where f.user_id = #{userId} and f.status not in(1,4,5)
order by create_date desc
</select>

@@ -75,6 +75,5 @@
update wx_flow_record set curr_status=#{currStatus} where process_instance_id=#{processInstanceId}
and status = 1
</update>

</mapper>

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

@@ -235,6 +235,11 @@
select count(*) from wx_rent_contract where tenant_id=#{tenantId} and json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"')) and status in (2,3,4)
</select>
<select id="selectRentContractByShopId" parameterType="com.iformall.domain.po.WxRentContract"
resultType="com.iformall.domain.po.WxRentContract">
select * from wx_rent_contract where tenant_id=#{tenantId} and json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"')) and status=#{status} and rent_shop_type =1
</select>
<update id="updateInvalidContract" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and id in(select r.id from (
select id from wx_rent_contract where json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"'))


+ 99
- 0
mallinkWebSocketServer/pom.xml Просмотреть файл

@@ -35,6 +35,105 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
cn.afterturn,
ch.qos.logback,
com.alibaba,
com.amazonaws,
com.mchange,
com.fasterxml.jackson.core,
com.fasterxml.jackson.dataformat,
com.fasterxml.jackson.datatype,
com.fasterxml.jackson.module,
com.github.axet,
com.github.binarywang,
com.github.jsqlparser,
com.github.pagehelper,
com.github.ulisesbocchio,
com.github.virtuald,
com.google.code.gson,
com.google.guava,
com.google.protobuf,
com.google.zxing,
com.jayway.jsonpath,
com.jhlabs,
com.puppycrawl.tools,
com.rabbitmq,
com.squareup.okhttp3,
com.squareup.okio,
com.sun,
com.sun.mail,
com.thoughtworks.xstream,
com.zaxxer,
commons-beanutils,
commons-cli,
commons-codec,
commons-collections,
commons-io,
commons-logging,
io.lettuce,
io.netty,
io.projectreactor,
io.springfox,
io.swagger,
io.undertow,
javax.activation,
javax.mail,
javax.persistence,
javax.xml.bind,
joda-time,
junit,
mysql,
net.bytebuddy,
net.minidev,
net.sf.saxon,
ognl,
org.antlr,
org.apache.commons,
org.apache.httpcomponents,
org.apache.logging.log4j,
org.apache.poi,
org.apache.poi.wso2,
org.apache.rocketmq,
org.apache.shiro,
org.apache.tomcat.embed,
org.apache.xmlbeans,
org.aspectj,
org.assertj,
org.bouncycastle,
org.checkerframework,
org.crazycake,
org.dom4j,
org.flowable,
org.hibernate.validator,
org.jasypt,
org.javassist,
org.jboss.spec.javax.annotation,
org.jboss.xnio,
org.jdom,
org.mockito,
org.mybatis,
org.mybatis.generator,
org.mybatis.spring.boot,
org.ow2.asm,
org.projectlombok,
org.quartz-scheduler,
org.rocketmq.spring.boot,
org.springframework,
org.springframework.amqp,
org.springframework.boot,
org.springframework.data,
org.springframework.retry,
org.springframework.ws,
org.yaml,
redis.clients,
software.amazon.ion,
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</configuration>
</plugin>
</plugins>


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