add child commodity/dispathed date and dispatched amount to payment request on logistics. Plus fix failed test
fix conflict