修改退款

ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java

@@ -77,6 +77,11 @@ public class LoginUser implements Serializable
      */
     private SysUser sysUser;
 
+    /**
+     * 是否已过期 0-未启用，1-正常，2-停用
+     */
+    private Integer status;
+
     public String getToken()
     {
         return token;
@@ -205,4 +210,12 @@ public class LoginUser implements Serializable
     public void setUserTypeUtil(String userTypeUtil) {
         this.userTypeUtil = userTypeUtil;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java

@@ -47,6 +47,7 @@ public class TokenService {
         loginUser.setUserType(loginUser.getUserType());
         loginUser.setOpenId(loginUser.getOpenId());
         loginUser.setUserTypeUtil(loginUser.getUserTypeUtil());
+        loginUser.setStatus(loginUser.getStatus());
         refreshToken(loginUser);
 
         // 保存或更新用户token

xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java

@@ -129,7 +129,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc
         //桩的统计、该时段金额
         List<Map<String, Object>> list =new ArrayList<>();
         LoginUser logUser = logUserUtils.getLogUser(request);
-        String tenantId = logUser.getTenantId();
+        String tenantId = logUser.getSysUser().getTenantId();
         if(userId !=1) {
             Map<String, Object> landUser = xhpcChargingStationMapper.getLandUser(userId);
             if(landUser !=null){

xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml

@@ -89,7 +89,7 @@
             and cs.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId})
         </if>
         <if test="tenantId !=null and tenantId !=''">
-            and tenant_id=#{tenantId}
+            and cs.tenant_id=#{tenantId}
         </if>
     </select>
 

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/RefundOrderService.java

@@ -4,6 +4,7 @@ import com.xhpc.common.api.factory.RefundOrderFallbackFactory;
 import com.xhpc.common.core.constant.ServiceNameConstants;
 import com.xhpc.common.core.domain.R;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -17,6 +18,6 @@ import java.util.Map;
 @FeignClient(contextId = "refundOrderService",value = ServiceNameConstants.XHPC_PAYMENT,fallbackFactory = RefundOrderFallbackFactory.class)
 public interface RefundOrderService {
 
-    @PostMapping("/refund/order/orderCheckOut")
+    @GetMapping("/refund/order/orderCheckOut")
     R sendNotice(@RequestParam(value = "amount") String amount,@RequestParam(value = "openid") String openid,@RequestParam(value = "source") Integer source,@RequestParam(value = "type") String type,@RequestParam(value = "userId") String userId,@RequestParam(value = "tenantId")String tenantId,@RequestParam(value = "remark")String remark);
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java

@@ -3,6 +3,7 @@ package com.xhpc.order.controller;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.xhpc.common.api.RefundOrderService;
 import com.xhpc.common.api.UserTypeService;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.web.controller.BaseController;
@@ -49,7 +50,8 @@ public class XhpcHistoryOrderController extends BaseController {
     private IXhpcChargeOrderService chargeOrderService;
     @Autowired
     private UserTypeService userTypeService;
-
+    @Autowired
+    private RefundOrderService refundOrderService;
 
     private static final Logger logger = LoggerFactory.getLogger(XhpcHistoryOrderController.class);
 
@@ -79,10 +81,10 @@ public class XhpcHistoryOrderController extends BaseController {
      */
     @GetMapping("/getListPage")
     public TableDataInfo  getListPage(String phone,String transactionNumber,@RequestParam("status")Integer status,String chargingStationName,Long operatorId,Integer source,String beginStartTime,String beginEndTime,@RequestParam("userId") Long userId, Integer type,
-                                      String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId)
+                                      String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId, Integer confirmResult)
 
     {
-        List<Map<String, Object>> listPage = xhpcHistoryOrderService.getListPage(phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId);
+        List<Map<String, Object>> listPage = xhpcHistoryOrderService.getListPage(phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult);
         return getDataTable(listPage);
     }
 
@@ -123,9 +125,10 @@ public class XhpcHistoryOrderController extends BaseController {
                           String vinCode,
                           String overStartTime,
                           String overEndTime,
-                          Long personnelId) throws IOException {
+                          Long personnelId,
+                          Integer confirmResult) throws IOException {
 
-        xhpcHistoryOrderService.export(response, phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId);
+        xhpcHistoryOrderService.export(response, phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult);
     }
 
 
@@ -971,5 +974,4 @@ public class XhpcHistoryOrderController extends BaseController {
             }
         }
     }
-
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java

@@ -75,7 +75,7 @@ public interface XhpcHistoryOrderMapper {
      * 历史订单记录（PC）
      * @return
      */
-    List<Map<String,Object>> getListPage(@Param("phone")String phone,@Param("transactionNumber")String transactionNumber,@Param("status")Integer status,@Param("chargingStationName")String chargingStationName,@Param("operatorId")Long operatorId,@Param("source")Integer source,@Param("beginStartTime")String beginStartTime,@Param("beginEndTime")String beginEndTime,@Param("userId")Long userId,@Param("type")Integer type,@Param("number")Integer number,@Param("affiliationOrganization")String affiliationOrganization,@Param("evcsOrderNo")String evcsOrderNo,@Param("plateNum")String plateNum,@Param("internetId")Integer internetId,@Param("internetSerialNumber")String internetSerialNumber,@Param("terminalName")String terminalName,@Param("vinCode")String vinCode,@Param("overStartTime")String overStartTime,@Param("overEndTime")String overEndTime,@Param("personnelId")Long personnelId);
+    List<Map<String,Object>> getListPage(@Param("phone")String phone,@Param("transactionNumber")String transactionNumber,@Param("status")Integer status,@Param("chargingStationName")String chargingStationName,@Param("operatorId")Long operatorId,@Param("source")Integer source,@Param("beginStartTime")String beginStartTime,@Param("beginEndTime")String beginEndTime,@Param("userId")Long userId,@Param("type")Integer type,@Param("number")Integer number,@Param("affiliationOrganization")String affiliationOrganization,@Param("evcsOrderNo")String evcsOrderNo,@Param("plateNum")String plateNum,@Param("internetId")Integer internetId,@Param("internetSerialNumber")String internetSerialNumber,@Param("terminalName")String terminalName,@Param("vinCode")String vinCode,@Param("overStartTime")String overStartTime,@Param("overEndTime")String overEndTime,@Param("personnelId")Long personnelId,@Param("confirmResult")Integer confirmResult);
 
     /**
      * 获取费率时段

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java

@@ -53,14 +53,14 @@ public interface IXhpcHistoryOrderService {
      * 历史订单记录（PC）
      * @return
      */
-    List<Map<String,Object>> getListPage(String phone,String transactionNumber,Integer status,String chargingStationName,Long operatorId,Integer source,String beginStartTime,String beginEndTime,Long userId,Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId);
+    List<Map<String,Object>> getListPage(String phone,String transactionNumber,Integer status,String chargingStationName,Long operatorId,Integer source,String beginStartTime,String beginEndTime,Long userId,Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId,Integer confirmResult);
 
 
     /**
      * 历史订单记录导出（PC）
      * @return
      */
-    void export(HttpServletResponse response, String phone, String transactionNumber, Integer status, String chargingStationName, Long operatorId, Integer source, String beginStartTime, String beginEndTime, Long userId, Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId) throws IOException;
+    void export(HttpServletResponse response, String phone, String transactionNumber, Integer status, String chargingStationName, Long operatorId, Integer source, String beginStartTime, String beginEndTime, Long userId, Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId,Integer confirmResult) throws IOException;
 
 
     /**

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java

@@ -203,7 +203,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
     }
 
     @Override
-    public List<Map<String, Object>> getListPage(String phone, String transactionNumber, Integer status, String chargingStationName, Long operatorId, Integer source, String beginStartTime, String beginEndTime, Long userId, Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId) {
+    public List<Map<String, Object>> getListPage(String phone, String transactionNumber, Integer status, String chargingStationName, Long operatorId, Integer source, String beginStartTime, String beginEndTime, Long userId, Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId,Integer confirmResult) {
 
         Integer number = 0;
         //电话和用户类型都不为null  number =3
@@ -229,26 +229,26 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
                     if ("01".equals(landUser.get("userType").toString())) {
                         Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
-                        list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 1, chargingStationName, operatorId, source, beginStartTime, beginEndTime, logOperatorId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId);
+                        list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 1, chargingStationName, operatorId, source, beginStartTime, beginEndTime, logOperatorId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult);
                     } else {
                         //查询赋值的场站
-                        list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 2, chargingStationName, operatorId, source, beginStartTime, beginEndTime, logUserId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId);
+                        list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 2, chargingStationName, operatorId, source, beginStartTime, beginEndTime, logUserId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult);
                     }
                 }
             }
 
         } else {
             startPage();
-            list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 0, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId);
+            list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 0, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult);
         }
         return list;
     }
 
 
     @Override
-    public void export(HttpServletResponse response, String phone, String transactionNumber, Integer status, String chargingStationName, Long operatorId, Integer source, String beginStartTime, String beginEndTime, Long userId, Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId) throws IOException {
+    public void export(HttpServletResponse response, String phone, String transactionNumber, Integer status, String chargingStationName, Long operatorId, Integer source, String beginStartTime, String beginEndTime, Long userId, Integer type,String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId,Integer confirmResult) throws IOException {
 
-        List<Map<String, Object>> list = getListPage(phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId);
+        List<Map<String, Object>> list = getListPage(phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult);
         // 通过工具类创建writer，默认创建xls格式
         ExcelWriter writer = ExcelUtil.getWriter(true);
         writer.addHeaderAlias("historyOrderId", "历史订单ID");

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java

@@ -643,6 +643,12 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
                             logger.info("<<<<<<<<<<<<<<<<进入自动退款111>>>>>>>>>>>>>>>>>");
                             if(UserTypeUtil.USER_TYPE.equals(source) || UserTypeUtil.COMMUNIT_TYPE.equals(source)){
                                 logger.info("<<<<<<<<<<<<<<<<进入自动退款222>>>>>>>>>>>>>>>>>");
+                                logger.info("<<<<<<<<<<<<<<<<balance2>>>>>>>>>>>>>>>>>"+balance2);
+                                logger.info("<<<<<<<<<<<<<<<<openids>>>>>>>>>>>>>>>>>"+openids);
+                                logger.info("<<<<<<<<<<<<<<<<xhpcChargeOrder.getSource()>>>>>>>>>>>>>>>>>"+xhpcChargeOrder.getSource());
+                                logger.info("<<<<<<<<<<<<<<<<refundTypes>>>>>>>>>>>>>>>>>"+refundTypes);
+                                logger.info("<<<<<<<<<<<<<<<<xhpcChargeOrder.getUserId()>>>>>>>>>>>>>>>>>"+xhpcChargeOrder.getUserId().toString());
+                                logger.info("<<<<<<<<<<<<<<<<xhpcChargeOrder.getTenantId()>>>>>>>>>>>>>>>>>"+xhpcChargeOrder.getTenantId());
                                 R r = refundOrderService.sendNotice(balance2,openids,xhpcChargeOrder.getSource(),refundTypes,xhpcChargeOrder.getUserId().toString(),xhpcChargeOrder.getTenantId(),"充电结算自动申请退款");
                                 logger.info("<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>"+r.getCode());
                                 logger.info("<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>"+r.getData());

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml

@@ -700,6 +700,9 @@
             ) ut on ut.history_order_id = ho.history_order_id
         </if>
         where ho.status =0 and ho.del_flag=0
+        <if test="confirmResult !=null">
+            and ho.confirm_Result =#{confirmResult}
+        </if>
         <if test="type !=null">
             and ho.type=#{type}
         </if>

xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java

@@ -720,13 +720,13 @@ public class XhpcRefundAuditController extends BaseController {
     }
 
     /**
-     * 定时任务，每1分钟，扫描一次，退款订单金额小于100，自动审核通过
+     * 定时任务，每20秒，扫描一次，退款订单金额小于100，自动审核通过
      *
      */
-    @Scheduled(cron = "0 */1 * * * ?")
+    @Scheduled(cron = "0/20 * * * * ? ")
     @GetMapping("/moneyPage")
     public void moneyPage(){
-        logger.info("++++++++++++每1分钟，扫描一次，退款订单金额小于100，自动审核通过++++++++++++++++");
+        logger.info("++++++++++++每1分钟，扫描一次，退款订单金额小于每20秒，自动审核通过++++++++++++++++");
         try {
             List<Long> list = iXhpcRefundOrderService.moneyPage();
             if(list !=null && list.size()>0){

xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java

@@ -168,13 +168,13 @@ public class XhpcRefundOrderController extends BaseController {
     /**
      * 自动申请退款
      */
-    @NoRepeatSubmit
+    @GetMapping("/orderCheckOut")
-    @PostMapping("/orderCheckOut")
     @ApiOperation(value = "订单自动退款")
     public R orderCheckOut(@RequestParam(value = "amount") String amount,@RequestParam(value = "openid") String openid,@RequestParam(value = "source") Integer source,@RequestParam(value = "type") String type,@RequestParam(value = "userId") String userId,@RequestParam(value = "tenantId")String tenantId,@RequestParam(value = "remark")String remark) {
-
+        logger.info("-------------");
-        Integer userType = source;
+        logger.info("进入自动申请退款");
-        if (UserTypeUtil.CUSTOMERS_TYPE.equals(userType)) {
+        logger.info("-------------");
+        if (UserTypeUtil.CUSTOMERS_TYPE.equals(source)) {
             return R.fail("大客户不支持退款");
         }
         if (StringUtils.isEmpty(amount)) {
@@ -197,12 +197,12 @@ public class XhpcRefundOrderController extends BaseController {
         }
         //是否有实时数据
         Long userid = Long.valueOf(userId);
-        int i = iXhpcRefundOrderService.countXhpcRealTimeOrder(userid, userType, tenantId);
+        int i = iXhpcRefundOrderService.countXhpcRealTimeOrder(userid, source, tenantId);
         if (i > 0) {
             return R.fail("车辆正在充电,不能退款");
         }
         // 是否有异常订单
-        int j = iXhpcRefundOrderService.countXhpcChargeOrder(userid, userType, tenantId);
+        int j = iXhpcRefundOrderService.countXhpcChargeOrder(userid, source, tenantId);
         if (j > 0) {
             return R.fail("你有异常订单未解决，请拨打客服电话进行解决");
         }
@@ -212,7 +212,7 @@ public class XhpcRefundOrderController extends BaseController {
 
         logger.info("<<<<<<<<<<<<<<<<开始创建退款订单>>>>>>>>>>>>>>>>>");
         AjaxResult ajaxResult = iXhpcRefundOrderService.addRefundOrder("" + userid, BigDecimal.valueOf(Double.parseDouble(amount)), type,
-                orderOutNumber, openid, remark, userType, tenantId);
+                orderOutNumber, openid, remark, source, tenantId);
         if("200".equals(ajaxResult.get("code"))){
             return R.ok();
         }else{

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java

@@ -22,6 +22,7 @@ import com.xhpc.user.service.IXhpcAppUserUserService;
 import io.swagger.annotations.ApiOperation;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.*;
 
 import javax.crypto.Cipher;
@@ -49,6 +50,9 @@ public class XhpcAppUserController extends BaseController {
 
     @Autowired
     private SettingConfigService settingConfigService;
+
+    @Autowired
+    private Environment environment;
     /**
      * C端用户详情
      */
@@ -241,8 +245,8 @@ public class XhpcAppUserController extends BaseController {
      * 支付宝授权
      */
     @ApiOperation("支付宝授权")
-    @PostMapping("/alipayEmpower")
+    @PostMapping("/alipayEmpowerYu")
-    public AjaxResult alipayEmpower(@RequestParam String code,String tenantId) throws Exception {
+    public AjaxResult alipayEmpowerYu(@RequestParam String code,String tenantId) throws Exception {
         if("".equals(tenantId) || null==tenantId){
             tenantId="000000";
         }
@@ -288,6 +292,51 @@ public class XhpcAppUserController extends BaseController {
         return AjaxResult.error("获取失败");
     }
 
+    /**
+     * 支付宝授权
+     */
+    @ApiOperation("支付宝授权")
+    @PostMapping("/alipayEmpower")
+    public AjaxResult alipayEmpower(@RequestParam String code) throws Exception {
+
+        /** 初始化 **/
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+        /** 支付宝网关 **/
+        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
+        /** 应用id，如何获取请参考：https://opensupport.alipay.com/support/helpcenter/190/201602493024 **/
+        certAlipayRequest.setAppId(environment.getProperty("ALIPAYAPPID"));
+        /** 应用私钥, 如何获取请参考：https://opensupport.alipay.com/support/helpcenter/207/201602471154?ant_source=antsupport  **/
+        certAlipayRequest.setPrivateKey(environment.getProperty("ALIPAYPRIVATEKEY"));
+        /** 应用公钥证书路径，下载后保存位置的绝对路径  **/
+        certAlipayRequest.setCertPath(environment.getProperty("CERTPATH"));
+        /** 支付宝公钥证书路径，下载后保存位置的绝对路径 **/
+        certAlipayRequest.setAlipayPublicCertPath(environment.getProperty("PUBLICCERTPATH"));
+        /** 支付宝根证书路径，下载后保存位置的绝对路径 **/
+        certAlipayRequest.setRootCertPath(environment.getProperty("ROOTCRETPATH"));
+        /** 设置签名类型 **/
+        certAlipayRequest.setSignType("RSA2");
+        /** 设置请求格式，固定值json **/
+        certAlipayRequest.setFormat("json");
+        /** 设置编码格式 **/
+        certAlipayRequest.setCharset("UTF-8");
+        AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest);
+        AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
+        request.setGrantType("authorization_code");
+        //  auth_code  前端授权后得到的授权码
+        request.setCode(code);
+        AlipaySystemOauthTokenResponse response = alipayClient.certificateExecute(request);
+        //服务端请求返回，RSA2密钥和公钥证书请求方式不同，如当面付
+        // RSA2密钥请求response = alipayClient.execute(request);
+        // 公钥证书请求请求response = alipayClient.certificateExecute(request);
+        if (response.isSuccess()) {
+            System.out.println("调用成功");
+        } else {
+            System.out.println("调用失败");
+        }
+        return AjaxResult.success(response);
+    }
+
+
     /**
      * 注销账号
      */

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java

@@ -225,17 +225,21 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
             return R.fail(HttpStatus.ERROR_STATUS, "用户名不在指定范围");
         }
 
-        //判断账号
+        R lognUser = userTypeService.getUser(username, null, null, null,tenantId);
+        if(lognUser !=null && lognUser.getData() !=null){
             String sub = username.substring(0, 2);
             if (UserTypeUtil.COMMUNIT.equals(sub) || UserTypeUtil.CUSTOMERS.equals(sub)){
-            R user = userTypeService.getUser(username, null, null, null,tenantId);
+                Map<String, Object> map = (Map<String, Object>)lognUser.getData();
-            if(user !=null && user.getData() !=null){
-                Map<String, Object> map = (Map<String, Object>)user.getData();
                 LoginUser userInfo = new LoginUser();
                 SysUser sysUser = new SysUser();
                 sysUser.setUserName(username);
                 long appUserId = Long.parseLong(map.get("appUserId").toString());
                 sysUser.setUserId(appUserId);
+                if(map.get("tenantStatus") !=null && "2".equals(map.get("tenantStatus").toString())){
+                    userInfo.setStatus(2);
+                }else{
+                    userInfo.setStatus(1);
+                }
                 userInfo.setSysUser(sysUser);
                 userInfo.setUsername(username);
                 userInfo.setOpenId(openid);
@@ -266,9 +270,6 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
                 redisService.deleteObject("pvToken:" + username);
                 // 获取登录token
                 return R.ok(tokenService.createToken(userInfo));
-            }else{
-                return R.fail(HttpStatus.DATA_ERROR, "账号不正确，请重新输入");
-            }
             }
             // 查询用户信息
             XhpcAppUser user = xhpcAppUserMapper.getAppUserByPhone(username);
@@ -328,6 +329,9 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
             xhpcAppUserMapper.addUserLoginTime(user.getAppUserId(),username,userInfo.getUserType(),openid,Integer.valueOf(type),UserConstants.LOGIN,tenantId,new Date());
             // 获取登录token
             return R.ok(tokenService.createToken(userInfo));
+        }else{
+            return R.fail(HttpStatus.DATA_ERROR, "服务器繁忙，请稍后再试");
+        }
     }
 
     /**

xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml

@@ -8,108 +8,114 @@
 
     <select id="getAppUser" resultType="map">
         select
-               app_user_id as appUserId,
+            xau.app_user_id as appUserId,
-               phone as phone,
+            xau.phone as phone,
-               is_refund_application as isRefundApplication,
+            xau.is_refund_application as isRefundApplication,
-               is_refund as isRefund,
+            xau.is_refund as isRefund,
-               soc as socUser,
+            xau.soc as socUser,
-               balance as balance,
+            xau.balance as balance,
-               avatar as avatar,
+            xau.avatar as avatar,
-               status,
+            xau.status,
-               weixin_open_id as weixinOpenId,
+            xau.weixin_open_id as weixinOpenId,
-               alipay_open_id as alipayOpenId,
+            xau.alipay_open_id as alipayOpenId,
-               weixin_login as weixinLogin,
+            xau.weixin_login as weixinLogin,
-               alipay_login as alipayLogin,
+            xau.alipay_login as alipayLogin,
-               del_flag delFlag,
+            xau.del_flag delFlag,
             concat(0) as userType,
             concat("C") as userTypeName,
-               tenant_id tenantId,
+            xau.tenant_id tenantId,
-               soc_protect socProtect,
+            xau.soc_protect socProtect,
-               create_time as createTime
+            ten.status tenantStatus,
-        from xhpc_app_user
+            xau.create_time as createTime
-        where del_flag=0
+        from xhpc_app_user xau
+        left join xhpc_tenant ten on ten.tenant_id = xau.tenant_id and ten.is_deleted =0
+        where xau.del_flag=0
         <if test="phone !=null and phone !=''">
-            and phone =#{phone}
+            and xau.phone =#{phone}
         </if>
         <if test="userId !=null">
-            and app_user_id =#{userId}
+            and xau.app_user_id =#{userId}
         </if>
         <if test="tenantId !=null and tenantId !=''">
-            and tenant_id =#{tenantId}
+            and xau.tenant_id =#{tenantId}
         </if>
     </select>
 
     <select id="getCommunityUser" resultType="map">
         select
-            community_personnel_id as appUserId,
+            xcp.community_personnel_id as appUserId,
-            account as account,
+            xcp.account as account,
-            phone as phone,
+            xcp.phone as phone,
-            is_refund_application as isRefundApplication,
+            xcp.is_refund_application as isRefundApplication,
-            is_refund as isRefund,
+            xcp.is_refund as isRefund,
-            soc as socUser,
+            xcp.soc as socUser,
-            surplus_money as balance,
+            xcp.surplus_money as balance,
-            avatar as avatar,
+            xcp.avatar as avatar,
-            status,
+            xcp.status,
-            weixin_open_id as weixinOpenId,
+            xcp.weixin_open_id as weixinOpenId,
-            alipay_open_id as alipayOpenId,
+            xcp.alipay_open_id as alipayOpenId,
-            weixin_login as weixinLogin,
+            xcp.weixin_login as weixinLogin,
-            alipay_login as alipayLogin,
+            xcp.alipay_login as alipayLogin,
-            tenant_id tenantId,
+            xcp.tenant_id tenantId,
-            del_flag delFlag,
+            xcp.del_flag delFlag,
             concat(2) as userType,
-            soc_protect socProtect,
+            xcp.soc_protect socProtect,
+            ten.status tenantStatus,
             concat("ST") as userTypeName,
         <if test="serialNumber !=null and serialNumber !=''">
             (select count(charging_station_id) from xhpc_mechanism where community_id=mechanism_id and source=0 and charging_station_id in (select charging_station_id from xhpc_terminal where 1=1 and del_flag=0 and serial_number=#{serialNumber})) as number,
         </if>
-            create_time as createTime
+            xcp.create_time as createTime
-        from xhpc_community_personnel
+        from xhpc_community_personnel xcp
-        where del_flag=0
+        left join xhpc_tenant ten on ten.tenant_id = xcp.tenant_id and ten.is_deleted =0
+        where xcp.del_flag=0
         <if test="phone !=null and phone !=''">
-            and account =#{phone}
+            and xcp.account =#{phone}
         </if>
         <if test="userId !=null">
-            and community_personnel_id =#{userId}
+            and xcp.community_personnel_id =#{userId}
         </if>
         <if test="tenantId !=null and tenantId !=''">
-            and tenant_id =#{tenantId}
+            and xcp.tenant_id =#{tenantId}
         </if>
     </select>
 
     <select id="getCustomersUser" resultType="map">
         select
-            customers_personnel_id as appUserId,
+            xcp.customers_personnel_id as appUserId,
-            account as account,
+            xcp.account as account,
-            phone as phone,
+            xcp.phone as phone,
-            is_refund_application as isRefundApplication,
+            xcp.is_refund_application as isRefundApplication,
-            is_refund as isRefund,
+            xcp.is_refund as isRefund,
-            soc as socUser,
+            xcp.soc as socUser,
-            surplus_money as balance,
+            xcp.surplus_money as balance,
-            avatar as avatar,
+            xcp.avatar as avatar,
-            status,
+            xcp.status,
-            weixin_open_id as weixinOpenId,
+            xcp.weixin_open_id as weixinOpenId,
-            alipay_open_id as alipayOpenId,
+            xcp.alipay_open_id as alipayOpenId,
-            weixin_login as weixinLogin,
+            xcp.weixin_login as weixinLogin,
-            alipay_login as alipayLogin,
+            xcp.alipay_login as alipayLogin,
-            del_flag delFlag,
+            xcp.del_flag delFlag,
-            tenant_id tenantId,
+            xcp.tenant_id tenantId,
             concat(3) as userType,
-            soc_protect socProtect,
+            xcp.soc_protect socProtect,
+            ten.status tenantStatus,
             concat("BE") as userTypeName,
          <if test="serialNumber !=null and serialNumber !=''">
              (select count(charging_station_id) from xhpc_mechanism where customers_id=mechanism_id and source=1 and charging_station_id in (select charging_station_id from xhpc_terminal where 1=1 and del_flag=0 and serial_number=#{serialNumber})) as number,
          </if>
-            create_time as createTime
+            xcp.create_time as createTime
-        from xhpc_customers_personnel
+        from xhpc_customers_personnel xcp
-        where del_flag=0
+        left join xhpc_tenant ten on ten.tenant_id = xcp.tenant_id and ten.is_deleted =0
+        where xcp.del_flag=0
         <if test="phone !=null and phone !=''">
-            and account =#{phone}
+            and xcp.account =#{phone}
         </if>
         <if test="userId !=null">
-            and customers_personnel_id =#{userId}
+            and xcp.customers_personnel_id =#{userId}
         </if>
         <if test="tenantId !=null and tenantId !=''">
-            and tenant_id =#{tenantId}
+            and xcp.tenant_id =#{tenantId}
         </if>
     </select>
 </mapper>