Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !304

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QwFriendApiService.java

@@ -28,8 +28,11 @@ public interface QwFriendApiService {
     * @return
     * @throws
      */
-    public ServiceResponse<Map<String,String>> pendingIdCheck(String enterpriseId, String unionid, String openid, String wxaOpenid);
+    public ServiceResponse<Map<String,String>> pendingIdCheck(String enterpriseId, String unionid, String openid,  String wxaUnionid,String wxaOpenid);
+    
+    public ServiceResponse<Map<String,String>> pendingIdCheck(String enterpriseId);
 
+    
     /**
      * 
     * @Title: getPendingIdByUnionid
@@ -67,6 +70,15 @@ public interface QwFriendApiService {
      */
     public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
             List<String> externalUserIdList);
-
-    public ServiceResponse<Object> getTestTimes(String wxEnterpriseId) ;
+    
+    /**
+     * 
+    * @Title: getCallTimes
+    * @Description: 获取调用次数
+    * @author xugh
+    * @param wxEnterpriseId
+    * @return
+    * @throws
+     */
+    public ServiceResponse<Object> getCallTimes(String wxEnterpriseId) ;
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QwFriendApiServiceImpl.java

@@ -46,10 +46,14 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
     @Autowired
     private Config config;
     
+    @Override
+    public ServiceResponse<Map<String, String>> pendingIdCheck(String enterpriseId) {
+        return null;
+    }
 
     @Override
     public ServiceResponse<Map<String, String>> pendingIdCheck(String enterpriseId, String unionid, String openid,
-            String wxaOpenid) {
+           String wxaUnionid, String wxaOpenid) {
         ServiceResponse<WxEnterpriseQwDTO> corpidResp = this.checkAndGetCorpid(enterpriseId);
         if (!corpidResp.isSuccess()) {
             return ServiceResponse.failure(corpidResp.getCode(), corpidResp.getMessage());
@@ -78,7 +82,7 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
         retMap.put("wxCode", wxCode);
         sb.append("服务号-").append(result).append(",");
         ServiceResponse<PendingIdDTO> wxaResp = this.qywxExternalUserService.unionidToExternalUserid(corpid, suiteid,
-                unionid, wxaOpenid, subjectType);
+                wxaUnionid, wxaOpenid, subjectType);
         if (wxaResp.isSuccess()) {
             result = "ok";
         } else {
@@ -204,8 +208,8 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
     }
     
     @Override
-    public ServiceResponse<Object> getTestTimes(String wxEnterpriseId) {
-        return ServiceResponse.success(QwTimesUtils.getTestTimes(wxEnterpriseId));
+    public ServiceResponse<Object> getCallTimes(String wxEnterpriseId) {
+        return ServiceResponse.success(QwTimesUtils.getPendingTimes(wxEnterpriseId));
     }
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/QwTimesUtils.java

@@ -40,7 +40,7 @@ public class QwTimesUtils {
         QwTimesUtils.enterpriseService = enterpriseService;
     }
 
-    public static  Map<String,Object> getTestTimes(String wxEnterpriseId) {
+    public static  Map<String,Object> getPendingTimes(String wxEnterpriseId) {
         QwInterfaceLimitEnum qwInterface = QwInterfaceLimitEnum.GET_PENDING_ID ;
         Date now = new Date();
         String dateStr = getDateStr(now);
@@ -172,7 +172,7 @@ public class QwTimesUtils {
                     time = DateUtil.dateToStr(now, "yyyy年MM月");
                 }
                 if (type == 2) {
-                    DateUtil.dateToStr(now, "yyyy年MM月dd日");
+                    time = DateUtil.dateToStr(now, "yyyy年MM月dd日");
                 }
                 title = "即将达到可调用次数";
             }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -80,13 +80,13 @@ public class TestController extends WebBaseController {
     
     
     @RequestMapping("/pending-check")
-    public HaobanResponse pendingChec(String enterpriseId, String unionid,String openid,String wxaOpenid) {
-        return this.resultResponse(HaoBanErrCode.ERR_0,this.qwFriendApiService.pendingIdCheck(enterpriseId, unionid, openid, wxaOpenid));
+    public HaobanResponse pendingChec(String enterpriseId, String unionid,String openid,String wxaUnionid ,String wxaOpenid) {
+        return this.resultResponse(HaoBanErrCode.ERR_0,this.qwFriendApiService.pendingIdCheck(enterpriseId, unionid, openid, wxaUnionid,wxaOpenid));
     }
     
     @RequestMapping("/get-pending-times")
     public HaobanResponse getTestTimes(String wxEnterpriseId) {
-        return this.resultResponse(HaoBanErrCode.ERR_0,this.qwFriendApiService.getTestTimes(wxEnterpriseId));
+        return this.resultResponse(HaoBanErrCode.ERR_0,this.qwFriendApiService.getCallTimes(wxEnterpriseId));
     }
 
     @RequestMapping("/send-message-test")