diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 1d4af7033..cf53a7283 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -131,7 +131,7 @@ public class WxCouponController extends BaseController { } @ApiOperation("根据id更新库存及有效期接口") - @PostMapping("updateStokeAndValidDate") + @PostMapping("updateStokeAndValidDate") @SystemControllerLog(description = "券投放-库存/有效期更新") public ResultData updateStokeAndValidDate(@RequestBody WxCoupon wxCoupon) { logger.debug("[" + getIpAddr() + "] WxCouponController::updateStokeAndValidDate"); @@ -174,12 +174,13 @@ public class WxCouponController extends BaseController { wxCoupon.setTenantId(getTenantId()); if(wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() >0){ -// wxCoupon.getFlowParams().put("inventory",wxCoupon.getInventory()); -// wxCoupon.getFlowParams().put("remainInventory",wxCoupon.getRemainInventory()); -// wxCoupon.getFlowParams().put("type",wxCoupon.getType()); -// wxCoupon.getFlowParams().put("validEndDate",wxCoupon.getValidEndDate()); -// wxCoupon.getFlowParams().put("validStartDate",wxCoupon.getValidStartDate()); -// wxCoupon.getFlowParams().put("validType",wxCoupon.getValidType()); + wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); + wxCoupon.getFlowParams().put("inventory",wxCoupon.getInventory()); + wxCoupon.getFlowParams().put("remainInventory",wxCoupon.getRemainInventory()); + wxCoupon.getFlowParams().put("type",wxCoupon.getType()); + wxCoupon.getFlowParams().put("validEndDate",wxCoupon.getValidEndDate()); + wxCoupon.getFlowParams().put("validStartDate",wxCoupon.getValidStartDate()); + wxCoupon.getFlowParams().put("validType",wxCoupon.getValidType()); wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); wxCoupon.setStockApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index bc033b620..b7391f6ea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -9,6 +9,8 @@ import com.iformall.domain.po.WxSubBusiness; import com.iformall.service.WxBusinessService; import com.iformall.service.WxSubBusinessService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,19 +90,22 @@ public class WxBusinessController extends BaseController { @ApiOperation("贡献率排行") @GetMapping("devoteList") @SystemControllerLog(description = "业态分析接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData devoteList(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBusinessController::devoteList"); List> result = new ArrayList<>(); Map map = new HashMap<>(); map.put("merchantName","西贝筱面"); map.put("sale","2323.23");//营业额 - map.put("sale","32323.23");//商户销售坪效 + map.put("saleRate","32323.23");//商户销售坪效 map.put("devoteRate","1.23");//贡献率 result.add(map); map = new HashMap<>(); map.put("merchantName","肯德基"); map.put("sale","2323.23");//营业额 - map.put("sale","32323.23");//商户销售坪效 + map.put("saleRate","32323.23");//商户销售坪效 map.put("devoteRate","1.23");//贡献率 result.add(map); PageInfo> page = new PageInfo<>(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index a9d552712..a923a3000 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -229,8 +229,7 @@ public class WxCouponServiceImpl implements WxCouponService { } if (flag) { String message = sb.toString(); - //todo:测试 - // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "商户:" + message + "还未配置分账账户"); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "商户:" + message + "还未配置分账账户"); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 629efcc64..2f32e5085 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -277,12 +277,22 @@ public class WxFlowServiceImpl implements WxFlowService { } } + public Integer getBusinessType(Object businessType){ + if(businessType == null) return null; + if(businessType instanceof String){ + return Integer.parseInt((String)businessType); + }else if(businessType instanceof Integer){ + return (Integer)businessType; + } + return null; + } + @Override @Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) public ResultData start(Map params,Long userId,String userName,String tenantId) { String remark = (String)params.get("remark"); Long businessId = Long.parseLong(params.get("businessId").toString()); - Integer flowType = (Integer)params.get("businessType"); + Integer flowType = getBusinessType(params.get("businessType")); List> variables = (List)params.get("variables"); Boolean supplement = (Boolean)params.get("supplement");