活动审核

src/main/java/org/springblade/flow/activity/entity/ActivityEnum.java

@@ -0,0 +1,35 @@
+package org.springblade.flow.activity.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author cy-computer
+ */
+@AllArgsConstructor
+@Getter
+public enum
+ActivityEnum {
+	/**
+	 * 待商场审核
+	 */
+	WAITING_MALL("WAITING_MALL"),
+	/**
+	 * 待平台审核
+	 */
+	WAITING_PLATFORM("WAITING_PLATFORM"),
+	/**
+	 * 审核通过
+	 */
+	PASS("PASS"),
+	/**
+	 * 审核不通过
+	 */
+	FAIL("FAIL"),
+	/**
+	 * 停用
+	 */
+	STOP("STOP");
+
+	private String name;
+}

src/main/java/org/springblade/flow/activity/entity/ProcessActivity.java

@@ -0,0 +1,19 @@
+package org.springblade.flow.activity.entity;
+
+import lombok.Builder;
+import lombok.Data;
+import org.springblade.flow.core.entity.FlowEntity;
+import org.springblade.ldt.activity.entity.Activity;
+import org.springblade.ldt.shop.entity.Audit;
+
+/**
+ * @author: lianghanqiang
+ * @description: 活动审核
+ * @since: 9/1/21 -- 6:43 PM
+ */
+@Data
+@Builder
+public class ProcessActivity extends FlowEntity {
+	/*活动信息*/
+	private Activity activity;
+}

src/main/java/org/springblade/flow/activity/listener/ActivityMallCompleteListener.java

@@ -0,0 +1,38 @@
+package org.springblade.flow.activity.listener;
+
+import cn.hutool.core.convert.Convert;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.flow.activity.entity.ActivityEnum;
+import org.springblade.ldt.activity.entity.Activity;
+import org.springblade.ldt.activity.service.IActivityService;
+import org.springframework.util.Assert;
+
+/**
+ * @author: lianghanqiang
+ * @description: 平台审核完毕处理
+ * @since: 9/3/21 -- 10:53 AM
+ */
+public class ActivityMallCompleteListener implements TaskListener {
+
+	private IActivityService activityService;
+
+	{
+		activityService = SpringUtil.getBean(IActivityService.class);
+	}
+
+	@Override
+	public void notify(DelegateTask delegateTask) {
+
+		long businessId = Convert.toLong(delegateTask.getVariable("businessId"));
+		boolean pass = Convert.toBool(delegateTask.getVariable("pass"));
+
+		Activity activity = activityService.getById(businessId);
+
+		activity.setAuditStatus(pass? ActivityEnum.WAITING_PLATFORM.name():ActivityEnum.FAIL.name());
+
+		Assert.isTrue(activityService.saveOrUpdate(activity),()->{throw  new ServiceException("活动审核： 商场审核完毕处理异常");});
+	}
+}

src/main/java/org/springblade/flow/activity/listener/ActivityPlatformCompleteListener.java

@@ -0,0 +1,38 @@
+package org.springblade.flow.activity.listener;
+
+import cn.hutool.core.convert.Convert;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.flow.activity.entity.ActivityEnum;
+import org.springblade.ldt.activity.entity.Activity;
+import org.springblade.ldt.activity.service.IActivityService;
+import org.springframework.util.Assert;
+
+/**
+ * @author: lianghanqiang
+ * @description: 平台审核完毕处理
+ * @since: 9/3/21 -- 10:53 AM
+ */
+public class ActivityPlatformCompleteListener implements TaskListener {
+
+	private IActivityService activityService;
+
+	{
+		activityService = SpringUtil.getBean(IActivityService.class);
+	}
+
+	@Override
+	public void notify(DelegateTask delegateTask) {
+
+		long businessId = Convert.toLong(delegateTask.getVariable("businessId"));
+		boolean pass = Convert.toBool(delegateTask.getVariable("pass"));
+
+		Activity activity = activityService.getById(businessId);
+
+		activity.setAuditStatus(pass? ActivityEnum.PASS.name():ActivityEnum.FAIL.name());
+
+		Assert.isTrue(activityService.saveOrUpdate(activity),()->{throw  new ServiceException("活动审核： 平台审核完毕处理异常");});
+	}
+}

src/main/java/org/springblade/flow/activity/listener/ActivityUserCompleteListener.java

