Authored by sailing-PC\sailing

Merge branch 'dev_order'

... ... @@ -17,13 +17,16 @@
<groupId>com.yohoufo.fore</groupId>
<artifactId>yohoufo-fore-common</artifactId>
</dependency>
<dependency>
<groupId>com.yoho.service.model</groupId>
<artifactId>order-service-model</artifactId>
<groupId>com.yohoufo.fore</groupId>
<artifactId>yohoufo-fore-dal</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>com.yoho.ufo.model</groupId>
<artifactId>order-ufo-model</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
... ...
package com.yohoufo.order.controller;
import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
import com.yohobuy.ufo.model.order.req.SellerOrderComputeReq;
import com.yohoufo.common.ApiResponse;
import com.yohoufo.order.service.SellerOrderService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* Created by chenchao on 2018/9/13.
*/
@Controller
public class SellerOrderController {
private final Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private SellerOrderService sellerOrderService;
@RequestMapping(params = "method=ufo.sellerOrder.computePublishPrd")
public ApiResponse computePublishPrd(@RequestParam(name = "uid", required = true)int uid,
@RequestParam(name = "storage_id", required = true)int storage_id,
@RequestParam(name="price", required = true)String price){
SellerOrderComputeReq req = SellerOrderComputeReq.builder().uid(uid).storageId(storage_id).price(price).build();
SoldPrdComputeBo computeBo = sellerOrderService.computePublishPrd(req);
return new ApiResponse.ApiResponseBuilder().code(200).data(computeBo).message("算费成功").build();
}
@RequestMapping(params = "method=ufo.sellerOrder.publishPrd")
public ApiResponse publishPrd(){
return new ApiResponse.ApiResponseBuilder().code(200).message("算费成功").build();
}
}
... ...
package com.yohoufo.order.service;
import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
import com.yohobuy.ufo.model.order.req.SellerOrderComputeReq;
import com.yohoufo.order.dal.SellerOrderMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* Created by chenchao on 2018/9/13.
*/
@Service
@Slf4j
public class SellerOrderService {
@Autowired
private SellerOrderMapper sellerOrderMapper;
public SoldPrdComputeBo computePublishPrd(SellerOrderComputeReq req){
SoldPrdComputeBo computeBo = null;
//TODO
return computeBo;
}
}
... ...
... ... @@ -39,9 +39,9 @@
<orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
<orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
<orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" />
... ... @@ -143,10 +143,14 @@
<orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:order-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:product-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:promotion-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="module" module-name="yohoufo-fore-dal" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
<orderEntry type="module" module-name="order-ufo-model" />
</component>
</module>
\ No newline at end of file
... ...
... ... @@ -144,9 +144,14 @@
<orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="module" module-name="yohoufo-fore-order" />
<orderEntry type="library" name="Maven: com.yoho.service.model:order-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:product-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.yoho.service.model:promotion-service-model:1.4.4-SNAPSHOT" level="project" />
<orderEntry type="module" module-name="yohoufo-fore-dal" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
<orderEntry type="module" module-name="order-ufo-model" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
</component>
</module>
\ No newline at end of file
... ...
... ... @@ -18,6 +18,7 @@
<properties>
<qiniu.version>7.0.5</qiniu.version>
<project-name>com.yohoufo.fore</project-name>
<model.version>1.0-SNAPSHOT</model.version>
</properties>
<dependencyManagement>
... ... @@ -76,6 +77,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.yoho.ufo.model</groupId>
<artifactId>order-ufo-model</artifactId>
<version>${model.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
... ...