licailing 5 лет назад
Родитель
Сommit
cd43daa54e

+ 1 - 1
src/main/java/com/izouma/dingdong/domain/merchant/MerchantSettings.java

@@ -117,7 +117,7 @@ public class MerchantSettings extends BaseEntity implements Serializable {
     private String doorHeadImg;
 
     @ApiModelProperty(value = "购买口碑联盟", name = "buyAlliance")
-    private Boolean buyAlliance = false;
+    private Boolean buyAlliance;
 
     @ApiModelProperty(value = "优先级", name = "priority")
     private Integer priority;

+ 5 - 2
src/main/java/com/izouma/dingdong/dto/MerchantDTO.java

@@ -107,7 +107,7 @@ public class MerchantDTO implements Serializable {
         buyAlliance = merchantSettings.getBuyAlliance();
         monthSales = merchant.getMonthSales();
         this.distance = distance;
-
+        priority = merchantSettings.getPriority();
 
     }
 
@@ -234,7 +234,7 @@ public class MerchantDTO implements Serializable {
     private String promo;
 
     @ApiModelProperty(value = "购买口碑联盟", name = "buyAlliance")
-    private Boolean buyAlliance = false;
+    private Boolean buyAlliance;
 
     @ApiModelProperty(value = "月销", name = "monthSales")
     private Integer monthSales = 0;
@@ -244,4 +244,7 @@ public class MerchantDTO implements Serializable {
 
     @ApiModelProperty(value = "满减")
     private List<FullReduction> fullReductions;
+
+    @ApiModelProperty(value = "优先级", name = "priority")
+    private Integer priority;
 }

+ 2 - 1
src/main/java/com/izouma/dingdong/service/OrderRefundApplyService.java

@@ -85,7 +85,9 @@ public class OrderRefundApplyService {
                 .reason(reason)
                 .remark(remark)
                 .orderId(orderId)
+                .enabled(true)
                 .report(false)
+                .merchantId(order.getMerchantId())
                 .build());
     }
 
@@ -170,7 +172,6 @@ public class OrderRefundApplyService {
         return orderRefundApplyRepo.findAllByMerchantId(id);
     }
 
-    //商家同意 商家不同意
 
     //平台
     public void platformAudit(Long applyId, Boolean agree, BigDecimal merchantLiability, BigDecimal riderLiability) {

+ 36 - 8
src/main/java/com/izouma/dingdong/service/merchant/GoodsService.java

@@ -1,21 +1,26 @@
 package com.izouma.dingdong.service.merchant;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.dingdong.config.Constants;
 import com.izouma.dingdong.converter.LongArrayConverter;
 import com.izouma.dingdong.converter.StringArrayConverter;
+import com.izouma.dingdong.domain.OrderGoodsSpec;
 import com.izouma.dingdong.domain.backstage.Email;
 import com.izouma.dingdong.domain.backstage.Priority;
 import com.izouma.dingdong.domain.merchant.*;
+import com.izouma.dingdong.domain.user.ShoppingCart;
 import com.izouma.dingdong.dto.AppraisalMerDTO;
 import com.izouma.dingdong.enums.ApplyStatus;
 import com.izouma.dingdong.enums.GoodType;
 import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.OrderGoodsSpecRepo;
 import com.izouma.dingdong.repo.backstage.EmailRepo;
 import com.izouma.dingdong.repo.backstage.PriorityRepo;
 import com.izouma.dingdong.repo.merchant.*;
+import com.izouma.dingdong.repo.user.ShoppingCartRepo;
 import com.izouma.dingdong.service.AppraisalService;
+import com.izouma.dingdong.service.user.ShoppingCartService;
+import com.izouma.dingdong.utils.ObjUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -38,9 +43,11 @@ public class GoodsService {
     private AppraisalService appraisalService;
     private GoodsSpecificationRepo goodsSpecificationRepo;
     private SalesRepo salesRepo;
-    private MerchantSettingsService merchantSettingsService;
     private MerchantService merchantService;
     private PriorityRepo priorityRepo;
+    private ShoppingCartService shoppingCartService;
+    private OrderGoodsSpecRepo orderGoodsSpecRepo;
+    private ShoppingCartRepo shoppingCartRepo;
 
     /**
      * 添加修改商品
@@ -117,7 +124,6 @@ public class GoodsService {
             goods.setIsFullReduction(false);
         }
 
-
         goods = goodsRepo.save(goods);
 
         if (i > 0) {
@@ -180,7 +186,6 @@ public class GoodsService {
      */
     public Goods audit(Long goodsId, Boolean pass, String reason) {
         Goods goods = goodsRepo.findById(goodsId).orElseThrow(new BusinessException("无商品"));
-
         Long userId = merchantRepo.findUserIdById(goods.getMerchantId());
 
         Email email;
@@ -207,7 +212,6 @@ public class GoodsService {
                     .receiveUserId(userId)
                     .build();
         }
-
         emailRepo.save(email);
         return goodsRepo.save(goods);
     }
@@ -266,8 +270,7 @@ public class GoodsService {
         for (Map.Entry<Merchant, Double> m : map.entrySet()) {
             goodsList.addAll(goodsRepo.findAllByMerchantId(m.getKey().getId()));
         }
-       // List<Goods> goodsList = goodsRepo.findAll();
-
+        // List<Goods> goodsList = goodsRepo.findAll();
 
         List<Goods> all = new ArrayList<>();
         //(1000-距离)/1000*0.5 + 月销/10000*0.5 (月销大于10000按照10000计算)
@@ -292,7 +295,6 @@ public class GoodsService {
         //上个月日期
         LocalDate lastMonth = now.minusMonths(1);
 
-
         LocalDate day = now.minusDays(1);
         //月销为0天数
         int countZeroSales = 0;
@@ -364,4 +366,30 @@ public class GoodsService {
         }
 
     }
+
+    public Goods change(Goods record) {
+        Goods orig = goodsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+        //如果修改商品名称和图片就重新审核
+        if (record.getName() != null || record.getImg() != null) {
+            record.setStatus(ApplyStatus.PENDING);
+        }
+        //如果修改价格,购物车内的商品就要重新计算
+        if (record.getAmount() != null || record.getDiscountAmount() != null) {
+            //所有包含此商品的订单规格
+            List<OrderGoodsSpec> goodsSpec = orderGoodsSpecRepo.findAllByGoodsId(record.getId());
+            Set<Long> cartId = new HashSet<>();
+            goodsSpec.forEach(g -> cartId.add(g.getShoppingCartId()));
+            cartId.forEach(c -> {
+                //查找购物车
+                ShoppingCart shoppingCart = shoppingCartRepo.findById(c).orElse(null);
+                if (ObjectUtil.isNotNull(shoppingCart)) {
+                    //改价格
+                    shoppingCartService.calculatePrice(c, shoppingCart.getUserId(), orig.getMerchantId());
+                }
+            });
+        }
+        ObjUtils.merge(orig, record);
+        //修改商品
+        return this.save(orig);
+    }
 }

+ 5 - 1
src/main/java/com/izouma/dingdong/service/merchant/MerchantService.java

@@ -124,6 +124,10 @@ public class MerchantService {
         merchantSettings.setEnabled(true);
         merchantSettings.setIsOpening(true);
 
+        //优先级
+        merchantSettings.setPriority(1);
+        //购买口碑联盟
+        merchantSettings.setBuyAlliance(false);
         merchantSettingsRepo.save(merchantSettings);
 
         //新建 系统预制分类:好评热销/折扣/点单必读
@@ -214,7 +218,7 @@ public class MerchantService {
             merchant.setStatus(ApplyStatus.PASS);
             merchant.setIsPass(true);
             merchant.setEstablishTime(LocalDateTime.now());
-
+            //推广语
             merchant.setPromo(promo);
 
             //审核通过后无法修改实名信息

+ 1 - 1
src/main/java/com/izouma/dingdong/service/user/ShoppingCartService.java

@@ -352,6 +352,7 @@ public class ShoppingCartService {
         OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
         List<OrderGoodsSpec> orderGoodsSpecs = orderInfo.getOrderGoodsSpecs();
         Long userId = orderInfo.getUserId();
+        //shoppingCartRepo.findById()
         ShoppingCart cart = new ShoppingCart();
         for (OrderGoodsSpec o : orderGoodsSpecs) {
             OrderGoodsSpec spec = new OrderGoodsSpec();
@@ -362,7 +363,6 @@ public class ShoppingCartService {
             orderGoodsSpecRepo.save(spec);
             cart = this.add(userId, spec);
         }
-
         return cart;
     }
 

+ 0 - 7
src/main/java/com/izouma/dingdong/web/OrderInfoController.java

@@ -1,12 +1,8 @@
 package com.izouma.dingdong.web;
 
-import com.izouma.dingdong.domain.OrderGoodsSpec;
 import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.domain.User;
-import com.izouma.dingdong.dto.OrderDTO;
 import com.izouma.dingdong.dto.UserOrderDTO;
-
-import com.izouma.dingdong.enums.MerchantStatus;
 import com.izouma.dingdong.enums.RefundReason;
 import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.service.OrderInfoService;
@@ -22,13 +18,11 @@ import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/orderInfo")
@@ -142,6 +136,5 @@ public class OrderInfoController extends BaseController {
 
     //@GetMapping("/cancelCancelOrder")
 
-
 }
 

+ 9 - 1
src/main/java/com/izouma/dingdong/web/merchant/GoodsController.java

@@ -2,6 +2,7 @@ package com.izouma.dingdong.web.merchant;
 
 
 import com.izouma.dingdong.enums.ApplyStatus;
+import com.izouma.dingdong.enums.GoodType;
 import com.izouma.dingdong.repo.merchant.GoodsSpecificationRepo;
 import com.izouma.dingdong.service.merchant.MerchantService;
 import com.izouma.dingdong.utils.SecurityUtils;
@@ -47,7 +48,6 @@ public class GoodsController extends BaseController {
                 record.setStatus(ApplyStatus.PENDING);
             }
             //如果修改价格,购物车内的商品就要重新计算
-           // if (record.getAmount())
             ObjUtils.merge(orig, record);
             return goodsService.save(orig);
         }
@@ -105,5 +105,13 @@ public class GoodsController extends BaseController {
     public Map<String, Object> getInfo(@PathVariable Long id) {
         return goodsService.goodsAllInfo(id);
     }
+
+
+    @GetMapping("/showAll")
+    @ApiOperation("发现美食下商品所有信息")
+    public List<Goods> showAll(GoodType type, Double longitude, Double latitude) {
+        //type 发现美食标签, 以及经纬度
+        return goodsService.showAll(type, longitude, latitude, 3000.0);
+    }
 }
 

+ 5 - 0
src/main/java/com/izouma/dingdong/web/user/ShoppingCartController.java

@@ -111,5 +111,10 @@ public class ShoppingCartController extends BaseController {
         shoppingCartRepo.deleteAllByUserId(id);
     }
 
+    @GetMapping("/again")
+    @ApiOperation("再来一单")
+    public ShoppingCart again(Long orderId) {
+        return shoppingCartService.again(orderId);
+    }
 }
 

+ 40 - 3
src/main/vue/src/views/ComplaintEdit.vue

@@ -47,7 +47,9 @@
                 <el-button class="left" type="warning" v-if="formData.solution==='ISSUE_COUPONS'" size="mini"
                            @click="showCoupon">发放优惠券
                 </el-button>
-                <el-button class="left" type="warning" v-if="formData.solution==='REFUND'" size="mini">退款</el-button>
+                <el-button class="left" type="warning" v-if="formData.solution==='REFUND'" size="mini"
+                           @click="onRefund">退款
+                </el-button>
             </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="saving"
@@ -85,13 +87,22 @@
                 title="退款"
                 center
                 :visible.sync="dislogForm"
+                width="400px"
         >
             <el-form>
                 <el-form-item label="商家责任">
-                    <el-input></el-input>
+                    <el-input-number type="number" v-model="merchantLiability"
+                                     :min='0' :step="0.01" :max="1"></el-input-number>
                 </el-form-item>
                 <el-form-item label="骑手责任">
-                    <el-input></el-input>
+                    <el-input-number type="number" v-model="riderLiability"
+                                     :min='0' :step="0.01" :max="1"></el-input-number>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <el-input v-model="remark"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button>确定</el-button>
                 </el-form-item>
             </el-form>
 
@@ -128,6 +139,10 @@
                 dislogTableCoupon: false,
                 dislogForm: false,
                 coupons: [],
+                merchantLiability: '',
+                riderLiability: '',
+                remark: '',
+
             }
         },
         methods: {
@@ -206,7 +221,29 @@
                         console.log(e);
                     });
             },
