Merge remote-tracking branch 'origin/dev' into dev

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/entity/from/CreateOrderDetailFrom.java

@@ -1,17 +1,22 @@
 package com.hcloud.microserver.h5.facade.carbon.entity.from;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
+@ApiModel("购买商品模型")
 public class CreateOrderDetailFrom {
     /**
      * 商品id
      */
+    @ApiModelProperty("商品id")
     private String goodsId;
     /**
      * 碳汇量
      */
+    @ApiModelProperty("碳汇量")
     private BigDecimal carbonVal;
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/config/Swagger2Config.java

@@ -31,7 +31,7 @@ public class Swagger2Config {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.hwrj.cloud.admin.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.hcloud.microserver.h5.controller.web"))
                 .paths(PathSelectors.any())
                 .build()
                 .securitySchemes(securitySchemes())
@@ -40,10 +40,10 @@ public class Swagger2Config {
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("mall后台系统")
-                .description("mall后台模块")
-                .contact(new Contact("macro","",""))
-                .version("1.0")
+                .title("微信app后台接口")
+                .description("carbon-h5")
+                .contact(new Contact("carbon","",""))
+                .version("0.0.1")
                 .build();
     }
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/OrderManagerController.java

@@ -58,10 +58,6 @@ public class OrderManagerController extends CarbonBaseController {
 
 
     @ApiOperation(value = "生成订单信息", notes = "生成订单信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "订单Id", dataType = "String")
-    })
-    @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/createOrder")
     @AuthCarbonValidate
     public ResponseBase createOrder(@RequestBody CreateOrderFrom createOrderFrom) {