refactor

@@ -792,13 +792,13 @@ public class AppraiseService {
 
 
             //退钱给买家
-            BigDecimal goodsMoney = buyerOrder.getAmount();
+            BigDecimal goodsAmount = buyerOrder.getAmount();
             BillLogEvent.BillLogEventBuilder bleb = BillLogEvent.builder()
                     .buyerUid(buyerUid).sellerUid(sellerUid).orderCode(orderCode)
                     .payType(buyerOrder.getPayment()).refundCase(RefundCase.BUYER_GOODS_MONEY)
-                    .amount(goodsMoney)
+                    .amount(goodsAmount)
                     .skup(skup);
-            boolean refundGoodsMoneyFlag = new RefundGoodsMoneyHandler().loadPaymentRequest(buyerUid,orderCode,goodsMoney)
+            boolean refundGoodsMoneyFlag = new RefundGoodsMoneyHandler().loadPaymentRequest(buyerUid,orderCode,goodsAmount)
                     .loadBillLogEventBuilder(bleb)
                     .loadTargetOrderStatus(targetStatus)
                     .loadRefundAction(payRefundService::refund)
@@ -1506,8 +1506,10 @@ public class AppraiseService {
      */
     private void noticeBuyerAndSendCouponForAppraiseUnsure(BuyerNoticeSender.Request request) {
         List<String> couponTokens;
-        if (request.getOrderAmount().compareTo(BigDecimal.valueOf(1000)) > 0) {
-            couponTokens = Lists.newArrayList("f489885f-0e00-4e15-a628-c40e660128fa");
+        if (request.getGoodsAmount().compareTo(BigDecimal.valueOf(20)) > 0) {
+            couponTokens = Lists.newArrayList("f489885f-0e01-4e15-a628-c40e660128fa");
+        }else if (request.getGoodsAmount().compareTo(BigDecimal.valueOf(10)) > 0) {
+            couponTokens = Lists.newArrayList("f489885f-0e02-4e15-a628-c40e660128fa");
         } else {
             couponTokens = Lists.newArrayList("f489885f-0e99-4e15-a628-c40e660128fa");
         }

@@ -136,7 +136,7 @@ class BuyerOrderCancelHandler {
         return new NoticeBuyer(buyerNoticeSender);
     }
 
-    public RecordSuppleExpress withRecordSuppleExpress(RecordSuppleExpressSender recordSuppleExpressSender){
+    public RecordSuppleExpress withRecordSuppleExpress(RecordSuppleExpressSender recordSuppleExpressSender) {
         return new RecordSuppleExpress(recordSuppleExpressSender);
     }
 
@@ -189,7 +189,7 @@ class BuyerOrderCancelHandler {
             refundPayGoodsMoney(buyerOrder, buyerOrderGoods);
             refundEarnestMoney(buyerOrderGoods.getSkup());
             noticeSeller(sellerOrderGoods);
-            noticeBuyer(buyerOrder);
+            noticeBuyer(buyerOrder, buyerOrderGoods);
             cleanCache(buyerOrder, sellerOrderGoods);
         } else {
             log.info("cancel order {} fail, order status has changed", orderCode);
@@ -368,13 +368,13 @@ class BuyerOrderCancelHandler {
         return ensure;
     }
 
-    private void addSuppleExpress(Integer uid){
+    private void addSuppleExpress(Integer uid) {
         if (Objects.nonNull(recordSuppleExpress)) {
             try {
-                log.info("addSuppleExpress uid {} ,order code {}",uid, orderCode);
+                log.info("addSuppleExpress uid {} ,order code {}", uid, orderCode);
                 recordSuppleExpress.recordSuppleExpressSender().notice(uid, orderCode);
             } catch (Exception e) {
-                log.warn("addSuppleExpress uid {} ,order code {} fail",uid, orderCode, e);
+                log.warn("addSuppleExpress uid {} ,order code {} fail", uid, orderCode, e);
             }
         }
     }
@@ -390,14 +390,14 @@ class BuyerOrderCancelHandler {
         }
     }
 
-    private void noticeBuyer(BuyerOrder buyerOrder) {
+    private void noticeBuyer(BuyerOrder buyerOrder, BuyerOrderGoods buyerOrderGoods) {
         if (Objects.nonNull(noticeBuyer)) {
             log.info("notice buyer order has closed by order {}", orderCode);
             try {
                 BuyerNoticeSender.Request request = BuyerNoticeSender.Request.builder()
                         .uid(buyerOrder.getUid())
                         .orderCode(buyerOrder.getOrderCode())
-                        .orderAmount(buyerOrder.getAmount())
+                        .goodsAmount(buyerOrderGoods.getGoodsAmount())
                         .build();
                 noticeBuyer.buyerNoticeSender().notice(request);
             } catch (Exception e) {

@@ -18,7 +18,7 @@ public interface BuyerNoticeSender {
     class Request {
         private Integer uid;
         private Long orderCode;
-        private BigDecimal orderAmount;
+        private BigDecimal goodsAmount;
     }
 
 }