+            onRefund() {
+                this.dislogForm = true;
+            },
+            onRefundApply() {
+                this.dislogTableCoupon = true;
+                if (this.merchantLiability + this.riderLiability > 1) {
+                }
+                this.$http
+                    .get('/complaint/refund', {
+                        id: this.formData.id,
+                        merchantLiability: this.merchantLiability,
+                        riderLiability: this.riderLiability,
+                        remark: this.remark
+
+                    })
+                    .then(res => {
+
+                    })
+                    .catch(e => {
+                        console.log(e);
+                    });
 
+            }
         }
     }
 </script>

+ 14 - 5
src/main/vue/src/views/backstage/OrderRefundApplyList.vue

@@ -170,11 +170,20 @@
                     {"label": "失败", "value": "DENY"},
                     {"label": "取消退款", "value": "CANCEL"}],
                 reasonOptions: [
-                    {"label": "未按约定时间发货", "value": "SHIP_ON_TIME"},
-                    {"label": "多拍/错拍商品", "value": "MISTAKE"},
-                    {"label": "暂时不想买了", "value": "WANT_TO_BUY"},
-                    {"label": "其他", "value": "OTHER"}
-                ],
+                    {"label": "用户支付超时", "value": "PAYMENT_TIMEOUT"},
+                    {"label": "商家接单超时", "value": "ORDER_TIMEOUT"},
+                    {"label": "商家拒单", "value": "MERCHANT_REJECTION"},
+                    {"label": "配送时间太长", "value": "DELIVERY_TIME_IS_TOO_LONG"},
+                    {"label": "地址填写错误", "value": "ADDRESS_IS_INCORRECT"},
+                    {"label": "商家无法送达,联系我取消", "value": "MERCHANT_CANNOT_DELIVER"},
+                    {"label": "商家缺货/打烊,联系我取消", "value": "MERCHANT_OUT_OF_STOCK"},
+                    {"label": "忘记使用红包", "value": "FORGOT_TO_USE_THE_RED_ENVELOPE"},
+                    {"label": "忘点主食", "value": "FORGET_ABOUT_STAPLE_FOOD"},
+                    {"label": "骑手联系我取消", "value": "RIDER_CONTACT_ME_TO_CANCEL"},
+                    {"label": "点多了/点错了/漏点了", "value": "MORE_POINTS"},
+                    {"label": "临时有事不想要了", "value": "DO_NOT_WANT_SOMETHING_TEMPORARILY"},
+                    {"label": "用户投诉", "value": "USER_COMPLAINTS"},
+                    {"label": "其他原因", "value": "OTHER"}],
                 status: ''
             }
         },

