修改银联退款接口 修改随手拍

lidongdong

2023-03-21 d389ae50010bc92e0d8b7ad97dda25798872db54

修改银联退款接口 修改随手拍

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

@@ -315,7 +315,7 @@
        log.error("花城洗车银联退款数据 ：" + r);
        if(r.getCode()==200)
        {
            UnionpayCarWash wash= JSONObject.parseObject(r.getData().toString(),UnionpayCarWash.class);
            UnionpayCarWash wash=(UnionpayCarWash) r.getData();
            if(wash!=null)
            {
                String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId());

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

@@ -192,14 +192,15 @@
            R r=communityService.carWashById(merOrderId);
            if(r.getCode()==200)
            {
                UnionpayCarWash unionpayCarWash= (UnionpayCarWash) r.getData();

                HashMap unionpayCarWash= (HashMap) r.getData();
                //调用uu洗车支付成功回调
                Map map=new HashMap();
                map.put("orderId",unionpayCarWash.getCarWashId());
                map.put("orderId",unionpayCarWash.get("carWashId"));
                HttpClientUtil.sendPostByJson("https://uu-api.imashuo.com/notify/wx/pzh-pay",JSONObject.toJSONString(map),
                        1,"appid","10000");
                log.error("花城洗车回调成功 ：" + queryEntiy.getMerOrderId()+" : 洗车号"
                        +unionpayCarWash.getUnionpayOrderId()+" : 银联号"+unionpayCarWash.getUnionpayOrderId());
                        +unionpayCarWash.get("carWashId")+" : 银联号"+unionpayCarWash.get("unionpayOrderId"));
            }

        }
@@ -238,10 +239,11 @@
                R r=communityService.queryById(desMap.get("orderId"));
                if(r.getCode()==200)
                {
                    UnionpayCarWash wash= (UnionpayCarWash) r.getData();
                    HashMap wash= (HashMap) r.getData();
                    if(wash!=null)
                    {
                        String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId());
                        String re=Refund.sendOrder(wash.get("money").toString(),
                                wash.get("unionpayOrderId").toString());
                        map.put("unionpay","退款成功");
                        log.error("花城洗车银联退款成功 ：" + re);
                    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java

@@ -20,6 +20,9 @@
    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("1 随手拍   2网格治理")
    private String addType;

    @ApiModelProperty(value = "分页每页数量", example = "10")
    private Long pageSize = 10L;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -203,6 +203,9 @@
    @ApiModelProperty(value = "随手拍分类名称")
    private String classifyName;

    @ApiModelProperty(value = "1 随手拍    2网格治理")
    private String addType;

    /**
     * 是否上报城管 0未上报 1已上报 2已退回
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoClassifyVO.java

@@ -20,4 +20,7 @@
    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("1 随手拍   2网格治理")
    private String addType;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java

@@ -2,6 +2,8 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.wx.UnionpayCarWash;
import com.panzhihua.common.service.community.CommunityService;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
@@ -25,6 +27,9 @@
    @Resource
    private ComOpsAdvService comOpsAdvService;

    @Resource
    private CommunityService communityService;

    /**
     * 获取广告跳转内容配置
     *

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java

@@ -46,6 +46,12 @@
    @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED)
    private String remark;


    /**
     * 1 随手拍   2网格治理
     */
    private String addType;

    /**
     * 创建时间
     */

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -35,6 +35,11 @@
    private Long sponsorId;

    /**
     * 1 随手拍    2网格治理
     */
    private String addType;

    /**
     * 发生地址
     */
    private String happenAddr;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoClassifyDOMapper.xml

@@ -11,15 +11,17 @@
        <result column="remark" property="remark" />
        <result column="create_at" property="createAt" />
        <result column="update_at" property="updateAt" />
        <result column="add_type" property="addType" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, status, weight, remark, create_at, update_at
        id, name, status, weight, remark, create_at, update_at,add_type
    </sql>

    <select id="getPhotoClassifyPage" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO">
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify
        select id,`name`,`status`,weight,remark,create_at,update_at,add_type
        from com_act_easy_photo_classify
        <where>
            <if test="photoClassifyDTO.name != null and photoClassifyDTO.name != &quot;&quot;">
                and `name` like concat (#{photoClassifyDTO.name},'%')
@@ -27,12 +29,17 @@
            <if test="photoClassifyDTO.areaCode != null and photoClassifyDTO.areaCode != &quot;&quot;">
                and area_code = #{photoClassifyDTO.areaCode}
            </if>
            <if test="photoClassifyDTO.addType != null and photoClassifyDTO.addType != &quot;&quot;">
                and `add_type` = #{photoClassifyDTO.addType}
            </if>
        </where>
        order by create_at desc
    </select>

    <select id="getPhotoClassifyList" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO">
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify where area_code = #{areaCode}
        select id,`name`,`status`,weight,remark,create_at,update_at,add_type
        from com_act_easy_photo_classify
        where area_code = #{areaCode}
        order by create_at desc
    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -31,6 +31,7 @@
        <result column="activity_id" property="activityId" />
        <result column="img_width" property="imgWidth" />
        <result column="img_height" property="imgHeight" />
        <result column="add_type" property="addType" />
    </resultMap>

    <!-- 通用查询结果列 -->
@@ -38,7 +39,7 @@
        id, sponsor_id, happen_addr, addr_remark, status, handler_id, create_at, examine_at, detail, photo_path_list
        , handle_result, handle_photo_list, community_id, is_hide, is_need_feed_back, feedback_at, reject_reason
        , del_tag, is_report, is_publicity, handle_status, lng_lat, activity_type, activity_amount, activity_id
        , img_width, img_height
        , img_width, img_height,add_type
    </sql>

    <select id="pageEasyPhotoAdmin" parameterType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO"
@@ -70,6 +71,7 @@
            c.name  communityName,
            p.urban_status,
            p.transfer_reason,
            p.add_type,
        p.handle_status
        FROM
            com_act_easy_photo p
@@ -186,6 +188,7 @@
            c.name  communityName,
            p.is_report_urban,
            p.urban_status,
            p.add_type,
            ca.`name` as photoType
        FROM
            com_act_easy_photo p
@@ -245,6 +248,7 @@
        p.is_report_urban,
        p.is_report_dpc,
        p.urban_status,
        p.add_type,
        ca.`name` as photoType
        FROM
        com_act_easy_photo p
@@ -519,6 +523,7 @@
        p.img_width,
        p.img_height,
        p.examine_at,
        p.add_type,
        f.id AS fid,
        p.handle_status
        FROM
@@ -531,6 +536,9 @@
        <if test = 'comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0' >
            AND p.community_id = ${comActEasyPhotoVO.communityId}
        </if>
        <if test="comActEasyPhotoVO.addType != null and comActEasyPhotoVO.addType != ''">
            AND p.add_type=${comActEasyPhotoVO.addType}
        </if>
        <if test = 'comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >
            AND p.`status` = #{comActEasyPhotoVO.status}
        </if>