lidongdong
2023-08-29 8e56935ad35ad5418cc6ae7efd3b5828f23fd5cc
修改积分兑换订单列表报错
8个文件已修改
32 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCreditsExchangeDao.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCreditsExchangeService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -92,7 +92,7 @@
                     @RequestParam(value = "userName", required = false) String userName)
    {
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,null,getLoginUserInfo().getUserId()+"");
                condition,userName,null,getLoginUserInfo().getUserId()+"","1");
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11540,7 +11540,8 @@
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "userId", required = false) String userId);
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "orderType", required = true) String orderType);
    /**
     * 查询详情
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -95,7 +95,7 @@
     * @param
     * @return
     */
    @GetMapping("order/getList")
    @GetMapping("/order/getList")
    public R getList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize")  int pageSize,
                     @RequestParam(value = "goodsId", required = false) String goodsId,
@@ -105,7 +105,7 @@
                     @RequestParam(value = "userName", required = false) String userName)
    {
        return merchantService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,getCommunityId()+"",null);
                condition,userName,getCommunityId()+"",null,"1");
    }
    /**
@@ -113,7 +113,7 @@
     * @param id
     * @return
     */
    @GetMapping("order/getData")
    @GetMapping("/order/getData")
    public R getData(@RequestParam("id") String id)
    {
        if(StringUtils.isEmpty(id))
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
@@ -215,10 +215,11 @@
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "userId", required = false) String userId)
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "orderType", required = true) String orderType)
    {
        return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,userId);
                condition,userName,communityId,userId,orderType);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCreditsExchangeDao.java
@@ -25,7 +25,8 @@
                                            @Param("condition") String condition,
                                            @Param("userName") String userName,
                                            @Param("communityId") String communityId,
                                            @Param("userId") String userId
                                            @Param("userId") String userId,
                                            @Param("orderType") String orderType
                                            );
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCreditsExchangeService.java
@@ -19,7 +19,8 @@
              String condition,
              String userName,
              String communityId,
              String userId
              String userId,
              String orderType
    );
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
@@ -38,10 +38,12 @@
    @Override
    public R getList(int pageNum, int pageSize, String goodsId, String orderNumber,
                     String goodsName, String condition, String userName,String communityId,String userId) {
                     String goodsName, String condition, String userName,String communityId,
                     String userId,String orderType) {
        Page page=new Page<VolunteerCreditsExchange>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition,userName,communityId,userId));
        return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition,
                userName,communityId,userId,orderType));
    }
    @Override
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml
@@ -117,7 +117,7 @@
                user_id,
            </if>
            <if test="item.condition != null">
                condition,
                volunteer_credits_exchange.condition,
            </if>
            <if test="item.disposeTime != null">
                dispose_time,
@@ -194,7 +194,7 @@
                user_id=#{item.userId},
            </if>
            <if test="item.condition != null">
                condition=#{item.condition},
                volunteer_credits_exchange.condition=#{item.condition},
            </if>
            <if test="item.disposeTime != null">
                dispose_time=#{item.disposeTime},