+ 48 - 40
src/main/vue/src/views/merchant/MerchantEdit.vue

@@ -9,36 +9,36 @@
                 <crop-upload v-model="formData.logo"></crop-upload>
             </el-form-item>
             <el-form-item prop="name" label="名称">
-                <el-input v-model="formData.name"></el-input>
+                <el-input v-model="formData.name" readonly></el-input>
             </el-form-item>
             <el-form-item prop="showName" label="显示名称">
-                <el-input v-model="formData.showName"></el-input>
+                <el-input v-model="formData.showName" readonly></el-input>
             </el-form-item>
             <el-form-item prop="introduction" label="简介">
-                <el-input type="textarea" v-model="formData.introduction" :rows="2"></el-input>
+                <el-input type="textarea" v-model="formData.introduction" :rows="2" readonly></el-input>
             </el-form-item>
-            <el-form-item prop="proclamation" label="公告">
+<!--            <el-form-item prop="proclamation" label="公告">
                 <el-input type="textarea" v-model="formData.proclamation" :rows="2"></el-input>
-            </el-form-item>
-            <el-form-item prop="banner" label="banner">
+            </el-form-item>-->
+<!--            <el-form-item prop="banner" label="banner">
                 <single-upload v-model="formData.banner"></single-upload>
-            </el-form-item>
-            <el-form-item prop="img" label="图片">
+            </el-form-item>-->
+<!--            <el-form-item prop="img" label="图片">
                 <multi-upload v-model="formData.img"></multi-upload>
