完善格式化功能

shiyj1101

2021-08-05 e57e32fc43da31917912eebb4e47d4e50df1a9e9

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

old mode 100644
new mode 100755
@@ -172,12 +172,18 @@
     */
    @RequestMapping(value = "/queryGroupBuy", method = RequestMethod.GET)
    public ResponseEntity<String> queryGroupBuy(@RequestHeader(value = "store-id") String storeId,
                                                @RequestParam(value = "batchId", required = false) String batchId,
                                                @RequestParam(value = "groupProdName", required = false) String groupProdName,
                                                @RequestParam(value = "buyId", required = false) String buyId,
                                                @RequestParam(value = "page") int page,
                                                @RequestParam(value = "row") int row) {
        GroupBuyDto groupBuyDto = new GroupBuyDto();
        groupBuyDto.setPage(page);
        groupBuyDto.setRow(row);
        groupBuyDto.setStoreId(storeId);
        groupBuyDto.setBatchId(batchId);
        groupBuyDto.setGroupProdName(groupProdName);
        groupBuyDto.setBuyId(buyId);
        return getGroupBuyBMOImpl.get(groupBuyDto);
    }

@@ -237,10 +243,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);
    }

    /**
@@ -524,12 +546,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);
    }
}