修改bug

rentaiming

2024-07-26 bedd30a4950e38d282023447801cf2542b4b324f

修改bug

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -140,9 +140,7 @@
    @TableField(exist = false)
    private String roleName;
    
    @ApiModelProperty(value = "是否为拍卖师 1=否 2=是")
    @TableField(exist = false)
    private Integer isAuctioneer;

    @Override
    public String getRemark() {
        return remark;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java

@@ -1,5 +1,7 @@
package com.ruoyi.system.api.domain.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +11,9 @@
@ApiModel(value = "首页商品传输对象", description = "首页商品传输对象")
public class HomeGoodsSkuDTO extends BasePage {

    @ApiModelProperty(value = "商品id")
    private Long id;

    @ApiModelProperty(value = "商品名称")
    private String skuName;


 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.dto;

import com.ruoyi.common.core.enums.RequestTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +18,7 @@
    private Long orderId;

    @ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
    private Integer requestType;
    private String requestType;

    @ApiModelProperty(value = "申请原因")
    private String requestReason;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java

@@ -62,6 +62,8 @@
    private BigDecimal xiaosPrice;


    @ApiModelProperty(value = "商品id")
    private Long goodsSkuId;




 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java

@@ -1,5 +1,7 @@
package com.ruoyi.system.api.domain.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.GroupStatusEnum;
@@ -13,9 +15,9 @@
@Data
public class WdGoodsGroupPurchaseVO {

    @ApiModelProperty(value = "团购商品id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long Id;
    @ApiModelProperty(value = "商品团购id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;

    @ApiModelProperty(value = "商品id")
    @JsonInclude(JsonInclude.Include.ALWAYS)

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java

@@ -67,6 +67,12 @@
            }

            @Override
            public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo2(String goodsSkuId, String source) {
                return null;
            }


            @Override
            public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(GoodsGroupPurchaseInfo goodsGroupPurchaseInfo, String source) {
                return R.fail("通过id团购商品失败:" + cause.getMessage());
            }
@@ -77,6 +83,11 @@
            }

            @Override
            public R<?> updgoodsGroupPurchaseInfo1(GoodsGroupPurchaseInfo goodsGroupPurchaseInfo, String source) {
                return null;
            }

            @Override
            public R<GoodsSeckill> getGoodsSeckillOne(Long goodsSkuId, String source) {
                return R.fail("通过id查询秒杀商品失败:" + cause.getMessage());
            }

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java

@@ -49,6 +49,11 @@
            }

            @Override
            public R<Order> getOrderOne2(OrderDTO orderDTO, String source) {
                return null;
            }

            @Override
            public R<Boolean> getOrderAuctionBond(OrderAuctionBondDTO orderAuctionBondDTO,
                    String source) {
                return R.fail("查询拍卖订单佣金失败:" + cause.getMessage());
@@ -75,6 +80,11 @@

            @Override
            public R<Order> getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
                return null;
            }

            @Override
            public R<Order> getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
                return null;
            }

@@ -159,6 +169,13 @@
            public R<?> updateOrderStatusByMubres(List<String> formedGroupMubres, String source) {
                return R.fail("修改订单展示状态失败" + cause.getMessage());
            }

            @Override
            public R<?> updateOrderStatusByMubres1(String formedGroupMubres, String source) {
                return null;
            }


        };

    }

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java

@@ -56,6 +56,10 @@
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo(@RequestBody Long goodsSkuId,
                                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo2")
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo2(@RequestBody String goodsSkuId,
                                                                  @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo1")
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                                                                  @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@@ -64,6 +68,10 @@
    R<?> updgoodsGroupPurchaseInfo(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                        @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/updgoodsGroupPurchaseInfo1")
    R<?> updgoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                                   @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-seckill/getGoodsSeckillOne")
    R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId,
                                       @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java

@@ -47,6 +47,10 @@
    R<Order> getOrderOne1(@RequestBody OrderDTO orderDTO,
                         @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/order/getOrderOne2")
    R<Order> getOrderOne2(@RequestBody OrderDTO orderDTO,
                         @RequestHeader(SecurityConstants.FROM_SOURCE) String source);


    @PostMapping("/order-auction-bond/getOrderAuctionBond")
    R<Boolean> getOrderAuctionBond(@RequestBody OrderAuctionBondDTO orderAuctionBondDTO,
@@ -88,6 +92,10 @@

    @PostMapping("/order/getOrderByGroupPurchaseMemberId1")
    R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/order/getOrderByGroupPurchaseMemberId2")
    R<Order> getOrderByGroupPurchaseMemberId2(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/order/getOrderByGroupPurchaseMemberList")
@@ -192,4 +200,8 @@
    @PostMapping("/order/updOrderStatusByMubres")
    R<?> updateOrderStatusByMubres(@RequestBody List<String> formedGroupMubres,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/order/updOrderStatusByMubres1")
    R<?> updateOrderStatusByMubres1(@RequestBody String formedGroupMubres,
                                   @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java

@@ -29,13 +29,7 @@
import com.ruoyi.goods.service.IGoodsInfoTitleValueService;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.goods.service.IMemberGoodsCollectionService;
import com.ruoyi.system.api.domain.GoodsBrand;
import com.ruoyi.system.api.domain.GoodsCategory;
import com.ruoyi.system.api.domain.GoodsFlavorType;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSeries;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;