-            </el-form-item>
-            <el-form-item prop="address" label="地址">
+            </el-form-item>-->
+<!--            <el-form-item prop="address" label="地址">
                 <el-input v-model="formData.address"></el-input>
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item prop="phone" label="手机">
-                <el-input v-model="formData.phone"></el-input>
+                <el-input v-model="formData.phone" readonly></el-input>
             </el-form-item>
-            <el-form-item prop="password" label="密码">
+<!--            <el-form-item prop="password" label="密码">
                 <el-input v-model="formData.password" show-password></el-input>
-            </el-form-item>
-            <el-form-item prop="qualification" label="营业资质">
+            </el-form-item>-->
+<!--            <el-form-item prop="qualification" label="营业资质">
                 <multi-upload v-model="formData.qualification"></multi-upload>
-            </el-form-item>
-            <el-form-item prop="businessNature" label="营业性质">
+            </el-form-item>-->
+<!--            <el-form-item prop="businessNatureId" label="营业性质">-->
                 <!--<el-input v-model="formData.businessNature"></el-input>-->
 <!--                <el-select v-model="formData.businessNature"-->
 <!--                           placeholder="请选择" value-key="value">-->
@@ -46,7 +46,7 @@
 <!--                    <el-option value="连锁">连锁</el-option>-->
 <!--                    <el-option value="加盟">加盟</el-option>-->
 <!--                </el-select>-->
