update

.gitignore

 log
 *.log
-target
+target
\ No newline at end of file
+/xw-agent-front/
+/xw-operation-front/

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -508,12 +508,12 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         //todo 考虑代付
         List<CouponCustomerRelevance> couponCustomerRelevanceList = couponCustomerRelevanceService.getOrderCoupon(orderManage.getOrderUser(), orderId);
 
-        couponCustomerRelevanceList.stream()
-
-                .filter(couponCustomerRelevance -> couponCustomerRelevance.getDiscountAmount() != null)
-                .filter(couponCustomerRelevance -> couponCustomerRelevance.getDiscountAmount().compareTo(orderManage.getTotalPaymentAmount()) <= 0)
-                .findAny()
-                .ifPresent(couponCustomerRelevance -> marketService.asyncAutoSetCoupon(couponCustomerRelevance.getId(), orderId));
+//        couponCustomerRelevanceList.stream()
+//
+//                .filter(couponCustomerRelevance -> couponCustomerRelevance.getDiscountAmount() != null)
+//                .filter(couponCustomerRelevance -> couponCustomerRelevance.getDiscountAmount().compareTo(orderManage.getTotalPaymentAmount()) <= 0)
+//                .findAny()
+//                .ifPresent(couponCustomerRelevance -> marketService.asyncAutoSetCoupon(couponCustomerRelevance.getId(), orderId));
 
         pushMsgService.sendOrderPayNotifyMsg(orderId,
                 customer.getOpenid1(),

src/test/java/com/gogirl/application/user/customer/impl/CustomerBalanceServiceImplTest.java

@@ -28,6 +28,6 @@ public class CustomerBalanceServiceImplTest {
 
     @org.junit.Test
     public void transferBalance() {
-        customerBalanceService.transferBalance("96827361", "18559161648");
+        customerBalanceService.transferBalance("18671855858", "18671855851");
     }
 }