@@ -0,0 +1,53 @@
+package org.springblade.flow.activity.listener;
+
+import cn.hutool.core.convert.Convert;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springblade.common.enums.AppConstant;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.flow.activity.entity.ActivityEnum;
+import org.springblade.ldt.activity.entity.Activity;
+import org.springblade.ldt.activity.service.IActivityService;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IShopService;
+import org.springframework.util.Assert;
+
+import java.util.Objects;
+
+/**
+ * @author: lianghanqiang
+ * @description: 平台审核完毕处理
+ * @since: 9/3/21 -- 10:53 AM
+ */
+public class ActivityUserCompleteListener implements TaskListener {
+
+	private IActivityService activityService;
+	private IShopService shopService;
+
+	{
+		activityService = SpringUtil.getBean(IActivityService.class);
+		shopService = SpringUtil.getBean(IShopService.class);
+	}
+
+	@Override
+	public void notify(DelegateTask delegateTask) {
+
+		long businessId = Convert.toLong(delegateTask.getVariable("businessId"));
+
+		Activity activity = activityService.getById(businessId);
+
+		boolean isMall = Objects.equals(activity.getLaunchType(), AppConstant.PLATFORM.MALL);
+
+		if(isMall){
+			activity.setAuditStatus(ActivityEnum.WAITING_PLATFORM.name());
+		}else {
+			Shop shop = shopService.getById(activity.getLaunchId());
+			activity.setAuditStatus(Objects.isNull(shop.getMallId())?
+				ActivityEnum.WAITING_PLATFORM.name():
+				ActivityEnum.WAITING_MALL.name());
+		}
+
+		Assert.isTrue(activityService.saveOrUpdate(activity),()->{throw  new ServiceException("活动审核： 用户重新提交完毕处理异常");});
+	}
+}

src/main/java/org/springblade/flow/activity/service/IAuditActivityService.java

@@ -0,0 +1,15 @@
+package org.springblade.flow.activity.service;
+
+
+import org.springblade.flow.activity.entity.ProcessActivity;
+
+/**
+ * @author: lianghanqiang
+ * @description:
+ * @since: 9/1/21 -- 3:29 PM
+ */
+
+public interface IAuditActivityService {
+
+	boolean startProcess(ProcessActivity processAudit);
+}

src/main/java/org/springblade/flow/activity/service/impl/AuditActivityService.java

@@ -0,0 +1,103 @@
+package org.springblade.flow.activity.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.enums.AppConstant;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.flow.activity.entity.ActivityEnum;
+import org.springblade.flow.activity.entity.ProcessActivity;
+import org.springblade.flow.activity.service.IAuditActivityService;
+import org.springblade.flow.business.constant.AuditCandidate;
+import org.springblade.flow.business.service.IFlowService;
+import org.springblade.flow.core.constant.ProcessConstant;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.utils.FlowUtil;
+import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.ldt.activity.entity.Activity;
+import org.springblade.ldt.activity.service.IActivityService;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IShopService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @author: lianghanqiang
+ * @description:
+ * @since: 9/1/21 -- 3:29 PM
+ */
+@Service
+@AllArgsConstructor
+@Slf4j
+public class AuditActivityService implements IAuditActivityService {
+
+	private final IFlowService flowService;
+	private final IActivityService activityService;
+	private final IShopService shopService;
+
+
+	/**
+	 * 发起活动审核流程
+	 * */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean startProcess(ProcessActivity processActivity) {
+		Activity activity = processActivity.getActivity();
+		String businessTable = FlowUtil.getBusinessTable(ProcessConstant.AUDIT_ACTIVITY);
+
+		if (Func.isEmpty(activity.getId())) {
+
+			//是否由商场发起
+			boolean isMall = Objects.equals(activity.getLaunchType(), AppConstant.PLATFORM.MALL.name());
+			boolean toPlatform = true;
+			if(!isMall){
+				Shop shop = shopService.getById(activity.getLaunchId());
+				toPlatform = Objects.isNull(shop.getMallId());
+			}
+			activity.setAuditStatus(toPlatform? ActivityEnum.WAITING_PLATFORM.name():ActivityEnum.WAITING_MALL.name());
+			// 保存活动
+			activityService.save(activity);
+
+			// 启动流程
+			Kv variables = Kv.create()
+				.set("businessId",activity.getId())
+				.set("auditor", AuditCandidate.LDT_PLATFORM.name())
+				.set("mallTask", Convert.toStr(activity.getLaunchId()))
+				.set("toPlatform", toPlatform)
+				;
+
+			BladeFlow flow = flowService.startProcessInstanceById(
+				activity.getProcessDefinitionId(),
+				FlowUtil.getBusinessKey(businessTable,
+					String.valueOf(activity.getId())), variables,
+				getStartUser(isMall,activity));
+
+			if (Func.isNotEmpty(flow)) {
+				log.debug("流程已启动,流程ID:" + flow.getProcessInstanceId());
+				// 返回流程id写入leave
+				activity.setProcessInstanceId(flow.getProcessInstanceId());
+				activityService.updateById(activity);
+			} else {
+				throw new ServiceException("开启流程失败");
+			}
+		} else {
+			activityService.updateById(activity);
+		}
+		return true;
+	}
+
+
+	private String getStartUser(boolean isMall, Activity activity) {
+		if(isMall){
+			return TaskUtil.getTaskUserForApp(Convert.toStr(activity.getLaunchId()),TaskUtil.APP_MALL);
+		}else{
+			 return TaskUtil.getTaskUserForApp(Convert.toStr(activity.getLaunchId()),TaskUtil.APP_SHOP);
+		}
+	}
+
+
+}