-            </el-form-item>
+<!--            </el-form-item>-->
 <!--            <el-form-item prop="week" label="周几" id="week">
                 <el-select v-model="formData.week" multiple
                            placeholder="请选择" value-key="value">
@@ -59,7 +59,7 @@
                     <el-option value="SUNDAY">SUNDAY</el-option>
                 </el-select>
             </el-form-item>-->
-            <el-form-item prop="startTime" label="营业时间">
+<!--            <el-form-item prop="startTime" label="营业时间">
                 <el-time-picker
                         v-model="formData.startTime"
                         value-format="HH:mm:ss"
@@ -73,7 +73,7 @@
                         value-format="HH:mm:ss"
                         placeholder="选择时间"
                 >
-                </el-time-picker>
+                </el-time-picker>-->
                 <!--  <el-time-picker
                         is-range
                         v-model="formData.startTime"
@@ -82,30 +82,25 @@
                         start-placeholder="开始时间"
                         end-placeholder="结束时间"
                         placeholder="选择时间范围">
-                </el-time-picker>-->
-            </el-form-item>
+                </el-time-picker>
+            </el-form-item>-->
             <!--            <el-form-item prop="blacklist" label="黑名单">
                             <el-switch v-model="formData.blacklist"></el-switch>
                         </el-form-item>-->
-            <el-form-item prop="firstOrder" label="首单优惠">
+ <!--           <el-form-item prop="firstOrder" label="首单优惠">
                 <el-input-number type="number" v-model="formData.firstOrder"></el-input-number>
             </el-form-item>
             <el-form-item prop="newUser" label="新用户优惠">
                 <el-input-number type="number" v-model="formData.newUser"></el-input-number>
-            </el-form-item>
-            <el-form-item prop="category" label="经营品别">
+            </el-form-item>-->
+<!--            <el-form-item prop="category" label="经营品别">
                 <el-select v-model="formData.category" multiple
                            placeholder="请选择" value-key="name">
                     <el-option v-for="item in category" :key="item.name"
                                :label="item.name" :value="item">
                     </el-option>
                 </el-select>
-
-                <!--                    <el-cascader
-                                            v-model="name"
-                                            :options="category"
-                                            @change="handleChange"></el-cascader>-->
-            </el-form-item>
+            </el-form-item>-->
             <!--  <el-form-item prop="tag" label="标签">
                      <el-tree
                        :props="props"
@@ -115,12 +110,25 @@
                        @check-change="handleCheckChange">
                       </el-tree>
             </el-form-item> -->
