新增小程序商家体现列表 商家兑换记录

lidongdong

2023-09-06 7c6612561f7f82f88c9c0a0f0b8343b317f468e0

新增小程序商家体现列表  商家兑换记录

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

@@ -99,14 +99,21 @@
                                  @RequestParam(value = "condition", required = false) String condition,
                                  @RequestParam(value = "userName", required = false) String userName,
                                  @RequestParam(value = "communityId", required = false) String communityId,
                                  @RequestParam(value = "orderType", required = false) String orderType)
                                  @RequestParam(value = "orderType", required = false) String orderType,
                                  @RequestParam(value = "merchantId", required = false) String merchantId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }

        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
        }

        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType);
                condition,userName,communityId,getUserId()+"",orderType,merchantId);
    }

    /**
@@ -481,6 +488,30 @@
        return communityService.WithdrawInsert(item);
    }

    /**
     * 商家提现列表
     * @param disposeType
     * @return
     */
    @GetMapping("/withdraw/getList")
    public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "disposeType", required = false) String disposeType,
                             @RequestParam(value = "merchantName", required = false) String merchantName,
                             @RequestParam(value = "merchantId", required = false) String  merchantId,
                             @RequestParam(value = "communityId", required = false) String communityId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }

        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
        }

        return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -11541,7 +11541,8 @@
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "orderType", required = false) String orderType);
                     @RequestParam(value = "orderType", required = false) String orderType,
                     @RequestParam(value = "merchantId", required = false) String merchantId);

    /**
     * 查询详情
@@ -11722,7 +11723,9 @@
    public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "disposeType", required = false) String disposeType,
                             @RequestParam(value = "merchantName", required = false) String merchantName);
                             @RequestParam(value = "merchantName", required = false) String merchantName,
                             @RequestParam(value = "merchantId", required = false) String  merchantId,
                             @RequestParam(value = "communityId", required = false) String communityId);

    /**
     * 新增商家提现

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java

@@ -123,14 +123,15 @@
                     @RequestParam(value = "goodsName", required = false) String goodsName,
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId)
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "merchantId", required = false) String merchantId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return merchantService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,null,"1");
                condition,userName,communityId,null,"1",merchantId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java

@@ -210,9 +210,16 @@
    public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "disposeType", required = false) String disposeType,
                             @RequestParam(value = "merchantName", required = false) String merchantName)
                             @RequestParam(value = "merchantName", required = false) String merchantName,
                             @RequestParam(value = "merchantId", required = false) String  merchantId,
                             @RequestParam(value = "communityId", required = false) String communityId)
    {
        return vtService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName);
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }

        return vtService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
    }



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

@@ -197,10 +197,11 @@
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "orderType", required = false) String orderType)
                     @RequestParam(value = "orderType", required = false) String orderType,
                     @RequestParam(value = "merchantId", required = false) String merchantId)
    {
        return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,userId,orderType);
                condition,userName,communityId,userId,orderType,merchantId);
    }

    /**

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

@@ -182,9 +182,11 @@
    public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "disposeType", required = false) String disposeType,
                             @RequestParam(value = "merchantName", required = false) String merchantName)
                             @RequestParam(value = "merchantName", required = false) String merchantName,
                             @RequestParam(value = "merchantId", required = false) String  merchantId,
                             @RequestParam(value = "communityId", required = false) String communityId)
    {
        return vmwService.getList(pageNum,pageSize,disposeType,merchantName);
        return vmwService.getList(pageNum,pageSize,disposeType,merchantName,merchantId,communityId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCreditsExchangeDao.java

@@ -26,7 +26,8 @@
                                            @Param("userName") String userName,
                                            @Param("communityId") String communityId,
                                            @Param("userId") String userId,
                                            @Param("orderType") String orderType
                                            @Param("orderType") String orderType,
                                            @Param("merchantId") String merchantId
                                            );

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerMerchantWithdrawDao.java

@@ -20,7 +20,13 @@
     */
    IPage<VolunteerMerchantWithdraw> getList(Page page,
                                             @Param("disposeType") String disposeType,
                                             @Param("merchantName") String merchantName);
                                             @Param("merchantName") String merchantName,
                                             @Param("merchantName") String merchantId,
                                             @Param("merchantName") String communityId);





    /**
     * 新增商家提现

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCreditsExchangeService.java

@@ -20,7 +20,8 @@
              String userName,
              String communityId,
              String userId,
              String orderType
              String orderType,
              String merchantId

    );


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantWithdrawService.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerMerchantWithdrawVO;
import com.panzhihua.service_community.entity.VolunteerMerchantWithdraw;
import org.apache.ibatis.annotations.Param;

public interface VolunteerMerchantWithdrawService extends IService<VolunteerMerchantWithdraw>
{
@@ -13,7 +14,7 @@
     * @param disposeType
     * @return
     */
    R getList(int pageNum, int pageSize, String disposeType,String merchantName);
    R getList(int pageNum, int pageSize, String disposeType,String merchantName,String merchantId,String communityId);

    /**
     * 新增商家提现

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java

@@ -46,11 +46,11 @@
    @Override
    public R getList(int pageNum, int pageSize, String goodsId, String orderNumber,
                     String goodsName, String condition, String userName,String communityId,
                     String userId,String orderType) {
                     String userId,String orderType,String merchantId) {

        Page page=new Page<VolunteerCreditsExchange>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition,
                userName,communityId,userId,orderType));
                userName,communityId,userId,orderType,merchantId));
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantWithdrawServiceImpl.java

@@ -12,6 +12,7 @@
import com.panzhihua.service_community.service.VolunteerMerchantService;
import com.panzhihua.service_community.service.VolunteerMerchantWithdrawService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -26,10 +27,10 @@
    private VolunteerMerchantService  vmService;

    @Override
    public R getList(int pageNum, int pageSize, String disposeType,String merchantName)
    public R getList(int pageNum, int pageSize, String disposeType,String merchantName,String merchantId,String communityId)
    {
        Page<VolunteerMerchantWithdraw> page=new Page(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,disposeType,merchantName));
        return R.ok(baseMapper.getList(page,disposeType,merchantName,merchantId,communityId));
    }

    @Override

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

@@ -96,6 +96,9 @@
            <if test="userId!=null">
                and vce.user_id=#{userId}
            </if>
            <if test="merchantId!=null">
                and vce.merchant_id=#{merchantId}
            </if>
            <if test="orderType!=null">
                and vce.order_type=#{orderType}
            </if>

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

@@ -41,6 +41,12 @@
                and
                ((select vm.name from volunteer_merchant as vm where volunteer_merchant_withdraw.merchant_id=vm.id) like concat('%',#{merchantName},'%'))
            </if>
            <if test="merchantId !=null and merchantId != '' ">
                and merchant_id=#{merchantId}
            </if>
            <if test="communityId !=null and communityId != '' ">
                and community_id=#{}
            </if>
        </where>
        order by creation_time desc
    </select>