| @@ -5,7 +5,9 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.po.WxMerchantSubsidy; | import com.iformall.domain.po.WxMerchantSubsidy; | ||||
| import com.iformall.domain.vo.WxMerchantSubsidyVo; | import com.iformall.domain.vo.WxMerchantSubsidyVo; | ||||
| import com.iformall.enums.EnumMerchantSubsidyStatus; | |||||
| import com.iformall.service.WxMerchantSubsidyService; | import com.iformall.service.WxMerchantSubsidyService; | ||||
| import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| @@ -18,6 +20,7 @@ import java.util.Date; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| @RestController | @RestController | ||||
| @Api(description = "商户补贴接口") | |||||
| @RequestMapping("subsidy") | @RequestMapping("subsidy") | ||||
| public class WxMerchantSubsidyController extends BaseController { | public class WxMerchantSubsidyController extends BaseController { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @@ -53,13 +56,14 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| } | } | ||||
| @ApiOperation("更新补贴记录") | @ApiOperation("更新补贴记录") | ||||
| @PostMapping("update") | |||||
| @PostMapping("updateSubsidied") | |||||
| public ResultData listMonth(@RequestBody WxMerchantSubsidy wxMerchantSubsidy) { | public ResultData listMonth(@RequestBody WxMerchantSubsidy wxMerchantSubsidy) { | ||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("subsidy/update: " + ipStr + " :" + wxMerchantSubsidy.toString()); | logger.info("subsidy/update: " + ipStr + " :" + wxMerchantSubsidy.toString()); | ||||
| if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); | if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxMerchantSubsidy.setTenantId(user.getTenantId()); | wxMerchantSubsidy.setTenantId(user.getTenantId()); | ||||
| wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.SUBSIDIED.getCode()); | |||||
| wxMerchantSubsidy.setUpdateDate(new Date()); | wxMerchantSubsidy.setUpdateDate(new Date()); | ||||
| return wxMerchantSubsidyService.saveOrUpdate(wxMerchantSubsidy); | return wxMerchantSubsidyService.saveOrUpdate(wxMerchantSubsidy); | ||||
| } | } | ||||