ソースを参照

fix flow

release_toaliyun_real
xiaohanzi 5年前
コミット
60f5f3b530
1個のファイルの変更8行の追加4行の削除
  1. +8
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java

+ 8
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java ファイルの表示

@@ -145,9 +145,13 @@ public class WxCouponController extends BaseController {
return hasFlow(EnumFlowKey.B_COUPON_MERCHANT_CREATE,getTenantInfo()); return hasFlow(EnumFlowKey.B_COUPON_MERCHANT_CREATE,getTenantInfo());
} }


@ApiOperation("查询是否有审批流程")
@PostMapping("hasFlow")
public ResultData hasFlow() {
@ApiOperation("审批历史")
@GetMapping("flowHistory")
@ApiImplicitParams({
@ApiImplicitParam(name = "couponId", value = "编号", dataType = "Long", paramType = "query", required = true)})
public ResultData flowHistory(Long couponId) {
//wxFlowService.getModelBybusiness(wxFlowModel)
if (hasMerchantCouponFlow()) { if (hasMerchantCouponFlow()) {
return new ResultData(1); return new ResultData(1);
}else { }else {
@@ -173,7 +177,7 @@ public class WxCouponController extends BaseController {
return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程"); return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程");
} }
WxMerchantBUser buser = getUser(); WxMerchantBUser buser = getUser();
wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,wxCoupon,wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), wxCoupon);
wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,coupon,wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), coupon);
return new ResultData(Result.SUCCESS,"提交审批成功"); return new ResultData(Result.SUCCESS,"提交审批成功");
} }


読み込み中…
キャンセル
保存