bug

jiangqs

2023-07-30 6b34c3ba5cf27dd8693e2bd23426fe96fefd9688

bug

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java

@@ -55,7 +55,8 @@
            if(member!=null&&member.getRelationShopId()!=null){
                shopId = member.getRelationShopId();
            }
        }else{
        }
        if(shopId==null){
            shopId = appRecommendGoodsPageDto.getPositionShopId();
        }
        if(shopId==null){
@@ -75,7 +76,8 @@
            if(member!=null&&member.getRelationShopId()!=null){
                shopId = member.getRelationShopId();
            }
        }else{
        }
        if(shopId==null){
            shopId = appRecommendGoodsPageDto.getPositionShopId();
        }
        if(shopId==null){

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java

@@ -118,6 +118,15 @@
                    discountMoney = mgtCouponPageVo.getDiscountMoney();
                    useLimit = "满" + moneyThreshold.toString() + "减" + discountMoney.toString() + "元";
                }
                if(couponType.equals("折扣")){
                    moneyThreshold = mgtCouponPageVo.getMoneyThreshold();
                    discountPercent = mgtCouponPageVo.getDiscountPercent();
                    useLimit = discountPercent.toString() + "折";
                }
                if(couponType.equals("抵扣")){
                    discountMoney = mgtCouponPageVo.getDiscountMoney();
                    useLimit = discountMoney.toString();
                }
                mgtCouponPageVo.setUseLimit(useLimit);
                //处理有效期
                validTimeType = mgtCouponPageVo.getValidTimeType();

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthDto.java

@@ -147,6 +147,9 @@
    @ApiModelProperty(value = "补充说明")
    private String baDesc;

    @ApiModelProperty(value = "法人是否受益人 0否1是")
    private Integer owner;

    /**
     * 受益人姓名
     */

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java

@@ -271,6 +271,9 @@
    @TableField("ba_desc")
    private String baDesc;

    @TableField("owner")
    private Integer owner;

    /**
     * 受益人姓名
     */

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -983,7 +983,11 @@
        submitInfo.setId_card_info(id_card_info);
        //企业填写
        if(shopAuthentication.getMainType()==2){
            //受益人
            if(shopAuthentication.getOwner()==1){
            submitInfo.setOwner(true);
            }else{
                submitInfo.setOwner(false);
            List<UboInfo> ubo_info_list = new ArrayList<>();
            UboInfo uboInfo = new UboInfo();
            uboInfo.setUbo_id_doc_type("IDENTIFICATION_TYPE_MAINLAND_IDCARD");
@@ -997,6 +1001,7 @@
            ubo_info_list.add(uboInfo);
            submitInfo.setUbo_info_list(ubo_info_list);
        }
        }
        //结算账户信息
        AccountInfo accountInfo = new AccountInfo();
        if(shopAuthentication.getSettlementAccountType().equals("1")){