Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 3037883fd9f3e31bc508b033ba692fe279d65fb6

Merge branch 'local_20221010' into haucheng_panzhihua

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java

@@ -54,7 +54,7 @@

    @PostMapping("wxNotify")
    public void payCallback(HttpServletRequest request, HttpServletResponse response) {
        log.info("微信支付回调start");
        log.error("微信支付回调start");
        String inputLine = "";
        String notityXml = "";
        try {
@@ -63,7 +63,7 @@
            }
            // 关闭流
            request.getReader().close();
            log.info("微信回调内容信息：" + notityXml);
            log.error("微信回调内容信息：" + notityXml);
            // 解析成Json
            org.json.JSONObject xmlJson = XML.toJSONObject(notityXml);
            if (StringUtils.isNotEmpty(xmlJson.toString())) {
@@ -161,10 +161,12 @@
    @PostMapping("/uuRepay")
    public R uuRepay(@RequestBody String aesString){
        try {
            log.error("uuRepay接口调用 ---> start");
            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);
            Map map=umfPayUtil.repay(desMap.get("orderId"),desMap.get("merdate"), DateUtils.getDateFormatString(new Date(),"yyMMddHHmmss")+"0001",desMap.get("refundAmount"),desMap.get("orgAmount"));
            log.error("uuRepay接口调用 ---> end 订单号："+desMap.get("orderId"));
            return R.ok(map);
        } catch (Exception e) {
            e.printStackTrace();
@@ -176,10 +178,12 @@
    @PostMapping("/uuPush")
    public R uuPush(@RequestBody String aesString){
        try {
            log.error("uu洗车推送 ---> start");
            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("推送失败");
@@ -190,6 +194,7 @@
    @PostMapping("/wsPush")
    public R wsPush(@RequestBody String aesString){
        try {
            log.error("ws洗车推送 ---> start");
            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);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysOperLogDAO.xml

@@ -28,7 +28,7 @@


    <select id="pageOperLog" resultType="com.panzhihua.common.model.vos.user.SysOperLogVO">
select * from sys_oper_log where community_id = #{sysOperLogVO.communityId} <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if> order by oper_time desc
        select * from sys_oper_log where 1=1 <if test="sysOperLogVO.communityId != null">and community_id = #{sysOperLogVO.communityId}</if> <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if> order by oper_time desc
    </select>