订单修改

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -9,17 +9,12 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
-import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.service.UserOrderService;
 
 import java.lang.reflect.InvocationTargetException;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/OrderReq.java

@@ -32,8 +32,10 @@ public class OrderReq {
     private String userNote;
     @ApiModelProperty(value = "优惠券id")
     private Long couponId;
+    @NotNull(message = "订单金额不能为空")
     @ApiModelProperty(value = "订单金额", required = true)
     private BigDecimal actualPrice;
+    @NotNull(message = "商品详情不能为空")
     @ApiModelProperty(value = "业务请求详情", required = true)
     private List<OrderReqInfo> orderInfos;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -17,7 +17,6 @@ import java.util.Date;
 @ApiModel(value = "OrderSearch对象", description = "平台订单表查询对象")
 public class OrderSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
-
 	@ApiModelProperty("交易流水号/订单号")
 	private String searchNo;
 	@ApiModelProperty("订单类型:  VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -136,9 +136,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
         //验证成功后，订单入库
         UserOrderVo orderVo = insertOrder(orderReq, resList);
-
         List<UserOrderDetailVo> orderDetailList = orderVo.getOrderDetailList();
-
         for(UserOrderDetailVo orderDetailVo : orderDetailList){
             orderDetailVo.setUserId(orderReq.getUserId());
             orderDetailVo.setOrderId(orderVo.getId());
@@ -395,7 +393,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             );
             //平台服务费
             BigDecimal serviceFeeRate = getServiceFeeRate(res.getGoodType());
-            orderDetail.setPlantformFee(userOrder.getActualPrice().multiply(serviceFeeRate));
+            orderDetail.setPlantformFee(userOrder.getExpectPrice().multiply(serviceFeeRate));
             orderDetail.setPlantformFeeRate(serviceFeeRate);
 
             orderDetail.setCreateTime(new Date());