From 6b34c3ba5cf27dd8693e2bd23426fe96fefd9688 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 30 七月 2023 23:42:35 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthDto.java | 3 +++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 9 +++++++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 31 ++++++++++++++++++-------------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java | 6 ++++--
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java | 3 +++
5 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
index c14d4d9..9c75e79 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
+++ b/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){
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index b0da398..bbeae66 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
+++ b/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();
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthDto.java
index e7793e3..da5763f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthDto.java
+++ b/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;
+
/**
* 受益人姓名
*/
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java
index cd69a29..6543d6f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java
+++ b/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;
+
/**
* 受益人姓名
*/
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 52ddec8..3505a77 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -983,19 +983,24 @@
submitInfo.setId_card_info(id_card_info);
//企业填写
if(shopAuthentication.getMainType()==2){
- submitInfo.setOwner(true);
- List<UboInfo> ubo_info_list = new ArrayList<>();
- UboInfo uboInfo = new UboInfo();
- uboInfo.setUbo_id_doc_type("IDENTIFICATION_TYPE_MAINLAND_IDCARD");
- uboInfo.setUbo_id_doc_copy(shopAuthentication.getUboIcFront());
- uboInfo.setUbo_id_doc_copy_back(shopAuthentication.getUboIcBack());
- uboInfo.setUbo_id_doc_name(shopAuthentication.getUboName());
- uboInfo.setUbo_id_doc_number(shopAuthentication.getUboIdCard());
- uboInfo.setUbo_id_doc_address(shopAuthentication.getUboIcAddress());
- uboInfo.setUbo_id_doc_period_begin(shopAuthentication.getUboIcStartDate());
- uboInfo.setUbo_id_doc_period_end(shopAuthentication.getUboIcEndDate());
- ubo_info_list.add(uboInfo);
- submitInfo.setUbo_info_list(ubo_info_list);
+ //受益人
+ 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");
+ uboInfo.setUbo_id_doc_copy(shopAuthentication.getUboIcFront());
+ uboInfo.setUbo_id_doc_copy_back(shopAuthentication.getUboIcBack());
+ uboInfo.setUbo_id_doc_name(shopAuthentication.getUboName());
+ uboInfo.setUbo_id_doc_number(shopAuthentication.getUboIdCard());
+ uboInfo.setUbo_id_doc_address(shopAuthentication.getUboIcAddress());
+ uboInfo.setUbo_id_doc_period_begin(shopAuthentication.getUboIcStartDate());
+ uboInfo.setUbo_id_doc_period_end(shopAuthentication.getUboIcEndDate());
+ ubo_info_list.add(uboInfo);
+ submitInfo.setUbo_info_list(ubo_info_list);
+ }
}
//结算账户信息
AccountInfo accountInfo = new AccountInfo();
--
Gitblit v1.7.1