|
|
@@ -549,7 +549,18 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public ResultData applyHistory(Long businessId,String tenantId) { |
|
|
public ResultData applyHistory(Long businessId,String tenantId) { |
|
|
List<WxFlowRecord> result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); |
|
|
|
|
|
|
|
|
List<WxFlowRecord> result; |
|
|
|
|
|
WxCoupon query = new WxCoupon(); |
|
|
|
|
|
query.setTenantId(tenantId); |
|
|
|
|
|
query.setId(businessId); |
|
|
|
|
|
List<WxCoupon> couponList = wxCouponMapper.findCouponList(query); |
|
|
|
|
|
if(CollectionUtils.isNotEmpty(couponList)) { |
|
|
|
|
|
WxCoupon coupon = couponList.get(0); |
|
|
|
|
|
result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId,coupon.getApprovalType())); |
|
|
|
|
|
}else{ |
|
|
|
|
|
result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if(CollectionUtils.isNotEmpty(result)){ |
|
|
if(CollectionUtils.isNotEmpty(result)){ |
|
|
String processInstanceId = result.get(0).getProcessInstanceId(); |
|
|
String processInstanceId = result.get(0).getProcessInstanceId(); |
|
|
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstanceId); |
|
|
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstanceId); |
|
|
@@ -570,13 +581,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
return new ResultData(result); |
|
|
return new ResultData(result); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public ResultData applyHistoryForCoupon(Long couponId, String tenantId) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public ResultData getTaskStatusList(Long businessId, String tenantId) { |
|
|
public ResultData getTaskStatusList(Long businessId, String tenantId) { |
|
|
List<WxFlowRecord> resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); |
|
|
List<WxFlowRecord> resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); |
|
|
|