新增兑换记录 取货方式字段

lidongdong

2023-09-25 b9c45c78310131c34eb7d08e539cf13658b6c15f

 springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionStoreApi.java

@@ -3,7 +3,10 @@
import com.panzhihua.common.model.dtos.equipment.UnionStoreDto;
import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_equipment.annotation.CurrentUser;
import com.panzhihua.service_equipment.model.dos.UnionIntegralSummarize;
import com.panzhihua.service_equipment.service.UnionIntegralSummarizeService;
import com.panzhihua.service_equipment.service.UnionStoreService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -18,13 +21,23 @@
    @Resource
    private UnionStoreService unionStoreService;

    @Resource
    private UnionIntegralSummarizeService unionIntegralSummarizeService;

    @GetMapping("/getList")
    public R getList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize") int pageSize,
                     @RequestParam(value = "communityId",required = false) String communityId,
                     @RequestParam(value = "goodsType",required = false) String goodsType,
                     @RequestParam(value = "nameOrNum",required = false) String nameOrNum)
                     @RequestParam(value = "nameOrNum",required = false) String nameOrNum,
                     @CurrentUser UnionUserDto unionUser)
    {
        if(StringUtils.isEmpty(communityId))
        {
            R<UnionIntegralSummarize> unionIntegralSummarizeR=
                    unionIntegralSummarizeService.getUserData(unionUser.getId()+"",null);
            communityId=unionIntegralSummarizeR.getData().getCommunityId();
        }
        return unionStoreService.getList(pageNum,pageSize,communityId,goodsType,nameOrNum);
    }