From 168d852672f8f671a01d6f0f053349d0d321ec7c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
index 0808124..4f67843 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
@@ -49,30 +49,35 @@
     @Autowired
     private WeChatUtil weChatUtil;
 
+//    @Override
+//    public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) {
+//
+//        OperatorAuthAlipay shopAuthentication = new OperatorAuth();
+//
+//        if(mgtShopAuthDto.getBlBusinessFoeverFlag()!=null&&mgtShopAuthDto.getBlBusinessFoeverFlag()==1){
+//            mgtShopAuthDto.setBlBusinessDeanline("长期");
+//        }
+//        if(mgtShopAuthDto.getLpIcForeverFlag()!=null&&mgtShopAuthDto.getLpIcForeverFlag()==1){
+//            mgtShopAuthDto.setLpIcEndDate("长期");
+//        }
+//        BeanUtils.copyProperties(mgtShopAuthDto , shopAuthentication);
+//        TOperator operator = operatorMapper.selectById(shopAuthentication.getOperatorId());
+//        String applyNumber = UUIDUtil.getNativeUUID().replace("-","");
+//        shopAuthentication.setOutBizNo(applyNumber);
+//        ApplymentsResult applymentsResult;
+//        try {
+//            applymentsResult = weChatUtil.ecommerceApply(shopAuthentication,applyNumber,operator);
+//        } catch (Exception e) {
+//            throw new ServiceException(e.getMessage());
+//        }
+//        shopAuthentication.setOrderStatus("AUDITING");
+//        shopAuthentication.setOrderNo(applymentsResult.getApplymentId());
+//        operatorAuthService.saveOrUpdate(shopAuthentication);
+//    }
+
     @Override
     public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) {
 
-        OperatorAuth shopAuthentication = new OperatorAuth();
-
-        if(mgtShopAuthDto.getBlBusinessFoeverFlag()!=null&&mgtShopAuthDto.getBlBusinessFoeverFlag()==1){
-            mgtShopAuthDto.setBlBusinessDeanline("长期");
-        }
-        if(mgtShopAuthDto.getLpIcForeverFlag()!=null&&mgtShopAuthDto.getLpIcForeverFlag()==1){
-            mgtShopAuthDto.setLpIcEndDate("长期");
-        }
-        BeanUtils.copyProperties(mgtShopAuthDto , shopAuthentication);
-        TOperator operator = operatorMapper.selectById(shopAuthentication.getOperatorId());
-        String applyNumber = UUIDUtil.getNativeUUID().replace("-","");
-        shopAuthentication.setOutBizNo(applyNumber);
-        ApplymentsResult applymentsResult;
-        try {
-            applymentsResult = weChatUtil.ecommerceApply(shopAuthentication,applyNumber,operator);
-        } catch (Exception e) {
-            throw new ServiceException(e.getMessage());
-        }
-        shopAuthentication.setOrderStatus("AUDITING");
-        shopAuthentication.setOrderNo(applymentsResult.getApplymentId());
-        operatorAuthService.saveOrUpdate(shopAuthentication);
     }
 
     @Override

--
Gitblit v1.7.1