# Conflicts: # hai-order/src/main/java/com/web/controller/OrderPayController.java # hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java # hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java # hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java # hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java # hai-service/src/main/java/com/hai/order/type/OrderChildGoodsType.java # hai-service/src/main/java/com/hai/order/type/OrderProductType.java