ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserBankController.java
@@ -2,6 +2,7 @@ import com.ruoyi.account.api.model.AppUserBank; import com.ruoyi.common.core.web.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -9,6 +10,7 @@ * @author zhibing.pu * @Date 2024/11/25 15:07 */ @Api(tags = {"个人中心-我的银行卡-小程序"}) @RestController @RequestMapping("/appUserBank") public class AppUserBankController { @@ -19,7 +21,7 @@ @ResponseBody @PostMapping("/saveAppUserBank") @ApiOperation(value = "保存银行卡", tags = {"个人中心-我的银行卡-小程序"}) @ApiOperation(value = "保存银行卡") public AjaxResult saveAppUserBank(@RequestBody AppUserBank appUserBank){ return AjaxResult.success(); } @@ -27,7 +29,7 @@ @ResponseBody @GetMapping("/getAppUserBank") @ApiOperation(value = "获取银行卡信息", tags = {"个人中心-我的银行卡-小程序"}) @ApiOperation(value = "获取银行卡信息") public AjaxResult<AppUserBank> getAppUserBank(){ return AjaxResult.success(); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -4,6 +4,7 @@ import com.ruoyi.account.vo.*; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.BaseTable; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -17,6 +18,7 @@ * @author luodangjia * @since 2024-11-21 */ @Api(tags = {"登录注册-小程序"}) @RestController @RequestMapping("/app-user") public class AppUserController { @@ -28,7 +30,7 @@ @ResponseBody @PostMapping("/appletLogin") @ApiOperation(value = "小程序一键登录", tags = {"登录注册-小程序"}) @ApiOperation(value = "小程序一键登录") public AjaxResult<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){ // todo 待完善 pu return AjaxResult.success(); @@ -37,7 +39,7 @@ @ResponseBody @PostMapping("/mobileLogin") @ApiOperation(value = "手机号登录", tags = {"登录注册-小程序"}) @ApiOperation(value = "手机号登录") public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){ // todo 待完善 pu return AjaxResult.success(); @@ -47,7 +49,7 @@ @ResponseBody @PostMapping("/getSMSCode") @ApiOperation(value = "获取短信验证码", tags = {"登录注册-小程序"}) @ApiOperation(value = "获取短信验证码") public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){ // todo 待完善 pu return AjaxResult.success(); @@ -57,7 +59,7 @@ @ResponseBody @PostMapping("/registerAccount") @ApiOperation(value = "注册新账号", tags = {"登录注册-小程序"}) @ApiOperation(value = "注册新账号") public AjaxResult<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){ // todo 待完善 pu return AjaxResult.success(); @@ -66,7 +68,7 @@ @ResponseBody @GetMapping("/getReferrer/{id}") @ApiOperation(value = "获取推荐人信息", tags = {"登录注册-小程序"}) @ApiOperation(value = "获取推荐人信息") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long") }) @@ -79,7 +81,7 @@ @ResponseBody @GetMapping("/getNearbyReferrer") @ApiOperation(value = "获取附近推荐人列表", tags = {"登录注册-小程序"}) @ApiOperation(value = "获取附近推荐人列表") public AjaxResult<BaseTable<NearbyReferrerVo>> getNearbyReferrer(NearbyReferrer nearbyReferrer){ // todo 待完善 pu return AjaxResult.success(); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -1,6 +1,7 @@ package com.ruoyi.account.controller; import com.ruoyi.common.core.web.domain.AjaxResult; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,5 +17,9 @@ @RequestMapping("/user-coupon") public class UserCouponController { }
@@ -22,7 +22,7 @@ * @author luodangjia * @since 2024-11-21 */ @Api("订单") @Api(tags = "订单") @RestController @RequestMapping("/order") public class OrderController { ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
@@ -39,4 +39,6 @@ private UserAddress userAddress; @ApiModelProperty("支付方式（1=现金，2=积分）") private Integer paymentType; @ApiModelProperty("优惠券列表") private List<CouponInfoVo> coupon; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/CouponInfoVo.java
New file @@ -0,0 +1,36 @@ package com.ruoyi.order.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; /** * @author zhibing.pu * @Date 2024/11/25 17:59 */ @Data @ApiModel public class CouponInfoVo { @ApiModelProperty("优惠券id") private Long id; @ApiModelProperty("优惠券名称") private String name; @ApiModelProperty("优惠券类型 1=满减券,2=代金券,3=折扣券,4=商品券") private Integer couponType; @ApiModelProperty("满x元") private BigDecimal conditionAmount; @ApiModelProperty("减x元") private BigDecimal discountAmount; @ApiModelProperty("代金x元") private BigDecimal moneyAmount; @ApiModelProperty("折扣") private BigDecimal discount; @ApiModelProperty("有效期开始时间") private String periodStartTime; @ApiModelProperty("有效期结束时间") private String periodEndTime; @ApiModelProperty("是否可用") private Boolean available; } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
@@ -26,12 +26,12 @@ */ @RestController @RequestMapping("/banner") @Api("轮播图") @Api(tags = "轮播图") public class BannerController { @Resource private BannerService bannerService; @GetMapping("/list") @ApiOperation(value = "列表", tags = {"小程序-banner"}) @ApiOperation(value = "banner列表", tags = {"小程序-banner"}) public R<List<Banner>> list(String name, Integer jumpType, Integer position){ List<Banner> list = bannerService.lambdaQuery().like(StringUtils.isNotEmpty(name), Banner::getName, name) .eq(Banner::getJumpType, jumpType) ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -25,7 +25,7 @@ */ @RestController @RequestMapping("/goods") @Api("商品") @Api(tags = "商品") public class GoodsController extends BaseController { @Resource private GoodsService goodsService; ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -24,7 +24,7 @@ * @author luodangjia * @since 2024-11-20 */ @Api("分享") @Api(tags = "分享") @RestController @RequestMapping("/share") public class ShareController extends BaseController { ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -13,9 +13,7 @@ import com.ruoyi.other.service.ShopService; import com.ruoyi.other.service.TechnicianService; import com.ruoyi.other.vo.VerifiableShopVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,7 +29,7 @@ */ @RestController @RequestMapping("/shop") @Api("门店") @Api(tags = "门店") public class ShopController extends BaseController { @Resource private TechnicianService technicianService; @@ -92,7 +90,10 @@ @ResponseBody @GetMapping("/getVerifiableShop") @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"}) public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(){ @ApiImplicitParams({ @ApiImplicitParam(name = "goodsId", value = "商品id数组", required = true, dataType = "int"), }) public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(List<Integer> goodsId){ // todo 待完善 pu return AjaxResult.success(); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/VerifiableShopVo.java
File was renamed from ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/VerifiableShopVo.java @@ -1,4 +1,4 @@ package com.ruoyi.order.vo; package com.ruoyi.other.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty;
