From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 96 ++++-------------------------------------------
1 files changed, 9 insertions(+), 87 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 15d93e7..6df823e 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
@@ -22,6 +23,8 @@
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.WechatPayUtils;
+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.*;
@@ -32,6 +35,7 @@
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.*;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -114,6 +118,9 @@
@Resource
private RedisService redisService;
+
+ @Resource
+ private WechatPayUtils wechatPayUtils;
/**
* 获取商户详情
@@ -789,8 +796,6 @@
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);
@@ -957,7 +962,7 @@
* @return void
*/
@Override
- public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto){
+ public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws WxPayException {
ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthDto.getAuthId());
Shop shop = this.getByShopId(shopAuthentication.getShopId());
String applyNumber = IdUtils.simpleUUID();
@@ -965,90 +970,7 @@
shopAuthentication.setApplyNumber(applyNumber);
shopAuthentication.setAuditStatus(3);
shopAuthenticationService.saveOrUpdate(shopAuthentication);
- //生成提交类
- SubmitInfo submitInfo = new SubmitInfo();
- submitInfo.setOut_request_no(applyNumber);
- if(shopAuthentication.getMainType()==2){
- submitInfo.setOrganization_type("2");
- }else{
- submitInfo.setOrganization_type("4");
- }
- //营业执照
- BusinessLicenseInfo business_license_info = new BusinessLicenseInfo();
- business_license_info.setBusiness_license_copy(shopAuthentication.getBlImage());
- business_license_info.setBusiness_license_number(shopAuthentication.getBlNumber());
- business_license_info.setMerchant_name(shopAuthentication.getBlShopName());
- business_license_info.setLegal_person(shopAuthentication.getBlCorporateName());
- business_license_info.setCompany_address(shopAuthentication.getBlRegisteredAddress());
- business_license_info.setBusiness_time(shopAuthentication.getBlBusinessDeanline());
- submitInfo.setBusiness_license_info(business_license_info);
- //法人证件
- submitInfo.setId_doc_type("IDENTIFICATION_TYPE_MAINLAND_IDCARD");
- IdCardInfo id_card_info = new IdCardInfo();
- id_card_info.setId_card_copy(shopAuthentication.getLpIcFront());
- id_card_info.setId_card_national(shopAuthentication.getLpIcBack());
- id_card_info.setId_card_name(shopAuthentication.getLpCorporateName());
- id_card_info.setId_card_number(shopAuthentication.getLpIdCard());
- id_card_info.setId_card_valid_time_begin(shopAuthentication.getLpIcStartDate());
- id_card_info.setId_card_valid_time(shopAuthentication.getLpIcEndDate());
- 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");
- 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();
- if(shopAuthentication.getSettlementAccountType().equals("1")){
- accountInfo.setBank_account_type("74");
- }else{
- accountInfo.setBank_account_type("75");
- }
- accountInfo.setAccount_bank(shopAuthentication.getSaBank());
- accountInfo.setAccount_name(shopAuthentication.getSaAccountName());
- accountInfo.setBank_address_code(shopAuthentication.getSaBankCityCode());
- accountInfo.setBank_name(shopAuthentication.getSaBankName());
- accountInfo.setAccount_number(shopAuthentication.getSaNumber());
- submitInfo.setAccount_info(accountInfo);
- ContactInfo contactInfo = new ContactInfo();
- contactInfo.setContact_type("65");
- contactInfo.setContact_name(shopAuthentication.getLpCorporateName());
- contactInfo.setContact_id_card_number(shopAuthentication.getLpIdCard());
- contactInfo.setMobile_phone(shopAuthentication.getLpMobilePhone());
- contactInfo.setContact_email(shopAuthentication.getLpContactEmail());
- submitInfo.setContact_info(contactInfo);
- //店铺信息
- SalesSceneInfo salesSceneInfo = new SalesSceneInfo();
- salesSceneInfo.setStore_name(shop.getShopName());
- salesSceneInfo.setStore_url("");
- salesSceneInfo.setStore_qr_code("");
- submitInfo.setSales_scene_info(salesSceneInfo);
- submitInfo.setMerchant_shortname(shop.getShopName());
- submitInfo.setBusiness_addition_pics(shopAuthentication.getBaPics());
- submitInfo.setBusiness_addition_desc(shopAuthentication.getBaDesc());
- //提交审核
- /*try {
- WxShopUtils.ApplymentSubMch(submitInfo);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }*/
-
+ wechatPayUtils.ecommerceApply(shopAuthentication,applyNumber,shop);
}
/**
--
Gitblit v1.7.1