优化代码

java110

2020-10-25 bad2f4dc055c8a703b82dfa2db85436a1ddb9f7d

 service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java

@@ -1,5 +1,6 @@
package com.java110.goods.api;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.groupBuy.GroupBuyDto;
import com.java110.dto.groupBuyBatch.GroupBuyBatchDto;
@@ -35,12 +36,10 @@
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;

@RestController
@RequestMapping(value = "/groupBuy")
@@ -199,10 +198,26 @@
        Assert.hasKeyAndValue(reqJson, "groupProdDesc", "请求报文中未包含groupProdDesc");
        Assert.hasKeyAndValue(reqJson, "sort", "请求报文中未包含sort");

        Assert.hasKey(reqJson, "productSpecs", "请求报文中未包含商品规格信息");

        JSONArray productSpecs = reqJson.getJSONArray("productSpecs");

        if (productSpecs.size() < 1) {
            throw new IllegalArgumentException("请求报文中商品规格数量为0");
        }
        List<GroupBuyProductSpecPo> groupBuyProductSpecPos = new ArrayList<>();
        GroupBuyProductSpecPo groupBuyProductSpecPo = null;
        for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
            groupBuyProductSpecPo = BeanConvertUtil.covertBean(productSpecs.getJSONObject(specIndex), GroupBuyProductSpecPo.class);
            groupBuyProductSpecPo.setProductId(reqJson.getString("productId"));
            groupBuyProductSpecPo.setDefaultShow("F");
            groupBuyProductSpecPo.setGroupSales("1");
            groupBuyProductSpecPo.setStoreId(storeId);
            groupBuyProductSpecPos.add(groupBuyProductSpecPo);
        }
        GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
        groupBuyProductPo.setStoreId(storeId);
        return saveGroupBuyProductBMOImpl.save(groupBuyProductPo);
        return saveGroupBuyProductBMOImpl.save(groupBuyProductPo, groupBuyProductSpecPos);
    }

    /**
@@ -222,10 +237,26 @@
        Assert.hasKeyAndValue(reqJson, "sort", "请求报文中未包含sort");
        Assert.hasKeyAndValue(reqJson, "groupId", "groupId不能为空");

        Assert.hasKey(reqJson, "productSpecs", "请求报文中未包含商品规格信息");

        JSONArray productSpecs = reqJson.getJSONArray("productSpecs");

        if (productSpecs.size() < 1) {
            throw new IllegalArgumentException("请求报文中商品规格数量为0");
        }
        List<GroupBuyProductSpecPo> groupBuyProductSpecPos = new ArrayList<>();
        GroupBuyProductSpecPo groupBuyProductSpecPo = null;
        for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
            groupBuyProductSpecPo = BeanConvertUtil.covertBean(productSpecs.getJSONObject(specIndex), GroupBuyProductSpecPo.class);
            groupBuyProductSpecPo.setProductId(reqJson.getString("productId"));
            groupBuyProductSpecPo.setDefaultShow("F");
            groupBuyProductSpecPo.setGroupSales("1");
            groupBuyProductSpecPo.setStoreId(storeId);
            groupBuyProductSpecPos.add(groupBuyProductSpecPo);
        }
        GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
        groupBuyProductPo.setStoreId(storeId);
        return updateGroupBuyProductBMOImpl.update(groupBuyProductPo);
        return updateGroupBuyProductBMOImpl.update(groupBuyProductPo, groupBuyProductSpecPos);
    }

    /**
@@ -259,11 +290,13 @@
    @RequestMapping(value = "/queryGroupBuyProduct", method = RequestMethod.GET)
    public ResponseEntity<String> queryGroupBuyProduct(@RequestHeader(value = "store-id") String storeId,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
                                                       @RequestParam(value = "row") int row,
                                                       @RequestParam(value = "groupId", required = false) String groupId) {
        GroupBuyProductDto groupBuyProductDto = new GroupBuyProductDto();
        groupBuyProductDto.setPage(page);
        groupBuyProductDto.setRow(row);
        groupBuyProductDto.setStoreId(storeId);
        groupBuyProductDto.setGroupId(groupId);
        return getGroupBuyProductBMOImpl.get(groupBuyProductDto);
    }

@@ -507,12 +540,14 @@
     */
    @RequestMapping(value = "/queryGroupBuyBatch", method = RequestMethod.GET)
    public ResponseEntity<String> queryGroupBuyBatch(@RequestHeader(value = "store-id") String storeId,
                                                     @RequestParam(value = "batchId",required = false) String batchId,
                                                     @RequestParam(value = "page") int page,
                                                     @RequestParam(value = "row") int row) {
        GroupBuyBatchDto groupBuyBatchDto = new GroupBuyBatchDto();
        groupBuyBatchDto.setPage(page);
        groupBuyBatchDto.setRow(row);
        groupBuyBatchDto.setStoreId(storeId);
        groupBuyBatchDto.setBatchId(batchId);
        return getGroupBuyBatchBMOImpl.get(groupBuyBatchDto);
    }
}