获取电话号码

nbjk-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -7,6 +7,9 @@ import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.StringUtils;
 import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.user.vo.UserVipInfoVO;
+import com.miaxis.wx.dto.WxGetPhoneDTO;
+import com.miaxis.wx.service.IWxLocalService;
+import com.miaxis.wx.service.IWxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,8 @@ import java.security.PrivateKey;
 import java.security.Signature;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 【用户】Controller
@@ -34,6 +39,13 @@ public class UserInfoController extends BaseController{
     @Autowired
     private IUserInfoService userInfoService;
 
+    @Autowired
+    private IWxLocalService wxLocalService;
+
+    @Autowired
+    private IWxService wxService;
+
+
     private String  rsaPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMLNHTgsyYOXDJVF8r4qCyb+8Uw4" +
             "XKq8aThAhUIaPYIop+HJxETGbXk3e0o46i4iOX8RTv0i3jmhL6W0mSxy9ismfXPP7VtKgEt6VnMm" +
             "ufsrQ2kcXyRsKmuwUd3rTH5gniXwLdIPF8V5ujiSq94nPHok1krDMWbss8Q7lcH2kQFHAgMBAAEC" +
@@ -84,6 +96,16 @@ public class UserInfoController extends BaseController{
     }
 
 
+    //根据code获取手机号
+    @GetMapping(value = "/getPhoneByCode")
+    @ApiOperation("根据code获取手机号")
+    public Response getPhoneByCode(String code)  {
+        String accsesToken = wxLocalService.getLocalXcxToken();
+        WxGetPhoneDTO wxGetPhoneDTO = new WxGetPhoneDTO();
+        wxGetPhoneDTO.setCode(code);
+        String phoneNumber = wxService.getUserPhoneNumber(accsesToken,wxGetPhoneDTO);
+        return Response.success(phoneNumber);
+    }
 
 
 

nbjk-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -77,11 +77,11 @@ public class WxController extends BaseController {
     private IVipUserExamService vipUserExamService;
 
 
-    @Value("${xcx.appid}")
-    private String xcxAppid;
+    @Value("${xcx.appId}")
+    private String xcxAppId;
 
-    @Value("${app.appid}")
-    private String appid;
+    @Value("${app.appId}")
+    private String appId;
 
     @Value("${wxpay.notifyUrl}")
     private  String notifyUrl ;
@@ -129,7 +129,7 @@ public class WxController extends BaseController {
         ObjectMapper objectMapper = new ObjectMapper();
         ObjectNode rootNode = objectMapper.createObjectNode();
         rootNode.put("mchid",wxpayConfig.getMerchantId())
-                .put("appid", appid)
+                .put("appid", appId)
                 .put("description", goodsName)
                 .put("notify_url", notifyUrl)
                 .put("out_trade_no", order.getOutTradeNo());
@@ -154,7 +154,7 @@ public class WxController extends BaseController {
      */
     private WxParamEntity getWxAppParamJson(String bodyAsString) throws Exception {
         WxParamEntity wxParamEntity = new WxParamEntity();
-        wxParamEntity.setAppId(appid);
+        wxParamEntity.setAppId(appId);
         wxParamEntity.setPartnerId(wxpayConfig.getMerchantId());
         String  prepayId = JSONObject.parseObject(bodyAsString).getString("prepay_id");
         wxParamEntity.setPrepayId(prepayId);
@@ -165,7 +165,7 @@ public class WxController extends BaseController {
         wxParamEntity.setTimeStamp(timestamp);
 
         StringBuffer sb = new StringBuffer();
-        sb.append(appid + "\n");
+        sb.append(appId + "\n");
         sb.append(timestamp + "\n");
         sb.append(nonce_str + "\n");
         sb.append(prepayId+ "\n");
@@ -252,7 +252,7 @@ public class WxController extends BaseController {
         ObjectMapper objectMapper = new ObjectMapper();
         ObjectNode rootNode = objectMapper.createObjectNode();
         rootNode.put("mchid",wxpayConfig.getMerchantId())
-                .put("appid", xcxAppid)
+                .put("appid", xcxAppId)
                 .put("description", goodsName)
                 .put("notify_url", notifyUrl)
                 .put("out_trade_no", order.getOutTradeNo());
@@ -287,7 +287,7 @@ public class WxController extends BaseController {
         jsonObject.put("timeStamp",String.valueOf(timestamp));
         jsonObject.put("signType","RSA");
         StringBuffer sb = new StringBuffer();
-        sb.append(xcxAppid + "\n");
+        sb.append(xcxAppId + "\n");
         sb.append(timestamp + "\n");
         sb.append(nonce_str + "\n");
         sb.append(packageStr+ "\n");
@@ -303,7 +303,7 @@ public class WxController extends BaseController {
         byte[] signedData = signature.sign();
         String base64Str =  Base64.getEncoder().encodeToString(signedData);
         jsonObject.put("paySign",base64Str);
-        jsonObject.put("appId",appid);
+        jsonObject.put("appId", appId);
         return jsonObject;
     }
 

nbjk-admin/src/main/java/com/miaxis/gzh/controller/WxMenuController.java

@@ -1,97 +0,0 @@
-package com.miaxis.gzh.controller;
-
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.wx.service.IWxMenuService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/11/3 9:18
- */
-@RestController
-@RequestMapping("/pc/menu")
-@Api(tags={"【H5-微信公众号菜单】"})
-@AllArgsConstructor
-public class WxMenuController extends BaseController {
-
-    private final IWxMenuService wxMenuService;
-
-
-//    /**
-//     * 查询微信公众号菜单列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('menu:info:list')")
-//    @GetMapping("/list")
-//    @ApiOperation("查询微信公众号菜单列表")
-//    public Response<List<WxMenuVo>> list(){
-//        return wxMenuService.selectWxMenuTreeList();
-//    }
-//
-//
-//    /**
-//     * 获取微信公众号菜单详细信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('menu:info:query')")
-//    @GetMapping(value = "/{id}")
-//    @ApiOperation("获取微信公众号菜单详细信息")
-//    public Response<WxMenu> getInfo(
-//            @ApiParam(name = "id", value = "微信公众号菜单参数", required = true)
-//            @PathVariable("id") Long id
-//    ){
-//        return Response.success(wxMenuService.getById(id));
-//    }
-//
-//    /**
-//     * 新增微信公众号菜单
-//     */
-//    @PreAuthorize("@ss.hasPermi('menu:info:add')")
-//    @Log(title = "微信公众号菜单", businessType = BusinessTypeEnum.INSERT)
-//    @PostMapping
-//    @ApiOperation("新增微信公众号菜单")
-//    public Response add(@RequestBody WxMenu wxMenu){
-//        return wxMenuService.saveMenu(wxMenu);
-//    }
-//
-//    /**
-//     * 修改微信公众号菜单
-//     */
-//    @PreAuthorize("@ss.hasPermi('menu:info:edit')")
-//    @Log(title = "微信公众号菜单", businessType = BusinessTypeEnum.UPDATE)
-//    @PutMapping
-//    @ApiOperation("修改微信公众号菜单")
-//    public Response edit(@RequestBody WxMenu wxMenu){
-//        return wxMenuService.updateMenuById(wxMenu);
-//    }
-//
-//    /**
-//     * 删除微信公众号菜单
-//     */
-//    @PreAuthorize("@ss.hasPermi('menu:info:remove')")
-//    @Log(title = "微信公众号菜单", businessType = BusinessTypeEnum.DELETE)
-//    @DeleteMapping("/{ids}")
-//    @ApiOperation("删除微信公众号菜单")
-//    public  Response remove(
-//            @ApiParam(name = "ids", value = "微信公众号菜单ids参数", required = true)
-//            @PathVariable Long[] ids
-//    ){
-//        return wxMenuService.removeMenuByIds(ids);
-//    }
-
-    /**
-     * 一键更新公众号菜单
-     */
-    @GetMapping("/sendMenu")
-    @ApiOperation("一键更新公众号菜单--手动修改数据库操作")
-    public Response sendMenu(){
-        return wxMenuService.sendMenuBySql();
-    }
-
-
-}

nbjk-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -23,7 +23,7 @@ import com.miaxis.system.dto.system.TokenDTO;
 import com.miaxis.system.dto.system.UserInfoDTO;
 import com.miaxis.system.service.ISysMenuService;
 import com.miaxis.user.service.IUserInfoService;
-import com.miaxis.wx.service.WxService;
+import com.miaxis.wx.service.IWxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -66,7 +66,7 @@ public class SysLoginController
 
 
     @Autowired
-    private WxService wxService;
+    private IWxService wxService;
 
 
     @Autowired

nbjk-admin/src/test/java/com/miaxis/test/WxGzhTest.java

@@ -3,7 +3,7 @@ package com.miaxis.test;
 import com.miaxis.NbjkApplication;
 import com.miaxis.wx.dto.WxMaterialList;
 import com.miaxis.wx.service.IWxGzhService;
-import com.miaxis.wx.service.WxService;
+import com.miaxis.wx.service.IWxService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@ public class WxGzhTest {
     @Autowired
     private IWxGzhService wxGzhServicee;
     @Autowired
-    private WxService wxService;
+    private IWxService wxService;
 
     @Test
     public void getUserInfo() throws IOException {

nbjk-common/src/main/java/com/miaxis/common/constant/Constants.java

@@ -57,18 +57,9 @@ public class Constants
      */
     public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
 
-    /**
-     * 登录短信验证码 redis key
-     */
-    public static final String SMS_LOGIN_CODE = "sms:login:code:";
-    /**
-     * 登录短信验证码次数 redis key
-     */
-    public static final String SMS_LOGIN_CODE_COUNT = "sms:login:code:count:";
-
 
     /**
-     * app消息推送 token
+     * 小程序消息推送 token
      */
     public static final String XCX_MESSAGE_TOKEN = "xcx:message:token:";
 

nbjk-service/src/main/java/com/miaxis/wx/dto/WxGetPhoneDTO.java

@@ -0,0 +1,11 @@
+package com.miaxis.wx.dto;
+
+import lombok.Data;
+
+@Data
+public class WxGetPhoneDTO {
+
+
+    private String code;    // 前端的code
+
+}

nbjk-service/src/main/java/com/miaxis/wx/service/IWxLocalService.java

@@ -0,0 +1,11 @@
+package com.miaxis.wx.service;
+
+/**
+ *
+ * 微信本地接口
+ */
+public interface IWxLocalService {
+
+    String getLocalXcxToken();
+
+}

nbjk-service/src/main/java/com/miaxis/wx/service/IWxMenuService.java

@@ -1,53 +0,0 @@
-package com.miaxis.wx.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.wx.domain.WxMenu;
-import com.miaxis.wx.vo.WxMenuVo;
-
-import java.util.List;
-
-/**
- * 微信公众号菜单Service接口
- * @author wwl
- * @version 1.0
- * @date 2021/11/3 9:23
- */
-public interface IWxMenuService extends IService<WxMenu> {
-
-    /**
-     * 查询微信公众号菜单列表
-     *
-     * @return 微信公众号菜单集合
-     */
-    Response<List<WxMenuVo>> selectWxMenuTreeList();
-
-    /**
-     * 新增微信公众号菜单
-     * @param wxMenu
-     * @return
-     */
-    Response saveMenu(WxMenu wxMenu);
-
-
-    /**
-     * 修改微信公众号菜单
-     * @param wxMenu
-     * @return
-     */
-    Response updateMenuById(WxMenu wxMenu);
-
-    /**
-     * 删除微信公众号菜单
-     * @param ids
-     * @return
-     */
-    Response removeMenuByIds(Long[] ids);
-
-    /**
-     * 一键发送数据库菜单
-     * @return
-     */
-    Response sendMenuBySql();
-
-}

nbjk-service/src/main/java/com/miaxis/wx/service/IWxOrderService.java

@@ -14,10 +14,8 @@ public interface IWxOrderService extends IService<WxOrder>{
 
     WxOrder getByOutTradeNo(String outTradeNo);
 
-    List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO);
 
     String wxwithdrawal(Integer amount) throws Exception;
 
     String wxwithbankdrawal(WxExtractBankDTO amount) throws Exception;
-    List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
 }

nbjk-service/src/main/java/com/miaxis/wx/service/WxService.java → nbjk-service/src/main/java/com/miaxis/wx/service/IWxService.java

@@ -2,6 +2,7 @@ package com.miaxis.wx.service;
 
 
 import com.miaxis.common.config.FeignConfig;
+import com.miaxis.wx.dto.WxGetPhoneDTO;
 import com.miaxis.wx.dto.WxMaterial;
 import com.miaxis.wx.dto.WxMaterialList;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Map;
+
 /**
  *
  * 微信接口
@@ -17,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(name="wxService",
         url = "https://api.weixin.qq.com",configuration = FeignConfig.class)
 @Component
-public interface WxService {
+public interface IWxService {
     /**
      *  获取openid
      * @param appid
@@ -55,6 +58,18 @@ public interface WxService {
             @RequestParam("secret") String secret
     );
 
+    /**
+     * 获取手机号 (小程序)
+     * @param access_token
+     * @param wxGetPhoneDTO
+     * @return
+     */
+    @PostMapping(value = "/wxa/business/getuserphonenumber")
+    String getUserPhoneNumber(
+            @RequestParam("access_token") String access_token,
+            WxGetPhoneDTO wxGetPhoneDTO
+    );
+
 
     /**
      *  小程序获取openid

nbjk-service/src/main/java/com/miaxis/wx/service/impl/WxGzhServiceImpl.java

@@ -13,14 +13,12 @@ import com.miaxis.feign.service.IWxSendService;
 import com.miaxis.system.service.ISysDictTypeService;
 import com.miaxis.system.service.ISysUserService;
 import com.miaxis.user.service.IUserInfoService;
-import com.miaxis.wx.domain.WxForeverCode;
 import com.miaxis.wx.service.IWxGzhService;
 import com.miaxis.wx.service.IWxMessageEvenService;
-import com.miaxis.wx.service.WxService;
+import com.miaxis.wx.service.IWxService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -53,7 +51,7 @@ public class WxGzhServiceImpl implements IWxGzhService {
 
     private final IWxMessageEvenService wxMessageEvenService;
 
-    private final WxService wxService;
+    private final IWxService wxService;
 
     private final ISysDictTypeService dictTypeService;
 
@@ -142,23 +140,7 @@ public class WxGzhServiceImpl implements IWxGzhService {
                         break;
                     }
                 }
-                //推荐码生成
-//                if (parentUnionId!= null){
-//                    String unionId = userInfoJson.getString("unionid");
-//                    UserInfo user = userService.getStudentByUnionid(unionId);
-//                    //如果推荐码为空，则生成一个
-//                    if (user.getRecommendCode()== null){
-//                        String code = null ;
-//                        do {
-//                            code  = getRandomString(4);
-//                        }while (isRepeat(code));
-//                        user.setRecommendCode(code);
-//                        user.setParentUnionId(parentUnionId);
-//                        userInfoService.updateById(user);
-//                    }
-//                    messageCustomSend(fromUserName,this.getGzhToken(),"您的推荐码是：↓↓↓");
-//                    return MessageUtil.initText(fromUserName, toUserName, user.getRecommendCode());
-//                }
+
 
 
             } else if (MessageUtil.MESSAGE_IMAGE.equals(msgType)) { // 图片消息

nbjk-service/src/main/java/com/miaxis/wx/service/impl/WxLocalServiceImpl.java

@@ -0,0 +1,51 @@
+package com.miaxis.wx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.redis.RedisCache;
+import com.miaxis.wx.service.IWxLocalService;
+import com.miaxis.wx.service.IWxService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class WxLocalServiceImpl implements IWxLocalService {
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @Autowired
+    private IWxService wxService;
+
+    @Value("${xcx.appId}")
+    private String xcxAppId;
+
+    @Value("${xcx.appSecret}")
+    private String appSecret;
+
+    @Override
+    public String getLocalXcxToken() {
+        Object cacheXcxToken= redisCache.getCacheObject(Constants.XCX_MESSAGE_TOKEN);
+        //如果过期，重新获取并保存到redis
+        if (cacheXcxToken == null){
+            String result = wxService.getXcxToken("client_credential",xcxAppId,appSecret);
+            JSONObject json = JSONObject.parseObject(result);
+            String token = json.getString("access_token");
+            int expiresIn = json.getIntValue("expires_in")-1800;
+            redisCache.setCacheObject(Constants.XCX_MESSAGE_TOKEN,token,expiresIn, TimeUnit.SECONDS);
+            return token;
+        }else {
+            String token = String.valueOf(cacheXcxToken);
+            return token;
+        }
+    }
+
+
+}

nbjk-service/src/main/java/com/miaxis/wx/service/impl/WxMenuServiceImpl.java

@@ -1,208 +0,0 @@
-package com.miaxis.wx.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.sign.VerifyUtil;
-import com.miaxis.feign.service.IWxSendService;
-import com.miaxis.wx.domain.WxMenu;
-import com.miaxis.wx.mapper.WxMenuMapper;
-import com.miaxis.wx.service.IWxGzhService;
-import com.miaxis.wx.service.IWxMenuService;
-import com.miaxis.wx.vo.WxMenuVo;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 微信公众号菜单Service业务层处理
- * @author wwl
- * @version 1.0
- * @date 2021/11/3 9:24
- */
-@Service
-@AllArgsConstructor
-@Slf4j
-public class WxMenuServiceImpl extends ServiceImpl<WxMenuMapper, WxMenu> implements IWxMenuService {
-
-    private final WxMenuMapper wxMenuMapper;
-
-    private final IWxGzhService wxGzhService;
-
-    private final IWxSendService wxSendService;
-
-    /**
-     * 查询微信公众号菜单列表
-     *
-     * @return 微信公众号菜单
-     */
-    @Override
-    public Response<List<WxMenuVo>> selectWxMenuTreeList(){
-        List<WxMenuVo> menuList = wxMenuMapper.selectWxMenuList();
-        return Response.success(builTree(menuList));
-    }
-
-    //建立树形结构
-    public List<WxMenuVo> builTree(List<WxMenuVo> menuList){
-        List<WxMenuVo> infoVos =new ArrayList<>();
-        //获取根节点
-        List<WxMenuVo> rootMenuLists =new  ArrayList<>();
-        for(WxMenuVo menuVo : menuList) {
-            if(menuVo.getParentId().toString().equals("0")) {
-                rootMenuLists.add(menuVo);
-            }
-        }
-        for(WxMenuVo wxMenuVo : rootMenuLists) {
-            wxMenuVo=getTree(wxMenuVo,menuList);
-            infoVos.add(wxMenuVo);
-        }
-        return infoVos;
-    }
-    //递归，建立子树形结构
-    private WxMenuVo getTree(WxMenuVo wxMenuVo,List<WxMenuVo> menuList){
-        List<WxMenuVo> infoVos = new ArrayList<>();
-        for (WxMenuVo menuVo : menuList) {
-            if (menuVo.getParentId().toString().equals(wxMenuVo.getId().toString())){
-                infoVos.add(getTree(menuVo,menuList));
-            }
-        }
-        wxMenuVo.setChildren(infoVos);
-        return wxMenuVo;
-    }
-
-
-    /**
-     * 新增微信公众号菜单
-     * @param wxMenu
-     * @return
-     */
-    @Override
-    public Response saveMenu(WxMenu wxMenu) {
-        try {
-            wxMenuMapper.insert(wxMenu);
-            sendMenu();
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-    /**
-     * 修改微信公众号菜单
-     * @param wxMenu
-     * @return
-     */
-    @Override
-    public Response updateMenuById(WxMenu wxMenu) {
-        try {
-            wxMenuMapper.updateById(wxMenu);
-            sendMenu();
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-    /**
-     * 删除微信公众号菜单
-     * @param ids
-     * @return
-     */
-    @Override
-    public Response removeMenuByIds(Long[] ids) {
-        try {
-            this.removeByIds(Arrays.asList(ids));
-            sendMenu();
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-    /**
-     * 一键发送数据库菜单
-     * @return
-     */
-    @Override
-    public Response sendMenuBySql() {
-        sendMenu();
-        return Response.success();
-    }
-
-
-    /**
-     * 发送菜单至微信
-     * @return
-     */
-    private String sendMenu(){
-        JSONObject wxMenuJson = getWxMenuJson();
-        String token = wxGzhService.getGzhToken();
-        System.out.println(wxMenuJson.toString());
-        String result = wxSendService.createMenu(token,wxMenuJson);
-        log.info("-----sendMenu-----"+ result);
-        return result;
-    }
-
-
-    /**
-     * 查询微信菜单数据
-     * @return
-     */
-    private JSONObject getWxMenuJson() {
-
-        JSONObject menuJson = new JSONObject();
-        //获取父类
-        List<WxMenu> menuList = wxMenuMapper.selectByMap(new HashMap<String,Object>(){{
-            put("parent_id",0);
-        }});
-        JSONArray button=new JSONArray();
-        for(WxMenu menu : menuList){
-            if(!VerifyUtil.verifyString(menu.getType())){
-                JSONObject childButton = new JSONObject();
-                childButton.put("name", menu.getMenuName());
-                //父类
-                JSONArray sub_button = new JSONArray();
-                List<WxMenu> childMenuList = wxMenuMapper.selectList(new QueryWrapper<WxMenu>().eq("parent_id", menu.getId()).orderByAsc("sort"));
-
-                for (WxMenu childMenu : childMenuList) {
-                    sub_button.add(getChildMenuJson(childMenu));
-                }
-                childButton.put("sub_button", sub_button);
-                button.add(childButton);
-            }else{
-                button.add(getChildMenuJson(menu));
-            }
-        }
-
-        menuJson.put("button", button);
-        return menuJson;
-    }
-
-
-    private JSONObject getChildMenuJson(WxMenu menu){
-        JSONObject menuJson = new JSONObject();
-        menuJson.put("type", menu.getType());
-        menuJson.put("name", menu.getMenuName());
-        if(menu.getType().equals("view")){
-            menuJson.put("url", menu.getUrl());
-        }else if(menu.getType().equals("click")){
-            menuJson.put("key", menu.getClickKey());
-        }else if(menu.getType().equals("miniprogram")){
-            menuJson.put("url", menu.getUrl());
-            menuJson.put("key", menu.getClickKey());
-            menuJson.put("appid", menu.getAppid());
-            menuJson.put("pagepath", menu.getPagePath());
-        }
-        return menuJson;
-    }
-
-
-}

nbjk-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -81,15 +81,6 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         return wxOrderMapper.getByOutTradeNo(outTradeNo);
     }
 
-    @Override
-    public List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO) {
-        return wxOrderMapper.selectPcOrderList(pcWxOrderListDTO);
-    }
-
-    @Override
-    public List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto) {
-        return wxOrderMapper.QuerySchoolOrderList(dto);
-    }
 
     @Override
     @Transactional