From b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:31:46 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
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..15d93e7 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
@@ -22,7 +22,6 @@
import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.service.task.ShopTaskService;
-import com.ruoyi.shop.util.WxShopUtils;
import com.ruoyi.shop.util.dto.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.*;
@@ -106,6 +105,9 @@
@Resource
private RemoteSysStaffService remoteSysStaffService;
+
+ @Resource
+ private RemoteFileService remoteFileService;
@Resource
private ShopTaskService shopTaskService;
@@ -301,6 +303,13 @@
if(newShop){
//生成商户关联记录
initNewShop(shop,mgtEditShopDto.getUserId());
+ CodeGetDto codeGetDto = new CodeGetDto();
+ String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+shop.getShopId();
+ codeGetDto.setUrl(url);
+ codeGetDto.setFileName("shop-"+shop.getShopId());
+ String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
+ shop.setShopCode(codeUrl);
+ this.saveOrUpdate(shop);
}
}
@@ -780,6 +789,8 @@
merHomeShopTotalVo.setShopId(shopId);
Shop shop = this.getById(shopId);
merHomeShopTotalVo.setShopType(shop.getShopType());
+ merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
+ merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
ShopTotal shopTotal = shopTotalService.getById(shopId);
merHomeShopTotalVo.setShopId(shopId);
@@ -983,19 +994,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();
@@ -1027,11 +1043,11 @@
submitInfo.setBusiness_addition_pics(shopAuthentication.getBaPics());
submitInfo.setBusiness_addition_desc(shopAuthentication.getBaDesc());
//提交审核
- try {
+ /*try {
WxShopUtils.ApplymentSubMch(submitInfo);
} catch (Exception e) {
throw new RuntimeException(e);
- }
+ }*/
}
--
Gitblit v1.7.1