From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 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 b24aa9e..63bfe51 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
@@ -17,7 +17,6 @@
import com.dsh.guns.modular.system.service.IOperatorAuthService;
import com.dsh.guns.modular.system.service.IOperatorUserService;
import com.dsh.guns.modular.system.service.ITStudentService;
-import com.dsh.guns.modular.system.util.WeChatUtil;
import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsResult;
import com.github.binarywang.wxpay.service.EcommerceService;
import com.github.binarywang.wxpay.service.WxPayService;
@@ -46,37 +45,42 @@
private IOperatorAuthService operatorAuthService;
@Autowired
private TOperatorMapper operatorMapper;
- @Autowired
- private WeChatUtil weChatUtil;
+// @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 List<Map<String, Object>> listAll(Page<Map<String, Object>> page, String province, String city, String userName, String phone, Integer platform, Integer type, Integer state) {
- return this.baseMapper.listAll(page,province,city,userName,phone,platform,type,state);
- }
@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
+ public List<OperatorUserVO> listAll(String province, String city, String userName, String phone, Integer platform, Integer type, Integer state) {
+ return this.baseMapper.listAll(province,city,userName,phone,platform,type,state);
}
}
--
Gitblit v1.7.1