/goods/save

src/main/java/com/izouma/dingdong/domain/OrderInfo.java

@@ -127,7 +127,7 @@ public class OrderInfo extends BaseEntity {
 
     private Boolean enabled;
 
-//    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-//    @JoinColumn(name = "orderId")
-//    List<OrderGoodsSpec> orderGoodsSpecs;
+    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @JoinColumn(name = "orderId")
+    List<OrderGoodsSpec> orderGoodsSpecs;
 }

src/main/java/com/izouma/dingdong/domain/user/ShoppingCart.java

@@ -2,6 +2,8 @@ package com.izouma.dingdong.domain.user;
 
 import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.OrderGoodsSpec;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.domain.merchant.Merchant;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -61,4 +63,5 @@ public class ShoppingCart extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "实付金额", name = "realAmount")
     private BigDecimal realAmount;
 
+
 }

src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -103,13 +103,13 @@ public class OrderInfoService {
             //未过期，未使用
             if (coupon.getEndDate().isAfter(now.toLocalDate()) && !userCoupon.getIsUsed()) {
                 //限制商家
-                if (ObjectUtil.isNotNull(coupon.getMerchantId()) && !orderInfo.getMerchantId().equals(coupon.getMerchantId())){
+                if (ObjectUtil.isNotNull(coupon.getMerchantId()) && !orderInfo.getMerchantId().equals(coupon.getMerchantId())) {
                     throw new BusinessException("指定商家优惠券");
                 }
 
                 //判断是否限制手机号
                 if (ObjectUtil.isNotNull(userCoupon.getPhone()) && !address.getPhone().equals(userCoupon.getPhone())) {
-                        throw new BusinessException("限手机" + userCoupon.getPhone() + "使用");
+                    throw new BusinessException("限手机" + userCoupon.getPhone() + "使用");
                 }
 
                 if (coupon.getFullAmount().compareTo(cart.getGoodsTotal()) <= 0) {
@@ -135,7 +135,7 @@ public class OrderInfoService {
                     //查库存是否足够
                     Goods goods = goodsService.buy(s.getGoodsId(), s.getNum());
                     //商品销售时间内
-                    if (goods.getStartTime().isAfter(nowTime)  || goods.getEndTime().isBefore(nowTime)) {
+                    if (goods.getStartTime().isAfter(nowTime) || goods.getEndTime().isBefore(nowTime)) {
                         throw new BusinessException("非营业时间");
                     }
                     //查商品数据，加商品销量，减商品库存
@@ -272,7 +272,7 @@ public class OrderInfoService {
                         //记录到对账单
                         moneyRecordRepo.save(
                                 MoneyRecord.builder()
-                                        .name(userRepo.findById(orderInfo.getUserId()).orElse(null).getNickname()+"购买")
+                                        .name(userRepo.findById(orderInfo.getUserId()).orElse(null).getNickname() + "购买")
                                         .type(FinancialType.INCOME)
                                         .time(LocalDateTime.now())
                                         .amount(orderInfo.getRealAmount())
@@ -314,9 +314,9 @@ public class OrderInfoService {
     }
 
 
-    public OrderDTO toDTO(OrderInfo orderInfo){
+    public OrderDTO toDTO(OrderInfo orderInfo) {
         OrderDTO dto = new OrderDTO();
-        BeanUtil.copyProperties(dto,orderInfo);
+        BeanUtil.copyProperties(orderInfo, dto);
         User user = userRepo.findById(orderInfo.getUserId()).orElseThrow(new BusinessException("无用户"));
         dto.setNickname(user.getNickname());
         dto.setAvatar(user.getAvatar());

src/main/java/com/izouma/dingdong/service/merchant/MerchantService.java

@@ -117,6 +117,23 @@ public class MerchantService {
 
         merchantSettingsRepo.save(merchantSettings);
 
+
+        //新建 系统预制分类：好评热销
+        merchantClassificationRepo.save(MerchantClassification.builder()
+                .merchantId(merchant.getId())
+                .name(Constants.CLASSIFICATION_NAME)
+                .sort(1)
+                .isOpen(false)
+                .isShow(true)
+                .build());
+        merchantClassificationRepo.save(MerchantClassification.builder()
+                .merchantId(merchant.getId())
+                .name(Constants.CLASSIFICATION_NAME2)
+                .sort(2)
+                .isOpen(true)
+                .isShow(false)
+                .build());
+
         return merchantDTO;
     }
 
@@ -141,6 +158,7 @@ public class MerchantService {
         BeanUtil.copyProperties(dto, merchantSettings);
         merchantRepo.save(merchant);
         merchantSettingsRepo.save(merchantSettings);
+
         return dto;
     }
 
@@ -158,22 +176,6 @@ public class MerchantService {
             merchant.setIsPass(true);
             merchant.setEstablishTime(LocalDateTime.now());
 
-            //新建 系统预制分类：好评热销
-            merchantClassificationRepo.save(MerchantClassification.builder()
-                    .merchantId(merchantId)
-                    .name(Constants.CLASSIFICATION_NAME)
-                    .sort(1)
-                    .isOpen(false)
-                    .isShow(true)
-                    .build());
-            merchantClassificationRepo.save(MerchantClassification.builder()
-                    .merchantId(merchantId)
-                    .name(Constants.CLASSIFICATION_NAME2)
-                    .sort(2)
-                    .isOpen(true)
-                    .isShow(false)
-                    .build());
-
 
         } else {
             merchant.setStatus(ApplyStatus.DENY);

src/main/java/com/izouma/dingdong/web/merchant/GoodsController.java

@@ -35,7 +35,7 @@ public class GoodsController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     @ApiOperation("添加修改商品")
-    public Goods save(@RequestBody Goods record) {
+    public Goods save(/*@RequestBody*/ Goods record) {
         if (record.getId() != null) {
             Goods orig = goodsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             //如果修改商品名称和图片就重新审核