101captain
2022-07-11 e7ff00a506c9290dcd75c5e087cae0efbf6fa5c1
导出不带截图接口
7个文件已修改
88 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
@@ -13,6 +13,7 @@
import com.panzhihua.applets.umf.MyAESUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.umf.api.service.UmfService;
@@ -48,6 +49,8 @@
    private UmfPayUtil umfPayUtil;
    @Value("${umf.file}")
    private String file;
    @Resource
    private UserService userService;
    @PostMapping("wxNotify")
    public void payCallback(HttpServletRequest request, HttpServletResponse response) {
@@ -169,4 +172,18 @@
        }
    }
    @ApiOperation("uu洗车推送")
    @PostMapping("/uuPush")
    public R uuPush(@RequestBody String aesString){
        try {
            Map<String, String> aesMap= (Map<String, String>) JSON.parse(aesString);
            String desString=MyAESUtil.Decrypt(aesMap.get("aesString"),"Ryo7M3n8loC5Abcd");
            Map<String,String> desMap= (Map) JSON.parse(desString);
            return userService.uuPush(desMap.get("washer_mobile"),desMap.get("phone"),desMap.get("washer_name"),Integer.parseInt(desMap.get("order_status")));
        } catch (Exception e) {
            e.printStackTrace();
            return R.fail("推送失败");
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1232,4 +1232,15 @@
    @GetMapping("/indexData")
    R newIndexData(@RequestParam(value = "type",required = false) Integer type,
                   @RequestParam(value = "type",required = false) Long streetId);
    /**
     * uu洗车推送
     * @param washPhone
     * @param phone
     * @param washName
     * @param orderStatus
     * @return
     */
    @GetMapping("/uuPush")
    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
@@ -455,16 +455,26 @@
            log.error("危险人员订阅消息推送失败,失败原因:" + e.getMessage());
        }
    }
    public static void sendUuWash(String openId, String accessToken, String status,String washerName,String washerMobile,String templateId){
    /**
     * uu洗车订单状态更改
     * @param openId
     * @param accessToken
     * @param status
     * @param washerName
     * @param washerMobile
     * @param phone
     * @param templateId
     */
    public static void sendUuWash(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(templateId);
        subscribeDTO.setPage("packageD/pages/washer/order/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("phrase6", "订单状态:"+status));
        paras.add(new TemplateParam("thing9", washerName));
        paras.add(new TemplateParam("thing1","车美信息"));
        paras.add(new TemplateParam("thing4", "社区报备数据统计"));
        paras.add(new TemplateParam("thing4", "订单状态:"+status));
        paras.add(new TemplateParam("thing3", washerName));
        paras.add(new TemplateParam("thing6",washerMobile));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1375,8 +1375,17 @@
    public R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword){
        return userService.checkExport(account,password,oldPassword);
    }
    /**
     * uu洗车推送
     * @param washPhone
     * @param phone
     * @param washName
     * @param orderStatus
     * @return
     */
    @GetMapping("/uuPush")
    public R uuPush(@RequestParam("phone")String phone,@RequestParam("orderStatus")Integer orderStatus){
        return userService.uuPush(phone,orderStatus);
    public R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus){
        return userService.uuPush(washPhone,phone,washName,orderStatus);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -862,5 +862,5 @@
     * @param orderStatus
     * @return
     */
    R uuPush(@RequestParam("phone")String phone,@RequestParam("orderStatus")Integer orderStatus);
    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3394,14 +3394,30 @@
    }
    @Override
    public R uuPush(String phone, Integer orderStatus) {
    public R uuPush(String washPhone,String phone,String washName,Integer orderStatus) {
        if(StringUtils.isNotEmpty(phone)){
            SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone).orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
            if(sysUserDO!=null&&StringUtils.isNotEmpty(sysUserDO.getOpenid())){
                WxUtil
                String status="";
                switch (orderStatus){
                    case 2 : status="等待分配车美";break;
                    case 3 : status="已分配车美";break;
                    case 4 : status="车美已开始服务";break;
                    case 5 : status="车美已结束服务";break;
                    case 6 : status="订单确认完成";break;
                    case 9 : status="订单已取消";break;
                }
                WxXCXTempSend util = new WxXCXTempSend();
                try {
                    String accessToken = util.getAccessToken();
                    WxUtil.sendUuWash(sysUserDO.getOpenid(),accessToken,status,washName,washPhone,phone,"Eft5ksvsnOQANy2uNOGY43CC3pb33eDGA_lgCEoxuiw");
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }
        return null;
        return R.ok();
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -89,6 +89,7 @@
        boolean wxPay = requestURI.contains("wxNotify");
        boolean kaphtcha = requestURI.contains("kaphtcha");
        boolean uuRepay = requestURI.contains("uuRepay");
        boolean uuPush = requestURI.contains("uuPush");
        boolean wxCgi = requestURI.contains("cgi");
        boolean isShop = requestURI.contains("isShop");
        boolean noToken = requestURI.contains("noToken");
@@ -102,7 +103,7 @@
        SafeboxRequestWrapper safeboxRequestWrapper = new SafeboxRequestWrapper(request);
        if (login || doc || css || js || ui || swagger || ico || docs || error || refreshToken || useragreement || wxPay
        // ||wxCgi||isShop||listadvertisement||noToken||bigscreen) {
            || wxCgi || isShop || listadvertisement || noToken||uuRepay||kaphtcha) {
            || wxCgi || isShop || listadvertisement || noToken||uuRepay||kaphtcha||uuPush) {
            // 什么也不做
        } else {
            // 获取请求头中JWT的Token