src/main/java/org/springblade/flow/business/constant/AuditCandidate.java

@@ -1,16 +1,23 @@
 package org.springblade.flow.business.constant;
 
 
+import lombok.Getter;
+
 /**
  * @author: lianghanqiang
  * @description: 审核候选人
  * @since: 9/1/21 -- 7:46 PM
  */
-public interface AuditCandidate {
+@Getter
+public enum  AuditCandidate {
 
 	/**
 	* 平台审核
 	* */
-	String LDT_PLATFORM = "LDT_PLATFORM";
+	 LDT_PLATFORM ("联兑通平台");
 
+	AuditCandidate(String candidate) {
+		this.candidate = candidate;
+	}
+	private String candidate;
 }

src/main/java/org/springblade/flow/core/utils/FlowUtil.java

@@ -38,6 +38,7 @@ public class FlowUtil {
 	static {
 		BUSINESS_TABLE.put(ProcessConstant.LEAVE_KEY, "blade_process_leave");
 		BUSINESS_TABLE.put(ProcessConstant.AUDIT_SHOP, "ldt_audit");
+		BUSINESS_TABLE.put(ProcessConstant.AUDIT_ACTIVITY, "ldt_activity");
 	}
 
 	/**

src/main/java/org/springblade/flow/core/utils/TaskUtil.java

@@ -30,6 +30,7 @@ import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;
  */
 public class TaskUtil {
 	public static final String APP_SHOP = "appShop";
+	public static final String APP_MALL = "appMall";
 
 	/**
 	 * 获取任务用户格式
@@ -76,7 +77,7 @@ public class TaskUtil {
 	 * @return taskUser
 	 */
 	public static String getTaskUserForApp(String userId,String prefix) {
-		return StringUtil.format("{}{}", prefix, userId);
+		return StringUtil.format("{}-{}", prefix, userId);
 	}
 
 	/**
@@ -86,6 +87,6 @@ public class TaskUtil {
 	 * @return userId
 	 */
 	public static Long getUserIdForApp(String taskUser,String prefix) {
-		return Func.toLong(StringUtil.removePrefix(taskUser, prefix));
+		return Func.toLong(StringUtil.removePrefix(taskUser, prefix+"-"));
 	}
 }

src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java

@@ -48,6 +48,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.FileUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.flow.business.constant.AuditCandidate;
 import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.enums.FlowModeEnum;
 import org.springblade.flow.core.utils.TaskUtil;
@@ -161,11 +162,22 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, FlowModel> im
 	}
 
 	private String getAssigneeName(String taskUser){
-		String[] split = taskUser.split("-");
-		if(Objects.equals(split[0],TaskUtil.APP_SHOP)){
-			return shopService.getById(split[1]).getName();
+		try{
+			String[] split = taskUser.split("-");
+			if(Objects.equals(split[0],TaskUtil.APP_SHOP)){
+				return StringUtil.format("{} {}", "商户", shopService.getById(split[1]).getName());
+			}
+			if(Objects.equals(split[0],TaskUtil.APP_MALL)){
+				return StringUtil.format("{} {}", "商场", mallService.getById(split[1]).getMallName());
+			}
+			if(Objects.equals(split[0], AuditCandidate.LDT_PLATFORM.name())){
+				return StringUtil.format("{} {}", "国信", AuditCandidate.LDT_PLATFORM.getCandidate());
+			}
+			return UserCache.getUserByTaskUser(taskUser).getName();
+		}catch (Exception e){
+			return "";
 		}
-		return UserCache.getUserByTaskUser(taskUser).getName();
+
 	}
 
 	@Override
@@ -214,11 +226,8 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, FlowModel> im
 				}
 				// 获取任务执行人名称
 				if (StringUtil.isNotBlank(historicActivityInstance.getAssignee())) {
-					User user = UserCache.getUser(TaskUtil.getUserId(historicActivityInstance.getAssignee()));
-					if (user != null) {
-						flow.setAssignee(historicActivityInstance.getAssignee());
-						flow.setAssigneeName(user.getName());
-					}
+					flow.setAssignee(historicActivityInstance.getAssignee());
+					flow.setAssigneeName(getAssigneeName(historicActivityInstance.getAssignee()));
 				}
 				// 获取意见评论内容
 				if (StringUtil.isNotBlank(historicActivityInstance.getTaskId())) {

src/main/java/org/springblade/flow/shop/controller/ShopProcessController.java

@@ -1,51 +0,0 @@
-package org.springblade.flow.shop.controller;
-
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
-import org.springblade.flow.shop.entity.ProcessAudit;
-import org.springblade.flow.shop.service.IAuditShopService;
-import org.springblade.ldt.shop.entity.Audit;
-import org.springblade.ldt.shop.service.IAuditService;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author: lianghanqiang
- * @description: 商户审核控制器
- * @since: 9/1/21 -- 6:43 PM
- */
-@NonDS
-@Api(tags = "商户审核")
-@RestController
-@RequestMapping(AppConstant.APPLICATION_DESK_NAME + "/process/shop")
-@AllArgsConstructor
-public class ShopProcessController {
-
-	private IAuditService auditService;
-	private IAuditShopService auditShopService;
-
-	/**
-	 * 详情
-	 *
-	 * @param businessId 主键
-	 */
-	@GetMapping("detail")
-	public R<ProcessAudit> detail(Long businessId) {
-		Audit audit = auditService.getById(businessId);
-		ProcessAudit processShop = ProcessAudit.builder().audit(audit).build();
-		return R.data(processShop);
-	}
-
-
-	/**
-	 * 新增或修改
-	 *
-	 * @param processAudit 商户审核信息
-	 */
-	@PostMapping("start-process")
-	public R startProcess(@RequestBody ProcessAudit processAudit) {
-		return R.status(auditShopService.startProcess(processAudit));
-	}
-}

src/main/java/org/springblade/flow/shop/delegate/ShopAuditSuccessDelegate.java

@@ -1,38 +0,0 @@
-package org.springblade.flow.shop.delegate;
-
-import lombok.AllArgsConstructor;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springblade.common.enums.ShopEnum;
-import org.springblade.ldt.shop.entity.Audit;
-import org.springblade.ldt.shop.entity.Shop;
-import org.springblade.ldt.shop.service.IAuditService;
-import org.springblade.ldt.shop.service.IShopService;
-import org.springframework.stereotype.Component;
-
-/**
- * @author: lianghanqiang
- * @description: 审核成功，更新审核状态
- * @since: 9/2/21 -- 10:02 AM
- */
-@Component
-@AllArgsConstructor
-public class ShopAuditSuccessDelegate implements JavaDelegate {
-
-	private IShopService shopService;
-	private IAuditService auditService;
-
-	@Override
-	public void execute(DelegateExecution delegateExecution) {
-
-
-		Long shopId = (Long) delegateExecution.getVariable("shopId");
-		Long auditId = (Long) delegateExecution.getVariable("auditId");
-
-		Shop shop = shopService.getById(shopId);
-		Audit audit = auditService.getById(auditId);
-
-		shop.setAuditStatus(ShopEnum.PASS.name());
-		audit.setAuditStatus(ShopEnum.PASS.name());
-	}
-}

src/main/java/org/springblade/common/enums/ShopEnum.java → src/main/java/org/springblade/flow/shop/entity/ShopEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.common.enums;
+package org.springblade.flow.shop.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -10,9 +10,13 @@ import lombok.Getter;
 @Getter
 public enum ShopEnum {
 	/**
-	 * 待审核
+	 * 待商场审核
 	 */
-	WAITING("WAITING"),
+	WAITING_MALL("WAITING_MALL"),
+	/**
+	 * 待平台审核
+	 */
+	WAITING_PLATFORM("WAITING_PLATFORM"),
 	/**
 	 * 审核通过
 	 */

src/main/java/org/springblade/flow/shop/listener/ShopMallCompleteListener.java

@@ -0,0 +1,37 @@
+package org.springblade.flow.shop.listener;
+
+import cn.hutool.core.convert.Convert;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.flow.shop.entity.ShopEnum;
+import org.springblade.ldt.shop.entity.Audit;
+import org.springblade.ldt.shop.service.IAuditService;
+import org.springframework.util.Assert;
+
+/**
+ * @author: lianghanqiang
+ * @description:
+ * @since: 9/3/21 -- 9:22 AM
+ */
+public class ShopMallCompleteListener implements TaskListener {
+
+	private IAuditService auditService;
+
+	{
+		auditService = SpringUtil.getBean(IAuditService.class);
+	}
+	@Override
+	public void notify(DelegateTask delegateTask) {
+
+		boolean isPass = Convert.toBool(delegateTask.getVariable("pass"));
+		Long auditId = Convert.toLong(delegateTask.getVariable("auditId"));
+		Audit audit = auditService.getById(auditId);
+
+		audit.setAuditStatus(isPass? ShopEnum.WAITING_PLATFORM.name():ShopEnum.FAIL.name());
+
+		Assert.isTrue(auditService.saveOrUpdate(audit),()->{throw  new ServiceException("商户审核：商场审核完毕异常");});
+
+	}
+}

src/main/java/org/springblade/flow/shop/listener/ShopPlatformCompleteListener.java

@@ -0,0 +1,49 @@
+package org.springblade.flow.shop.listener;
+
+import cn.hutool.core.convert.Convert;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.flow.shop.entity.ShopEnum;
+import org.springblade.ldt.shop.entity.Audit;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IAuditService;
+import org.springblade.ldt.shop.service.IShopService;
+import org.springframework.util.Assert;
+
+/**
+ * @author: lianghanqiang
+ * @description: 平台审核后处理
+ * @since: 9/2/21 -- 7:40 PM
+ */
+public class ShopPlatformCompleteListener implements TaskListener {
+
+	private IShopService shopService;
+	private IAuditService auditService;
+
+	 {
+		shopService = SpringUtil.getBean(IShopService.class);
+		auditService = SpringUtil.getBean(IAuditService.class);
+	}
+
+	@Override
+	public void notify(DelegateTask delegateTask) {
+
+		boolean isPass = Convert.toBool(delegateTask.getVariable("isPass"));
+		Long auditId = Convert.toLong(delegateTask.getVariable("auditId"));
+		Long shopId = Convert.toLong(delegateTask.getVariable("shopId"));
+		Audit audit = auditService.getById(auditId);
+
+		if(isPass){
+			Shop shop = shopService.getById(shopId);
+			shop.setAuditStatus(ShopEnum.PASS.name());
+			audit.setAuditStatus(ShopEnum.PASS.name());
+			Assert.isTrue(shopService.saveOrUpdate(shop),()->{throw  new ServiceException("商户审核：平台审核完毕异常");});
+		}else{
+			audit.setAuditStatus(ShopEnum.FAIL.name());
+		}
+		Assert.isTrue(auditService.saveOrUpdate(audit),()->{throw  new ServiceException("商户审核：平台审核完毕异常");});
+
+	}
+}

src/main/java/org/springblade/flow/shop/listener/ShopUserCompleteListener.java

@@ -0,0 +1,47 @@
+package org.springblade.flow.shop.listener;
+
+import cn.hutool.core.convert.Convert;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.flow.shop.entity.ShopEnum;
+import org.springblade.ldt.shop.entity.Audit;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IAuditService;
+import org.springblade.ldt.shop.service.IShopService;
+import org.springframework.util.Assert;
+
+import java.util.Objects;
+
+/**
+ * @author: lianghanqiang
+ * @description: 用户重新提交后处理
+ * @since: 9/2/21 -- 7:51 PM
+ */
+public class ShopUserCompleteListener implements TaskListener {
+
+	private IAuditService auditService;
+	private IShopService shopService;
+
+	{
+		auditService = SpringUtil.getBean(IAuditService.class);
+		shopService = SpringUtil.getBean(IShopService.class);
+	}
+
+	@Override
+	public void notify(DelegateTask delegateTask) {
+
+		Long auditId = Convert.toLong(delegateTask.getVariable("auditId"));
+		Long shopId = Convert.toLong(delegateTask.getVariable("shopId"));
+		Shop shop = shopService.getById(shopId);
+		Audit audit = auditService.getById(auditId);
+
+		boolean toPlatform = Objects.isNull(shop.getMallId());
+
+		audit.setAuditStatus(toPlatform? ShopEnum.WAITING_PLATFORM.name(): ShopEnum.WAITING_MALL.name());
+
+		Assert.isTrue(auditService.saveOrUpdate(audit),()->{throw  new ServiceException("商户审核：用户处理完毕异常");});
+
+	}
+}

src/main/java/org/springblade/flow/shop/service/impl/AuditShopService.java

@@ -15,6 +15,7 @@ import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.utils.TaskUtil;
 import org.springblade.flow.shop.entity.ProcessAudit;
+import org.springblade.flow.shop.entity.ShopEnum;
 import org.springblade.ldt.shop.entity.Audit;
 import org.springblade.ldt.shop.entity.Shop;
 import org.springblade.ldt.shop.service.IAuditService;
@@ -22,7 +23,8 @@ import org.springblade.ldt.shop.service.IShopService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springblade.flow.shop.service.IAuditShopService;
-import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.Objects;
 
 /**
  * @author: lianghanqiang
@@ -42,16 +44,24 @@ public class AuditShopService implements IAuditShopService {
 	@Transactional(rollbackFor = Exception.class)
 	public boolean startProcess(ProcessAudit processAudit) {
 		Audit audit = processAudit.getAudit();
+		Shop shop = shopService.getById(audit.getShopId());
 		String businessTable = FlowUtil.getBusinessTable(ProcessConstant.AUDIT_SHOP);
 		if (Func.isEmpty(processAudit.getId())) {
-			// 保存活动
 
+			//判断是否由平台审核
+			boolean toPlatform = Objects.isNull(shop.getMallId());
+			audit.setAuditStatus(toPlatform? ShopEnum.WAITING_PLATFORM.name():ShopEnum.WAITING_MALL.name());
+
+			// 保存活动
 			auditService.save(audit);
+
 			// 启动流程
 			Kv variables = Kv.create()
 				.set("auditId",audit.getId())
 				.set("shopId",audit.getShopId())
-				.set("auditor", AuditCandidate.LDT_PLATFORM);
+				.set("mallTask",shop.getMallId())
+				.set("toPlatform",toPlatform)
+				.set("auditor", AuditCandidate.LDT_PLATFORM.name());
 
 			BladeFlow flow = flowService.startProcessInstanceById(
 				audit.getProcessDefinitionId(),
@@ -73,4 +83,5 @@ public class AuditShopService implements IAuditShopService {
 		return true;
 	}
 
+
 }

src/main/java/org/springblade/gateway/mall_gateway/service/impl/AppMallServiceImpl.java

@@ -20,12 +20,11 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.enums.AppConstant;
-import org.springblade.common.enums.ShopEnum;
+import org.springblade.flow.shop.entity.ShopEnum;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.gateway.mall_gateway.entity.vo.IndexStatisticVO;
 import org.springblade.gateway.mall_gateway.service.IAppMallService;
-import org.springblade.gateway.shop_gateway.entity.vo.IndexVO;
 import org.springblade.ldt.account.entity.Account;
 import org.springblade.ldt.account.service.IAccountService;
 import org.springblade.ldt.bills.entity.Bills;

src/main/java/org/springblade/gateway/shop_gateway/service/impl/AppShopServiceImpl.java

@@ -19,6 +19,7 @@ package org.springblade.gateway.shop_gateway.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.flow.shop.entity.ProcessAudit;
+import org.springblade.flow.shop.entity.ShopEnum;
 import org.springblade.flow.shop.service.impl.AuditShopService;
 import org.springblade.gateway.shop_gateway.entity.dto.ShopAuditDto;
 import org.springblade.gateway.shop_gateway.service.IAppShopService;
@@ -51,6 +52,7 @@ public class AppShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements
 		Shop shop = shopAuditDto.getShop();
 		this.save(shop);
 		Audit audit = shopAuditDto.getAudit();
+		audit.setAuditStatus(ShopEnum.WAITING_MALL.name());
 		audit.setShopId(shop.getId());
 		ProcessAudit processAudit = ProcessAudit.builder()
 			.audit(audit)

src/main/java/org/springblade/ldt/account/controller/AccountController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/account/dto/AccountDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/account/entity/Account.java

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_account")

src/main/java/org/springblade/ldt/account/mapper/AccountMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface AccountMapper extends BaseMapper<Account> {
 

src/main/java/org/springblade/ldt/account/service/IAccountService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IAccountService extends BaseService<Account> {
 

src/main/java/org/springblade/ldt/account/service/impl/AccountServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class AccountServiceImpl extends BaseServiceImpl<AccountMapper, Account> implements IAccountService {

src/main/java/org/springblade/ldt/account/vo/AccountVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/account/wrapper/AccountWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class AccountWrapper extends BaseEntityWrapper<Account, AccountVO>  {
 

src/main/java/org/springblade/ldt/activity/controller/ActivityController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/activity/controller/JoinRecordController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/activity/dto/ActivityDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/dto/JoinRecordDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/entity/Activity.java

@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_activity")
@@ -84,6 +84,16 @@ public class Activity extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "可选值：商家、商场")
 		private String launchType;
+	/**
+	* 流程定义主键
+	*/
+		@ApiModelProperty(value = "流程定义主键")
+		private String processDefinitionId;
+	/**
+	* 流程实例主键
+	*/
+		@ApiModelProperty(value = "流程实例主键")
+		private String processInstanceId;
 
 
 }

src/main/java/org/springblade/ldt/activity/entity/JoinRecord.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_join_record")

src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface ActivityMapper extends BaseMapper<Activity> {
 

src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.xml

@@ -21,6 +21,8 @@
         <result column="intro" property="intro"/>
         <result column="launch_id" property="launchId"/>
         <result column="launch_type" property="launchType"/>
+        <result column="process_definition_id" property="processDefinitionId"/>
+        <result column="process_instance_id" property="processInstanceId"/>
     </resultMap>
 
 

src/main/java/org/springblade/ldt/activity/mapper/JoinRecordMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface JoinRecordMapper extends BaseMapper<JoinRecord> {
 

src/main/java/org/springblade/ldt/activity/service/IActivityService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IActivityService extends BaseService<Activity> {
 

src/main/java/org/springblade/ldt/activity/service/IJoinRecordService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IJoinRecordService extends BaseService<JoinRecord> {
 

src/main/java/org/springblade/ldt/activity/service/impl/ActivityServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class ActivityServiceImpl extends BaseServiceImpl<ActivityMapper, Activity> implements IActivityService {

src/main/java/org/springblade/ldt/activity/service/impl/JoinRecordServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class JoinRecordServiceImpl extends BaseServiceImpl<JoinRecordMapper, JoinRecord> implements IJoinRecordService {

src/main/java/org/springblade/ldt/activity/vo/ActivityVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/vo/JoinRecordVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/activity/wrapper/ActivityWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class ActivityWrapper extends BaseEntityWrapper<Activity, ActivityVO>  {
 

src/main/java/org/springblade/ldt/activity/wrapper/JoinRecordWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class JoinRecordWrapper extends BaseEntityWrapper<JoinRecord, JoinRecordVO>  {
 

src/main/java/org/springblade/ldt/agent/controller/AgentBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/agent/controller/AgentRecordController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/agent/dto/AgentBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/dto/AgentRecordDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/entity/AgentBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_agent_bills")

src/main/java/org/springblade/ldt/agent/entity/AgentRecord.java

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_agent_record")

src/main/java/org/springblade/ldt/agent/mapper/AgentBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface AgentBillsMapper extends BaseMapper<AgentBills> {
 

src/main/java/org/springblade/ldt/agent/mapper/AgentRecordMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface AgentRecordMapper extends BaseMapper<AgentRecord> {
 

src/main/java/org/springblade/ldt/agent/service/IAgentBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IAgentBillsService extends BaseService<AgentBills> {
 

src/main/java/org/springblade/ldt/agent/service/IAgentRecordService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IAgentRecordService extends BaseService<AgentRecord> {
 

src/main/java/org/springblade/ldt/agent/service/impl/AgentBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class AgentBillsServiceImpl extends BaseServiceImpl<AgentBillsMapper, AgentBills> implements IAgentBillsService {

src/main/java/org/springblade/ldt/agent/service/impl/AgentRecordServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class AgentRecordServiceImpl extends BaseServiceImpl<AgentRecordMapper, AgentRecord> implements IAgentRecordService {

src/main/java/org/springblade/ldt/agent/vo/AgentBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/vo/AgentRecordVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/agent/wrapper/AgentBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class AgentBillsWrapper extends BaseEntityWrapper<AgentBills, AgentBillsVO>  {
 

src/main/java/org/springblade/ldt/agent/wrapper/AgentRecordWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class AgentRecordWrapper extends BaseEntityWrapper<AgentRecord, AgentRecordVO>  {
 

src/main/java/org/springblade/ldt/bills/controller/BalanceBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/BillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/PlatformBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/PointBillsController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/controller/WithdrawRecController.java

@@ -40,7 +40,7 @@ import org.springblade.core.boot.ctrl.BladeController;
  *  控制器
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @RestController
 @AllArgsConstructor

src/main/java/org/springblade/ldt/bills/dto/BalanceBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/BillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/PlatformBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/PointBillsDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/dto/WithdrawRecDTO.java

@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/entity/BalanceBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_balance_bills")

src/main/java/org/springblade/ldt/bills/entity/Bills.java

@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_bills")

src/main/java/org/springblade/ldt/bills/entity/PlatformBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_platform_bills")

src/main/java/org/springblade/ldt/bills/entity/PointBills.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_point_bills")

src/main/java/org/springblade/ldt/bills/entity/WithdrawRec.java

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @TableName("ldt_withdraw_rec")

src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface BalanceBillsMapper extends BaseMapper<BalanceBills> {
 

src/main/java/org/springblade/ldt/bills/mapper/BillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface BillsMapper extends BaseMapper<Bills> {
 

src/main/java/org/springblade/ldt/bills/mapper/PlatformBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface PlatformBillsMapper extends BaseMapper<PlatformBills> {
 

src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface PointBillsMapper extends BaseMapper<PointBills> {
 

src/main/java/org/springblade/ldt/bills/mapper/WithdrawRecMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface WithdrawRecMapper extends BaseMapper<WithdrawRec> {
 

src/main/java/org/springblade/ldt/bills/service/IBalanceBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IBalanceBillsService extends BaseService<BalanceBills> {
 

src/main/java/org/springblade/ldt/bills/service/IBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IBillsService extends BaseService<Bills> {
 

src/main/java/org/springblade/ldt/bills/service/IPlatformBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IPlatformBillsService extends BaseService<PlatformBills> {
 

src/main/java/org/springblade/ldt/bills/service/IPointBillsService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IPointBillsService extends BaseService<PointBills> {
 

src/main/java/org/springblade/ldt/bills/service/IWithdrawRecService.java

@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public interface IWithdrawRecService extends BaseService<WithdrawRec> {
 

src/main/java/org/springblade/ldt/bills/service/impl/BalanceBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class BalanceBillsServiceImpl extends BaseServiceImpl<BalanceBillsMapper, BalanceBills> implements IBalanceBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/BillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class BillsServiceImpl extends BaseServiceImpl<BillsMapper, Bills> implements IBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/PlatformBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class PlatformBillsServiceImpl extends BaseServiceImpl<PlatformBillsMapper, PlatformBills> implements IPlatformBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/PointBillsServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class PointBillsServiceImpl extends BaseServiceImpl<PointBillsMapper, PointBills> implements IPointBillsService {

src/main/java/org/springblade/ldt/bills/service/impl/WithdrawRecServiceImpl.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  *  服务实现类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Service
 public class WithdrawRecServiceImpl extends BaseServiceImpl<WithdrawRecMapper, WithdrawRec> implements IWithdrawRecService {

src/main/java/org/springblade/ldt/bills/vo/BalanceBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/BillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/PlatformBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/PointBillsVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/vo/WithdrawRecVO.java

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModel;
  * 视图实体类
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/springblade/ldt/bills/wrapper/BalanceBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class BalanceBillsWrapper extends BaseEntityWrapper<BalanceBills, BalanceBillsVO>  {
 

src/main/java/org/springblade/ldt/bills/wrapper/BillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class BillsWrapper extends BaseEntityWrapper<Bills, BillsVO>  {
 

src/main/java/org/springblade/ldt/bills/wrapper/PlatformBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class PlatformBillsWrapper extends BaseEntityWrapper<PlatformBills, PlatformBillsVO>  {
 

src/main/java/org/springblade/ldt/bills/wrapper/PointBillsWrapper.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2021-09-02
+ * @since 2021-09-03
  */
 public class PointBillsWrapper extends BaseEntityWrapper<PointBills, PointBillsVO>  {