Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java

@@ -63,6 +63,13 @@ public interface IOrderBasicInfoService {
 	 */
 	int updateOrderBasicInfo(OrderBasicInfo orderBasicInfo);
 
+	/**
+	 * 修改订单详情
+	 * @param orderDetail
+	 * @return
+	 */
+	int updateOrderDetail(OrderDetail orderDetail);
+
 	// 清订单缓存
 	void cleanCacheByOrderCode(String orderCode, String transactionCode);
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -406,7 +406,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 		return i;
 	}
 
-	@Override
+	/**
+	 * 修改订单详情
+	 * @param orderDetail
+	 * @return
+	 */
+    @Override
+    public int updateOrderDetail(OrderDetail orderDetail) {
+        return orderBasicInfoMapper.updateOrderDetail(orderDetail);
+    }
+
+    @Override
 	public void cleanCacheByOrderCode(String orderCode, String transactionCode) {
 		logger.debug("清除订单缓存 orderCode:{}, transactionCode:{}", orderCode, transactionCode);
 		List<String> keys = Lists.newArrayList();