-            <el-form-item prop="aliName" label="支付宝名称">
+<!--            <el-form-item prop="aliName" label="支付宝名称">
                 <el-input v-model="formData.aliName"></el-input>
             </el-form-item>
             <el-form-item prop="aliAccount" label="支付宝账户">
                 <el-input v-model="formData.aliAccount"></el-input>
+            </el-form-item>-->
+            <el-form-item prop="promo" label="推广语">
+                <el-input v-model="formData.promo"></el-input>
             </el-form-item>
+            <el-form-item prop="priority" label="优先级">
+                <el-input-number v-model="formData.priority" :max="5" :min="1"
+                ></el-input-number>
+            </el-form-item>
+
+            <el-form-item prop="buyAlliance" label="口碑联盟">
+                <el-switch v-model="formData.rated"></el-switch>
+            </el-form-item>
+
+
             <el-form-item>
                 <el-button @click="onSave" :loading="saving"
                            type="primary">保存
@@ -148,7 +156,7 @@
                         this.$message.error(e.error);
                     });
             }
-            this.$http
+/*            this.$http
                 .get('/category/tree', {
                     id: 1
                 })
@@ -157,7 +165,7 @@
                 })
                 .catch(e => {
                     console.log(e);
-                });
+                });*/
         },
         data() {
             return {
@@ -182,8 +190,8 @@
             },
             submit() {
                 let data = {...this.formData};
-                data.img = data.img.join(",");
-                data.qualification = data.qualification.join(",");
+                // data.img = data.img.join(",");
+                // data.qualification = data.qualification.join(",");
                 /*data.week = data.week.join(",")*/
 
                 this.saving = true;
@@ -200,7 +208,7 @@
                         this.$message.error(e.error);
                     });
             },
-            onDelete() {
+/*            onDelete() {
                 this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
                     return this.$http.post(`/merchant/del/${this.formData.id}`)
                 }).then(() => {
@@ -212,10 +220,10 @@
                         this.$message.error(e.error);
                     }
                 })
-            },
-            handleChange(name) {
+            },*/
+/*            handleChange(name) {
                 console.log(name);
-            }
+            }*/
         }
     }
 </script>

+ 0 - 3
src/test/java/com/izouma/dingdong/service/MerchantServiceTest.java

@@ -29,8 +29,6 @@ public class MerchantServiceTest {
     @Autowired
     private MerchantController merchantController;
     @Autowired
-    private FullReductionRepo fullReductionRepo;
-    @Autowired
     private MerchantSettingsService merchantSettingsService;
 
     @Test
@@ -138,7 +136,6 @@ public class MerchantServiceTest {
 //        System.out.println(index.get("promote1"));
 //        System.out.println(index.get("promote2"));
 //        System.out.println(index.get("newMerchants"));
-
         System.out.println(index);
     }
 

+ 22 - 0
src/test/java/com/izouma/dingdong/service/OrderInfoServiceTest.java

@@ -0,0 +1,22 @@
+package com.izouma.dingdong.service;
+
+import com.izouma.dingdong.enums.RefundReason;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class OrderInfoServiceTest {
+    @Autowired
+    private OrderInfoService orderInfoService;
+
+    @Test
+    public void testCancel(){
+        System.out.println(orderInfoService.cancel(537L, RefundReason.DO_NOT_WANT_SOMETHING_TEMPORARILY));
+    }
+
+
+}

+ 20 - 0
src/test/java/com/izouma/dingdong/service/OrderRefundApplyServiceTest.java

@@ -0,0 +1,20 @@
+package com.izouma.dingdong.service;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class OrderRefundApplyServiceTest {
+
+    @Autowired
+    private OrderRefundApplyService orderRefundApplyService;
+
+    @Test
+    public void test() {
+        orderRefundApplyService.audit(1776L, false, true);
+    }
+}

+ 0 - 3
src/test/java/com/izouma/dingdong/service/ShoppingCartServiceTest.java

@@ -17,14 +17,11 @@ public class ShoppingCartServiceTest {
 
     @Autowired
     private ShoppingCartService shoppingCartService;
-
     @Autowired
     private ShoppingCartRepo shoppingCartRepo;
     @Autowired
     private OrderGoodsSpecService orderGoodsSpecService;
 
-    @Autowired
-    private OrderGoodsSpecRepo orderGoodsSpecRepo;
 
     @Test
     public void testCart() {