From 079e8a10d085a913be68a14fc0ac43f92d41926b Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 10 Jun 2024 22:22:43 +0800 Subject: [PATCH] fix --- .../rent/WxBillDailyController.java | 12 ++++++++ .../controller/WxMallAdminController.java | 28 ++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index dc08b2d71..571534ac1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -15,6 +15,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillDailyBuildWay; +import com.iformall.enums.EnumBillDailyType; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.exception.MallinkException; import com.iformall.service.WxBillDailyService; @@ -36,6 +37,7 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -63,6 +65,16 @@ public class WxBillDailyController extends BillBaseController { private Logger logger = LoggerFactory.getLogger(this.getClass()); + + @GetMapping("billDailyTypes") + public ResultData billDailyTypes() { + Map tmap = new HashMap(); + for (EnumBillDailyType t : EnumBillDailyType.values()) { + tmap.put(t.getCode(), t.getMessage()); + } + return new ResultData(tmap); + } + @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index 98cd94ea7..01dcda623 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserRole; import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.WxBillAction; +import com.iformall.domain.po.WxBillDaily; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxMerchant; @@ -23,6 +24,8 @@ import com.iformall.domain.vo.WxBillHotNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.domain.vo.WxCouponOrderSumVo; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumBillDailyBuildWay; +import com.iformall.enums.EnumBillDailyType; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumBillUpdateType; import com.iformall.enums.EnumCouponOrderStatus; @@ -40,6 +43,7 @@ import com.iformall.service.MallUserRoleService; import com.iformall.service.SysConfigService; import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillAllService; +import com.iformall.service.WxBillDailyService; import com.iformall.service.WxBillSettleService; import com.iformall.service.WxChartDataService; import com.iformall.service.WxCouponOrderService; @@ -96,6 +100,8 @@ public class WxMallAdminController extends BaseController { private WxChartDataService wxChartDataService; @Autowired private WxCouponOrderService wxCouponOrderService; + @Autowired + WxBillDailyService wxBillDailyService; private WxUserDataRule getCurrentDataFloors(MallUserInfo user) { @@ -314,6 +320,26 @@ public class WxMallAdminController extends BaseController { return new ResultData(retMap); } - + @GetMapping("billDailyTypes") + public ResultData billDailyTypes() { + Map tmap = new HashMap(); + for (EnumBillDailyType t : EnumBillDailyType.values()) { + tmap.put(t.getCode(), t.getMessage()); + } + return new ResultData(tmap); + } + + + @PostMapping("billDailyAdd") + public ResultData add(@RequestBody WxBillDaily wxBillDaily) { + setQueryDataRule(wxBillDaily); + wxBillDaily.setUserId(this.getLoginMallUserInfo().getId()); + wxBillDaily.setBuildWay(EnumBillDailyBuildWay.HAND.getCode()); + wxBillDaily.setPayWay(null); + wxBillDaily.setPayDate(null); + wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); + wxBillDaily.setRemark(wxBillDaily.getBillRemark()); + return wxBillDailyService.saveOrUpdate(wxBillDaily, this.getLoginMallUserInfo()); + } }